From d4af08afd9a5940da82d1e83a3504538fbbb8752 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 4 Sep 2014 16:48:32 +0400 Subject: [PATCH] ensure not null name suggestions: EA-41963 - NPE: DictionarySuggestionProvider.getSuggestedNames --- .../spellchecker/quickfixes/DictionarySuggestionProvider.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spellchecker/src/com/intellij/spellchecker/quickfixes/DictionarySuggestionProvider.java b/spellchecker/src/com/intellij/spellchecker/quickfixes/DictionarySuggestionProvider.java index d358990af876..08086e1a6326 100644 --- a/spellchecker/src/com/intellij/spellchecker/quickfixes/DictionarySuggestionProvider.java +++ b/spellchecker/src/com/intellij/spellchecker/quickfixes/DictionarySuggestionProvider.java @@ -20,6 +20,7 @@ import com.intellij.psi.PsiNamedElement; import com.intellij.psi.codeStyle.SuggestedNameInfo; import com.intellij.refactoring.rename.PreferrableNameSuggestionProvider; import com.intellij.spellchecker.SpellCheckerManager; +import com.intellij.util.containers.ContainerUtil; import java.util.Set; @@ -54,7 +55,7 @@ public class DictionarySuggestionProvider extends PreferrableNameSuggestionProvi SpellCheckerManager manager = SpellCheckerManager.getInstance(element.getProject()); - result.addAll(manager.getSuggestions(text)); + ContainerUtil.addAllNotNull(result, manager.getSuggestions(text)); return SuggestedNameInfo.NULL_INFO; } }