MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix NPE in SdkOrLibraryWeigher

Browse Source
This commit is contained in:
peter
2011-09-09 15:00:44 +02:00
parent c47a04e817
commit aefbcc77a9
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/util/proximity/KnownElementWeigher.java
+3 -1
View File
@@ -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;
}
platform/lang-impl/src/com/intellij/psi/util/proximity/SdkOrLibraryWeigher.java
+1 -1
View File
@@ -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<OrderEntry> orderEntries = ProjectRootManager.getInstance(project).getFileIndex().getOrderEntriesForFile(file);