From 857115b2394ef3071f8bdbf59e448f1b5107c7f3 Mon Sep 17 00:00:00 2001 From: Maksim Banaev Date: Wed, 1 Oct 2025 19:27:00 +0200 Subject: [PATCH] CPP-46713 Feature Trainer Plugin: Search Everywhere is not working in 253 GitOrigin-RevId: 3d2a717c4318feb9e4666c1c9f439b066c534a6f --- plugins/ide-features-trainer/src/training/dsl/LessonUtil.kt | 4 ++-- .../lesson/general/navigation/SearchEverywhereLesson.kt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/ide-features-trainer/src/training/dsl/LessonUtil.kt b/plugins/ide-features-trainer/src/training/dsl/LessonUtil.kt index 5c659bbd999f..5ec438f01165 100644 --- a/plugins/ide-features-trainer/src/training/dsl/LessonUtil.kt +++ b/plugins/ide-features-trainer/src/training/dsl/LessonUtil.kt @@ -13,7 +13,6 @@ import com.intellij.execution.ui.layout.impl.RunnerLayoutSettings import com.intellij.find.impl.FindPopupItem import com.intellij.ide.DataManager import com.intellij.ide.IdeBundle -import com.intellij.ide.actions.searcheverywhere.SearchEverywhereUI import com.intellij.openapi.actionSystem.ActionPlaces import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.actionSystem.ex.ActionUtil @@ -54,6 +53,7 @@ import com.intellij.ui.ComponentUtil import com.intellij.ui.ExperimentalUI import com.intellij.ui.ScreenUtil import com.intellij.ui.content.Content +import com.intellij.ui.searchComponents.ExtendableSearchTextField import com.intellij.usageView.UsageViewContentManager import com.intellij.util.messages.Topic import com.intellij.util.ui.UIUtil @@ -244,7 +244,7 @@ object LessonUtil { } fun TaskRuntimeContext.checkInsideSearchEverywhere(): Boolean { - return UIUtil.getParentOfType(SearchEverywhereUI::class.java, focusOwner) != null + return UIUtil.getParentOfType(ExtendableSearchTextField::class.java, focusOwner) != null } fun isMainEditorComponent(component: Component?): Boolean { diff --git a/plugins/ide-features-trainer/src/training/learn/lesson/general/navigation/SearchEverywhereLesson.kt b/plugins/ide-features-trainer/src/training/learn/lesson/general/navigation/SearchEverywhereLesson.kt index 6143c1074419..12b698a53c5d 100644 --- a/plugins/ide-features-trainer/src/training/learn/lesson/general/navigation/SearchEverywhereLesson.kt +++ b/plugins/ide-features-trainer/src/training/learn/lesson/general/navigation/SearchEverywhereLesson.kt @@ -12,6 +12,7 @@ import com.intellij.psi.PsiNameIdentifierOwner import com.intellij.psi.search.EverythingGlobalScope import com.intellij.psi.search.ProjectScope import com.intellij.ui.components.fields.ExtendableTextField +import com.intellij.ui.searchComponents.ExtendableSearchTextField import com.intellij.util.ui.UIUtil import training.dsl.* import training.dsl.LessonUtil.adjustPopupPosition @@ -45,10 +46,9 @@ abstract class SearchEverywhereLesson : KLesson("Search everywhere", LessonsBund override val lessonContent: LessonContext.() -> Unit = { configurationTasks() sdkConfigurationTasks() - task("SearchEverywhere") { - triggerAndBorderHighlight().component { ui: ExtendableTextField -> - UIUtil.getParentOfType(SearchEverywhereUI::class.java, ui) != null + triggerAndBorderHighlight().component { ui: ExtendableSearchTextField -> + ui.isShowing } text(LessonsBundle.message("search.everywhere.invoke.search.everywhere", LessonUtil.actionName(it), LessonUtil.rawKeyStroke(KeyEvent.VK_SHIFT)))