From 97a3b0d104fb05cfb45cae5c96f36174bd61d3c0 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Fri, 24 Aug 2012 15:19:29 +0400 Subject: [PATCH] separate actions from keymap configurable (IDEA-90207) --- .../ide/ui/search/TraverseUIStarter.java | 19 +- .../ide/util/gotoByName/GotoActionModel.java | 3 +- resources-en/src/search/searchableOptions.xml | 31232 ++++++++-------- 3 files changed, 15817 insertions(+), 15437 deletions(-) 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 05dd4c188f5b..552b29eb94a2 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 @@ -22,7 +22,6 @@ import com.intellij.ide.fileTemplates.FileTemplateManager; import com.intellij.ide.fileTemplates.impl.AllFileTemplatesConfigurable; import com.intellij.ide.plugins.AvailablePluginsManagerMain; import com.intellij.ide.plugins.PluginManagerConfigurable; -import com.intellij.internal.ImageDuplicateResultsDialog; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.impl.ActionManagerImpl; @@ -143,10 +142,19 @@ public class TraverseUIStarter implements ApplicationStarter { } } - private static void collectOptions(SearchableOptionsRegistrar optionsRegistrar, TreeSet options, String text) { + private static void collectOptions(SearchableOptionsRegistrar optionsRegistrar, + TreeSet options, + String text) { + collectOptions(optionsRegistrar, options, text, null); + } + + private static void collectOptions(SearchableOptionsRegistrar optionsRegistrar, + TreeSet options, + String text, + String path) { final Set strings = optionsRegistrar.getProcessedWordsWithoutStemming(text); for (String word : strings) { - options.add(new OptionDescription(word, text, null)); + options.add(new OptionDescription(word, text, path)); } } @@ -173,6 +181,7 @@ public class TraverseUIStarter implements ApplicationStarter { private static void processKeymap(final Element configurableElement){ final ActionManager actionManager = ActionManager.getInstance(); + final String componentName = actionManager.getComponentName(); final SearchableOptionsRegistrar searchableOptionsRegistrar = SearchableOptionsRegistrar.getInstance(); final Set ids = ((ActionManagerImpl)actionManager).getActionIds(); final TreeSet options = new TreeSet(); @@ -180,11 +189,11 @@ public class TraverseUIStarter implements ApplicationStarter { final AnAction anAction = actionManager.getAction(id); final String text = anAction.getTemplatePresentation().getText(); if (text != null) { - collectOptions(searchableOptionsRegistrar, options, text); + collectOptions(searchableOptionsRegistrar, options, text, componentName); } final String description = anAction.getTemplatePresentation().getDescription(); if (description != null) { - collectOptions(searchableOptionsRegistrar, options, description); + collectOptions(searchableOptionsRegistrar, options, description, componentName); } } writeOptions(configurableElement, options); diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java index 75618f8ea4e5..82b9be9f6dce 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java @@ -272,12 +272,13 @@ public class GotoActionModel implements ChooseByNameModel, CustomMatcherModel, C if (Comparing.strEqual(id, SETTINGS_KEY)) { final Set words = myIndex.getProcessedWords(pattern); Set optionDescriptions = null; + final String actionManagerName = myActionManager.getComponentName(); for (String word : words) { final Set descriptions = ((SearchableOptionsRegistrarImpl)myIndex).getAcceptableDescriptions(word); if (descriptions != null) { for (Iterator iterator = descriptions.iterator(); iterator.hasNext(); ) { OptionDescription description = iterator.next(); - if (description.getConfigurableId().equals("preferences.keymap")) { + if (actionManagerName.equals(description.getPath())) { iterator.remove(); } } diff --git a/resources-en/src/search/searchableOptions.xml b/resources-en/src/search/searchableOptions.xml index 4da0b17bf066..973dc3bb2ec8 100644 --- a/resources-en/src/search/searchableOptions.xml +++ b/resources-en/src/search/searchableOptions.xml @@ -17,1404 +17,7 @@