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 assert if CompilerReferenceService is not enabled

Browse Source 
GitOrigin-RevId: fd2817b301958615f93a6d296ff91c7f53adf51d
This commit is contained in:
Vladimir Krivosheev
2020-07-19 14:47:32 +00:00
committed by intellij-monorepo-bot
parent 64cd9ba1a6
commit 55cfa89a49
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/inspection/FrequentlyUsedInheritorInspection.java
+14 -11
View File
@@ -111,18 +111,21 @@ public final class FrequentlyUsedInheritorInspection extends AbstractBaseJavaLoc
}
}
@NotNull
private static List<ClassAndInheritorCount> getTopInheritorsUsingCompilerIndices(@NotNull PsiClass aClass,
@NotNull GlobalSearchScope searchScope,
@NotNull PsiElement place) {
private static @NotNull List<ClassAndInheritorCount> getTopInheritorsUsingCompilerIndices(@NotNull PsiClass aClass,
@NotNull GlobalSearchScope searchScope,
@NotNull PsiElement place) {
String qName = aClass.getQualifiedName();
if (qName == null) return Collections.emptyList();
if (qName == null) {
return Collections.emptyList();
}
final Project project = aClass.getProject();
CompilerReferenceServiceEx compilerRefService = (CompilerReferenceServiceEx)CompilerReferenceService.getInstance(project);
Project project = aClass.getProject();
CompilerReferenceServiceEx compilerRefService = (CompilerReferenceServiceEx)CompilerReferenceService.getInstanceIfEnabled(project);
try {
int id = compilerRefService.getNameId(qName);
if (id == 0) return Collections.emptyList();
int id = compilerRefService == null ? 0 : compilerRefService.getNameId(qName);
if (id == 0) {
return Collections.emptyList();
}
return findInheritors(aClass, new CompilerRef.JavaCompilerClassRef(id), searchScope, place, -1, project, compilerRefService);
}
catch (ReferenceIndexUnavailableException e) {
@@ -131,7 +134,7 @@ public final class FrequentlyUsedInheritorInspection extends AbstractBaseJavaLoc
}
private static List<ClassAndInheritorCount> findInheritors(@NotNull PsiClass aClass,
@NotNull CompilerRef.JavaCompilerClassRef classAsCompilerRef,
@NotNull CompilerRef.CompilerClassHierarchyElementDef classAsCompilerRef,
@NotNull GlobalSearchScope searchScope,
@NotNull PsiElement place,
int hierarchyCardinality,
@@ -194,7 +197,7 @@ public final class FrequentlyUsedInheritorInspection extends AbstractBaseJavaLoc
CompilerReferenceServiceEx compilerRefService) {
if (classAndInheritorCount.psi.isInterface()) {
return findInheritors(classAndInheritorCount.psi,
(CompilerRef.JavaCompilerClassRef)classAndInheritorCount.descriptor,
classAndInheritorCount.descriptor,
searchScope,
place,
hierarchyCardinality,