searchable options: ensure order of configurables

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<SearchableConfigurable, Set<OptionDescription>> options = new HashMap<>();
+    Map<SearchableConfigurable, Set<OptionDescription>> options = new LinkedHashMap<>();
     SearchUtil.processProjectConfigurables(ProjectManager.getInstance().getDefaultProject(), options);
 
     Element root = new Element(OPTIONS);

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);
         }