EA-21264 - NPE: ResolveUtil.treeWalkUp

This commit is contained in:
Maxim Medvedev
2010-07-27 12:12:56 +04:00
parent 92bedd52e8
commit 527f778b4a
@@ -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<String> 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) {