From 7a4fa5709aa513f5f36c56e932d364bea8db322b Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Wed, 30 Jun 2010 15:24:04 +0400 Subject: [PATCH] NPE in goto handler --- .../codeInsight/navigation/GotoImplementationHandler.java | 2 ++ .../com/intellij/codeInsight/navigation/GotoTargetHandler.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoImplementationHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoImplementationHandler.java index 90ebe563566e..e00854b7f245 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoImplementationHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoImplementationHandler.java @@ -22,6 +22,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; +import org.jetbrains.annotations.Nullable; import java.util.Collections; @@ -30,6 +31,7 @@ public class GotoImplementationHandler extends GotoTargetHandler { return "navigation.goto.implementation"; } + @Nullable public GotoData getSourceAndTargetElements(Editor editor, PsiFile file) { int offset = editor.getCaretModel().getOffset(); PsiElement source = TargetElementUtilBase.getInstance().findTargetElement(editor, ImplementationSearcher.getFlags(), offset); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoTargetHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoTargetHandler.java index b79cf5a25721..7a17601f8c4b 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoTargetHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/GotoTargetHandler.java @@ -56,7 +56,7 @@ public abstract class GotoTargetHandler implements CodeInsightActionHandler { try { GotoData gotoData = getSourceAndTargetElements(editor, file); - if (gotoData.source != null) { + if (gotoData != null) { show(project, editor, file, gotoData.source, gotoData.targets, gotoData.additionalActions); } }