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

tolerate classes with no containing file, wherever they come from (EA-90345 - NPE: DefaultClassNavigationContributor$.process)

Browse Source
This commit is contained in:
peter
2016-10-28 12:44:33 +02:00
parent cb66cc07a1
commit 3f104634fe
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/ide/util/gotoByName/DefaultClassNavigationContributor.java
+7 -1
View File
@@ -21,6 +21,7 @@ import com.intellij.navigation.NavigationItem;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiFile;
import com.intellij.psi.codeStyle.MinusculeMatcher;
import com.intellij.psi.codeStyle.NameUtil;
import com.intellij.psi.presentation.java.SymbolPresentationUtil;
@@ -113,7 +114,7 @@ public class DefaultClassNavigationContributor implements ChooseByNameContributo
@Override
public boolean process(PsiClass aClass) {
if (aClass.getContainingFile().getVirtualFile() == null || !aClass.isPhysical()) return true;
if (!isPhysical(aClass)) return true;
if (isAnnotation && !aClass.isAnnotationType()) return true;
if (innerMatcher != null) {
if (aClass.getContainingClass() == null) return true;
@@ -124,4 +125,9 @@ public class DefaultClassNavigationContributor implements ChooseByNameContributo
}
}, parameters.getSearchScope(), parameters.getIdFilter());
}
private static boolean isPhysical(PsiClass aClass) {
PsiFile file = aClass.getContainingFile();
return file != null && file.getVirtualFile() != null && aClass.isPhysical();
}
}