From c7fdb26129f382b8eaa2defa082dd58a750818ea Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 16 Jun 2016 14:28:47 +0300 Subject: [PATCH] EA-84131 - IAE: SearchableOptionsRegistrarImpl.getProcessedWordsWithoutStemming --- .../src/com/intellij/ide/plugins/IdeaPluginDescriptor.java | 1 + .../com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java | 1 + .../ide/ui/search/SearchableOptionsRegistrarImpl.java | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/platform/core-api/src/com/intellij/ide/plugins/IdeaPluginDescriptor.java b/platform/core-api/src/com/intellij/ide/plugins/IdeaPluginDescriptor.java index 549946e76e09..6b819b49255c 100644 --- a/platform/core-api/src/com/intellij/ide/plugins/IdeaPluginDescriptor.java +++ b/platform/core-api/src/com/intellij/ide/plugins/IdeaPluginDescriptor.java @@ -36,6 +36,7 @@ public interface IdeaPluginDescriptor extends PluginDescriptor { String getChangeNotes(); + @NotNull String getName(); @NotNull diff --git a/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java b/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java index c890dcd93612..a886ca3e0619 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java +++ b/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java @@ -351,6 +351,7 @@ public class IdeaPluginDescriptorImpl implements IdeaPluginDescriptor { return myChangeNotes; } + @NotNull @Override public String getName() { return myName; diff --git a/platform/platform-impl/src/com/intellij/ide/ui/search/SearchableOptionsRegistrarImpl.java b/platform/platform-impl/src/com/intellij/ide/ui/search/SearchableOptionsRegistrarImpl.java index fa2053bbc96f..bef276e25da9 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/search/SearchableOptionsRegistrarImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/search/SearchableOptionsRegistrarImpl.java @@ -175,13 +175,14 @@ public class SearchableOptionsRegistrarImpl extends SearchableOptionsRegistrar { } for (IdeaPluginDescriptor plugin : PluginManagerCore.getPlugins()) { - final Set words = getProcessedWordsWithoutStemming(plugin.getName()); + final String pluginName = plugin.getName(); + final Set words = getProcessedWordsWithoutStemming(pluginName); final String description = plugin.getDescription(); if (description != null) { words.addAll(getProcessedWordsWithoutStemming(description)); } for (String word : words) { - addOption(word, null, plugin.getName(), PluginManagerConfigurable.ID, PluginManagerConfigurable.DISPLAY_NAME); + addOption(word, null, pluginName, PluginManagerConfigurable.ID, PluginManagerConfigurable.DISPLAY_NAME); } } }