From 527f778b4aa9d052cd87aaa8faecf083e583b847 Mon Sep 17 00:00:00 2001 From: Maxim Medvedev Date: Tue, 27 Jul 2010 12:12:56 +0400 Subject: [PATCH] EA-21264 - NPE: ResolveUtil.treeWalkUp --- .../groovy/refactoring/GroovyNameSuggestionProvider.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyNameSuggestionProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyNameSuggestionProvider.java index 2e1afdbbff02..79d2b7cc642c 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyNameSuggestionProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyNameSuggestionProvider.java @@ -23,7 +23,6 @@ import com.intellij.psi.codeStyle.SuggestedNameInfo; import com.intellij.psi.statistics.JavaStatisticsManager; import com.intellij.refactoring.rename.NameSuggestionProvider; import org.jetbrains.annotations.Nullable; -import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement; import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariable; import java.util.Arrays; @@ -36,7 +35,7 @@ import java.util.Set; public class GroovyNameSuggestionProvider implements NameSuggestionProvider { @Override public SuggestedNameInfo getSuggestedNames(final PsiElement element, @Nullable PsiElement nameSuggestionContext, Set result) { - if (nameSuggestionContext == null || !(element instanceof GroovyPsiElement)) return null; + if (nameSuggestionContext == null) nameSuggestionContext = element; if (element instanceof GrVariable) { final PsiType type = ((GrVariable)element).getTypeGroovy(); if (type != null) {