From aefbcc77a9772ac01b50fda3945fa16310de7bdd Mon Sep 17 00:00:00 2001 From: peter Date: Fri, 9 Sep 2011 14:58:36 +0200 Subject: [PATCH] fix NPE in SdkOrLibraryWeigher --- .../com/intellij/psi/util/proximity/KnownElementWeigher.java | 4 +++- .../com/intellij/psi/util/proximity/SdkOrLibraryWeigher.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/psi/util/proximity/KnownElementWeigher.java b/java/java-impl/src/com/intellij/psi/util/proximity/KnownElementWeigher.java index 16c9b75cc916..160808c6e7c7 100644 --- a/java/java-impl/src/com/intellij/psi/util/proximity/KnownElementWeigher.java +++ b/java/java-impl/src/com/intellij/psi/util/proximity/KnownElementWeigher.java @@ -16,6 +16,7 @@ package com.intellij.psi.util.proximity; import com.intellij.openapi.extensions.Extensions; +import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.CommonClassNames; import com.intellij.psi.PsiClass; @@ -36,7 +37,8 @@ public class KnownElementWeigher extends ProximityWeigher { if (weigh != null) return weigh; } - if (!SdkOrLibraryWeigher.isJdkElement(element, location.getProject())) { + Project project = location.getProject(); + if (project == null || !SdkOrLibraryWeigher.isJdkElement(element, project)) { return 0; } diff --git a/platform/lang-impl/src/com/intellij/psi/util/proximity/SdkOrLibraryWeigher.java b/platform/lang-impl/src/com/intellij/psi/util/proximity/SdkOrLibraryWeigher.java index ab0f1f39ffeb..5a6b7145a9dc 100644 --- a/platform/lang-impl/src/com/intellij/psi/util/proximity/SdkOrLibraryWeigher.java +++ b/platform/lang-impl/src/com/intellij/psi/util/proximity/SdkOrLibraryWeigher.java @@ -37,7 +37,7 @@ public class SdkOrLibraryWeigher extends ProximityWeigher { return project == null ? null : isJdkElement(element, project); } - static boolean isJdkElement(PsiElement element, final Project project) { + static boolean isJdkElement(PsiElement element, @NotNull final Project project) { final VirtualFile file = PsiUtilCore.getVirtualFile(element); if (file != null) { List orderEntries = ProjectRootManager.getInstance(project).getFileIndex().getOrderEntriesForFile(file);