Update remaining usages of TreeSpeedSearch

GitOrigin-RevId: 87636623fa98b57d1c90425537ed1be10cfac883

RegExpSupport/src/org/intellij/lang/regexp/inspection/custom/RegExpSampleTree.kt

@@ -41,7 +41,7 @@ class RegExpSampleTree(val doubleClickConsumer: (RegExpSample) -> Unit) {
       isEditable = false
       selectionModel.selectionMode = TreeSelectionModel.SINGLE_TREE_SELECTION
 
-      val speedSearch = TreeSpeedSearch(
+      val speedSearch = TreeSpeedSearch.installOn(
         this,
         false,
         Function { treePath: TreePath ->

java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTree.java

@@ -90,7 +90,7 @@ public abstract class DebuggerTree extends DnDAwareTree implements DataProvider,
 
     setModel(model);
 
-    final TreeSpeedSearch search = new TreeSpeedSearch(this);
+    final TreeSpeedSearch search = TreeSpeedSearch.installOn(this);
     search.setComparator(new SpeedSearchComparator(false));
   }
 

java/idea-ui/src/com/intellij/ide/starters/local/wizard/StarterLibrariesStep.kt

@@ -170,7 +170,7 @@ open class StarterLibrariesStep(contextProvider: StarterContextProvider) : Modul
       }
     }
 
-    TreeSpeedSearch(librariesList, false) { treePath: TreePath ->
+    TreeSpeedSearch.installOn(librariesList, false) { treePath: TreePath ->
       when (val dataObject = (treePath.lastPathComponent as DefaultMutableTreeNode).userObject) {
         is LibraryCategory -> dataObject.title
         is Library -> dataObject.title

platform/execution-impl/src/com/intellij/execution/impl/RunConfigurable.kt

@@ -194,16 +194,16 @@ open class RunConfigurable @JvmOverloads constructor(protected val project: Proj
       override fun getSourceActions(c: JComponent) = COPY_OR_MOVE
     }
     TreeUtil.installActions(tree)
-    TreeSpeedSearch(tree, false) { o ->
+    TreeSpeedSearch.installOn(tree, false) { o ->
       val node = o.lastPathComponent as DefaultMutableTreeNode
       when (val userObject = node.userObject) {
-        is RunnerAndConfigurationSettingsImpl -> return@TreeSpeedSearch userObject.name
-        is SingleConfigurationConfigurable<*> -> return@TreeSpeedSearch userObject.nameText
+        is RunnerAndConfigurationSettingsImpl -> return@installOn userObject.name
+        is SingleConfigurationConfigurable<*> -> return@installOn userObject.nameText
         else -> if (userObject is ConfigurationType) {
-          return@TreeSpeedSearch userObject.displayName
+          return@installOn userObject.displayName
         }
         else if (userObject is String) {
-          return@TreeSpeedSearch userObject
+          return@installOn userObject
         }
       }
       o.toString()

platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTreeWithPreviewPanel.java

@@ -174,7 +174,7 @@ public abstract class OptionTreeWithPreviewPanel extends CustomizableLanguageCod
     DefaultTreeModel model = new DefaultTreeModel(rootNode);
 
     final Tree optionsTree = new Tree(model);
-    TreeSpeedSearch speedSearch = new TreeSpeedSearch(
+    TreeSpeedSearch speedSearch = TreeSpeedSearch.installOn(
       optionsTree,
       true,
       path -> {

platform/lang-impl/src/com/intellij/build/BuildTreeConsoleView.java

@@ -869,7 +869,7 @@ public final class BuildTreeConsoleView implements ConsoleView, DataProvider, Bu
     tree.setRootVisible(false);
     EditSourceOnDoubleClickHandler.install(tree);
     EditSourceOnEnterKeyHandler.install(tree);
-    new TreeSpeedSearch(tree).setComparator(new SpeedSearchComparator(false));
+    TreeSpeedSearch.installOn(tree).setComparator(new SpeedSearchComparator(false));
     TreeUtil.installActions(tree);
     if (Registry.is("build.toolwindow.show.inline.statistics")) {
       tree.setCellRenderer(new MyNodeRenderer());

platform/lang-impl/src/com/intellij/codeInsight/hints/settings/InlaySettingsPanel.kt

@@ -111,7 +111,7 @@ class InlaySettingsPanel(val project: Project) : JPanel(BorderLayout()) {
 
     tree = object : CheckboxTree(InlaySettingsTreeRenderer(), root, CheckPolicy(true, true, true, false)) {
       override fun installSpeedSearch() {
-        TreeSpeedSearch(this, true) {
+        TreeSpeedSearch.installOn(this, true) {
           getName(it.lastPathComponent as DefaultMutableTreeNode,
                   it.parentPath?.lastPathComponent as DefaultMutableTreeNode?)
         }

platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateTree.java

@@ -50,7 +50,7 @@ class LiveTemplateTree extends CheckboxTree implements DataProvider, CopyProvide
 
   @Override
   protected void installSpeedSearch() {
-    new TreeSpeedSearch(this, true, o -> {
+    TreeSpeedSearch.installOn(this, true, o -> {
       Object object = ((DefaultMutableTreeNode)o.getLastPathComponent()).getUserObject();
       if (object instanceof TemplateGroup) {
         return ((TemplateGroup)object).getName();

platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java

@@ -404,7 +404,7 @@ public class MemberChooser<T extends ClassMember> extends DialogWrapper implemen
   }
 
   protected void installSpeedSearch() {
-    final TreeSpeedSearch treeSpeedSearch = new TreeSpeedSearch(myTree, false, path -> {
+    final TreeSpeedSearch treeSpeedSearch = TreeSpeedSearch.installOn(myTree, false, path -> {
       final ElementNode lastPathComponent = (ElementNode)path.getLastPathComponent();
       if (lastPathComponent == null) return null;
       String text = lastPathComponent.getDelegate().getText();

platform/lang-impl/src/com/intellij/internal/ImageDuplicateResultsDialog.java

@@ -70,7 +70,7 @@ public class ImageDuplicateResultsDialog extends DialogWrapper {
     myTree.setRootVisible(true);
     MyCellRenderer renderer = new MyCellRenderer();
     myTree.setCellRenderer(renderer);
-    mySpeedSearch = new TreeSpeedSearch(myTree, false, x -> renderer.getTreeCellRendererComponent(myTree, x.getLastPathComponent(), false, false, false, 0, false).toString());
+    mySpeedSearch = TreeSpeedSearch.installOn(myTree, false, x -> renderer.getTreeCellRendererComponent(myTree, x.getLastPathComponent(), false, false, false, 0, false).toString());
     init();
     TreeUtil.expandAll(myTree);
     setTitle("Image Duplicates");

platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ConfigureUnloadedModulesDialog.kt

@@ -217,7 +217,7 @@ private class ModuleDescriptionsTree(project: Project) {
   init {
     tree.isRootVisible = false
     tree.showsRootHandles = true
-    TreeSpeedSearch(tree, true) { treePath -> (treePath.lastPathComponent as? ModuleDescriptionTreeNode)?.text ?: "" }
+    TreeSpeedSearch.installOn(tree, true) { treePath -> (treePath.lastPathComponent as? ModuleDescriptionTreeNode)?.text ?: "" }
     tree.cellRenderer = ModuleDescriptionTreeRenderer()
   }
 

platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java

@@ -94,7 +94,7 @@ public class CustomizableActionsPanel {
   }
 
   static FilterComponent setupFilterComponent(JTree tree) {
-    final TreeSpeedSearch mySpeedSearch = new TreeSpeedSearch(tree, true, new TreePathStringFunction()) {
+    final TreeSpeedSearch mySpeedSearch = new TreeSpeedSearch(tree, true, null, new TreePathStringFunction()) {
       @Override
       public boolean isPopupActive() {
         return /*super.isPopupActive()*/true;
@@ -115,6 +115,7 @@ public class CustomizableActionsPanel {
         //super.showPopup();
       }
     };
+    mySpeedSearch.setupListeners();
     final FilterComponent filterComponent = new FilterComponent("CUSTOMIZE_ACTIONS", 5) {
       @Override
       public void filter() {

platform/platform-impl/src/com/intellij/ui/FilteringTree.java

@@ -155,9 +155,10 @@ public abstract class FilteringTree<T extends DefaultMutableTreeNode, U> {
   }
 
   public void installSimple() {
-    SpeedSearchSupply supply =
+    TreeSpeedSearch supply =
       new TreeSpeedSearch(myTree,
                           true,
+                          null,
                           p -> StringUtil.notNullize(getText(p == null ? null : getUserObject((TreeNode)p.getLastPathComponent())))) {
         @Override
         protected void onSearchFieldUpdated(String pattern) {
@@ -174,6 +175,7 @@ public abstract class FilteringTree<T extends DefaultMutableTreeNode, U> {
           }
         }
       };
+    supply.setupListeners();
     getSearchModel().setSpeedSearch(supply);
   }
 

platform/platform-impl/src/com/intellij/ui/TreeSpeedSearch.java

@@ -53,6 +53,14 @@ public class TreeSpeedSearch extends SpeedSearchBase<JTree> {
     return descriptor != null ? descriptor.toString() : TO_STRING.apply(path);
   };
 
+
+  /**
+   * @param sig parameter is used to avoid clash with the deprecated constructor
+   */
+  protected TreeSpeedSearch(@NotNull JTree tree, Void sig) {
+    this(tree, false, sig, TO_STRING);
+  }
+
   /**
    * @param sig parameter is used to avoid clash with the deprecated constructor
    */

platform/platform-impl/src/com/intellij/ui/TreeUIHelperImpl.java

@@ -26,7 +26,7 @@ final class TreeUIHelperImpl extends TreeUIHelper {
 
   @Override
   public void installTreeSpeedSearch(final JTree tree) {
-    new TreeSpeedSearch(tree);
+    TreeSpeedSearch.installOn(tree);
   }
 
   @Override

platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/ExistingTemplatesComponent.java

@@ -332,7 +332,7 @@ public final class ExistingTemplatesComponent {
       }
     });
 
-    final TreeSpeedSearch speedSearch = new TreeSpeedSearch(
+    final TreeSpeedSearch speedSearch = TreeSpeedSearch.installOn(
       tree,
       false,
       treePath -> {

plugins/coverage-common/src/com/intellij/coverage/view/CoverageView.java

@@ -177,7 +177,7 @@ public class CoverageView extends BorderLayoutPanel implements DataProvider, Dis
       }
     }.installOn(myTable.getTree());
 
-    final TreeSpeedSearch speedSearch = new TreeSpeedSearch(myTable.getTree(), false, path -> path.getLastPathComponent().toString());
+    final TreeSpeedSearch speedSearch = TreeSpeedSearch.installOn(myTable.getTree(), false, path -> path.getLastPathComponent().toString());
     speedSearch.setCanExpand(true);
     speedSearch.setClearSearchOnNavigateNoMatch(true);
     PopupHandler.installPopupMenu(myTable, createPopupGroup(), "CoverageViewPopup");

plugins/grazie/src/main/kotlin/com/intellij/grazie/ide/ui/grammar/tabs/rules/component/GrazieTreeComponent.kt

@@ -50,7 +50,7 @@ internal class GrazieTreeComponent(onSelectionChanged: (meta: Any) -> Unit) : Ch
   }
 
   override fun installSpeedSearch() {
-    TreeSpeedSearch(this, false) { (it.lastPathComponent as GrazieRulesTreeNode).nodeText }
+    TreeSpeedSearch.installOn(this, false) { (it.lastPathComponent as GrazieRulesTreeNode).nodeText }
   }
 
   override val component by lazy {

plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenArchetypesStep.java

@@ -103,7 +103,7 @@ public class MavenArchetypesStep extends ModuleWizardStep implements Disposable
       }
     });
 
-    new TreeSpeedSearch(myArchetypesTree, false, path -> {
+    TreeSpeedSearch.installOn(myArchetypesTree, false, path -> {
       MavenArchetype info = getArchetypeInfoFromPathComponent(path.getLastPathComponent());
       return info.groupId + ":" + info.artifactId + ":" + info.version;
     }).setComparator(new SpeedSearchComparator(false));

plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserComponent.java

@@ -199,7 +199,7 @@ public class RepositoryBrowserComponent extends JPanel implements Disposable, Da
       ScrollPaneFactory.createScrollPane(myRepositoryTree, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
     add(scrollPane, BorderLayout.CENTER);
     myRepositoryTree.setCellRenderer(new SvnRepositoryTreeCellRenderer());
-    TreeSpeedSearch search = new TreeSpeedSearch(myRepositoryTree, false, o -> {
+    TreeSpeedSearch search = TreeSpeedSearch.installOn(myRepositoryTree, false, o -> {
       Object component = o.getLastPathComponent();
       if (component instanceof RepositoryTreeNode) {
         return ((RepositoryTreeNode)component).getURL().toDecodedString();