From 01f068ffdd8bb043ff81b9f900eedf7a3069bb19 Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Wed, 4 Jul 2012 16:17:55 +0200 Subject: [PATCH] Platform: possible npe in 'go-to' popup when PsiElementNavigatableItem.getTargetElement returns null. --- .../src/com/intellij/navigation/NavigationItemFileStatus.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/lang-api/src/com/intellij/navigation/NavigationItemFileStatus.java b/platform/lang-api/src/com/intellij/navigation/NavigationItemFileStatus.java index 1c963dcff7db..0661f61af7dd 100644 --- a/platform/lang-api/src/com/intellij/navigation/NavigationItemFileStatus.java +++ b/platform/lang-api/src/com/intellij/navigation/NavigationItemFileStatus.java @@ -38,7 +38,7 @@ public class NavigationItemFileStatus { } if (item instanceof PsiElementNavigationItem) { PsiElement target = ((PsiElementNavigationItem) item).getTargetElement(); - return getPsiElementFileStatus(target); + if (target != null) return getPsiElementFileStatus(target); } return FileStatus.NOT_CHANGED; }