diff --git a/platform/lang-impl/src/com/intellij/ide/ui/search/TraverseUIStarter.java b/platform/lang-impl/src/com/intellij/ide/ui/search/TraverseUIStarter.java index 0da1029c159b..4997d3d6455b 100644 --- a/platform/lang-impl/src/com/intellij/ide/ui/search/TraverseUIStarter.java +++ b/platform/lang-impl/src/com/intellij/ide/ui/search/TraverseUIStarter.java @@ -90,7 +90,7 @@ public class TraverseUIStarter extends ApplicationStarterEx { } public static void startup(String outputPath) throws IOException { - Map> options = new HashMap<>(); + Map> options = new LinkedHashMap<>(); SearchUtil.processProjectConfigurables(ProjectManager.getInstance().getDefaultProject(), options); Element root = new Element(OPTIONS); diff --git a/platform/platform-impl/src/com/intellij/ide/ui/search/SearchUtil.java b/platform/platform-impl/src/com/intellij/ide/ui/search/SearchUtil.java index dd4cfb05c9ee..96ba835370b8 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/search/SearchUtil.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/search/SearchUtil.java @@ -28,8 +28,6 @@ import com.intellij.ui.JBColor; import com.intellij.ui.SimpleColoredComponent; import com.intellij.ui.SimpleTextAttributes; import com.intellij.ui.TabbedPaneWrapper; -import com.intellij.ui.tabs.JBTabs; -import com.intellij.ui.tabs.TabInfo; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -143,15 +141,14 @@ public class SearchUtil { } } } - else if (component instanceof JBTabs) { - final JBTabs tabbedPane = (JBTabs)component; + else if (component instanceof TabbedPaneWrapper.TabbedPaneHolder) { + final TabbedPaneWrapper tabbedPane = ((TabbedPaneWrapper.TabbedPaneHolder)component).getTabbedPaneWrapper(); final int tabCount = tabbedPane.getTabCount(); for (int i = 0; i < tabCount; i++) { - TabInfo tabInfo = tabbedPane.getTabAt(i); - String tabTitle = tabInfo.getText(); + String tabTitle = tabbedPane.getTitleAt(i); final String title = path != null ? path + '.' + tabTitle : tabTitle; processUILabel(title, configurableOptions, title); - final JComponent tabComponent = tabInfo.getComponent(); + final JComponent tabComponent = tabbedPane.getComponentAt(i); if (tabComponent != null) { processComponent(tabComponent, configurableOptions, title); } diff --git a/resources-en/src/search/searchableOptions.xml b/resources-en/src/search/searchableOptions.xml index 27a97be5d39c..09a006cdf69a 100644 --- a/resources-en/src/search/searchableOptions.xml +++ b/resources-en/src/search/searchableOptions.xml @@ -4,11149 +4,6 @@ build by traverseUI command (see com.intellij.ide.ui.search.TraverseUIStarter for details). --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file