From 92eff14e30262eb874b0931bee75139deec2b194 Mon Sep 17 00:00:00 2001 From: Sergey Ignatov Date: Thu, 30 Jul 2026 23:18:55 +0200 Subject: [PATCH] IJAI-567 Remove Speed Search from the tool-window menu Speed Search and explicit session search are separate interactions. Keep Speed Search available independently and expose the Find shortcut in the Agent Sessions search icon tooltip. (cherry picked from commit 2d7e4e3c0893d934da843374716470b8e3eea6e2) GitOrigin-RevId: 501883018bb865294927adde1c7a77ffe81e5246 --- .../ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java | 5 +++++ .../src/com/intellij/openapi/wm/impl/ToolWindowImpl.kt | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java index c1970fba10c1..e4926dd648a9 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/TextFieldWithPopupHandlerUI.java @@ -87,6 +87,7 @@ public abstract class TextFieldWithPopupHandlerUI extends BasicTextFieldUI imple private static final @NonNls String INPLACE_HISTORY = "JTextField.Search.InplaceHistory"; private static final @NonNls String ON_CLEAR = "JTextField.Search.CancelAction"; private static final @NonNls String SEARCH_ICON = "JTextField.Search.Icon"; + private static final @NonNls String SEARCH_ICON_TOOLTIP = "JTextField.Search.IconTooltip"; private static final @NonNls String HISTORY_POPUP_ENABLED = "History.Popup.Enabled"; private static final @NonNls String SEARCH_VARIANT_VALUE = "search"; @@ -784,6 +785,10 @@ public abstract class TextFieldWithPopupHandlerUI extends BasicTextFieldUI imple @Override public String getTooltip() { + Object customTooltip = getComponent().getClientProperty(SEARCH_ICON_TOOLTIP); + if (customTooltip instanceof @NlsContexts.Tooltip String tooltip) { + return tooltip; + } String prefix = null; if (ClientProperty.get(getComponent(), INPLACE_HISTORY) != null) { prefix = IdeBundle.message("tooltip.recent.search"); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.kt b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.kt index 50fcf531e21f..1b68a7712781 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.kt +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowImpl.kt @@ -12,7 +12,6 @@ import com.intellij.ide.actions.ContextHelpAction import com.intellij.ide.actions.ToggleToolbarAction import com.intellij.ide.actions.ToolWindowMoveAction import com.intellij.ide.actions.ToolwindowFusEventFields -import com.intellij.ide.actions.speedSearch.SpeedSearchAction import com.intellij.ide.impl.ContentManagerWatcher import com.intellij.ide.ui.UISettings import com.intellij.ide.util.PropertiesComponent @@ -870,7 +869,6 @@ private val LOG = logger() group.addSeparator() } group.addAction(ActionManager.getInstance().getAction("MoveToolWindowTabToEditorAction")) - group.add(ActionManager.getInstance().getAction(SpeedSearchAction.ID)) group.addSeparator() contentManager.valueIfInitialized?.let { group.add(TabbedContentAction.CloseAllAction(it))