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

EA-210048 - assert: LazyParseableElement.ensureParsed

Browse Source 
GitOrigin-RevId: a0385b5b6d95e567986eda72fae235b0c85e8c90
This commit is contained in:
Alexey Kudravtsev
2019-08-16 16:06:48 +03:00
committed by intellij-monorepo-bot
parent d3db7e6476
commit 4cc4d7dc84
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java
+16 -5
View File
@@ -48,11 +48,8 @@ public class JavaDirectInheritorsSearcher implements QueryExecutor<PsiClass, Dir
SearchScope useScope = ReadAction.compute(baseClass::getUseScope);
return AllClassesSearch.search(useScope, project).allowParallelProcessing().forEach(psiClass -> {
ProgressManager.checkCanceled();
if (psiClass.isInterface()) {
return consumer.process(psiClass);
}
final PsiClass superClass = psiClass.getSuperClass();
return superClass == null || !JavaClassInheritorsSearcher.isJavaLangObject(superClass) || consumer.process(psiClass);
if (shortCircuitCandidate(psiClass)) return true;
return consumer.process(psiClass);
});
}
@@ -116,6 +113,20 @@ public class JavaDirectInheritorsSearcher implements QueryExecutor<PsiClass, Dir
return true;
}
// true if processor should return true, false if the processor should return result of consumer.process(psiClass)
private static boolean shortCircuitCandidate(@NotNull PsiClass psiClass) {
return ReadAction.compute(() -> {
if (psiClass.isInterface()) {
return false;
}
final PsiClass superClass = psiClass.getSuperClass();
if (superClass == null || !superClass.isValid()) {
return true;
}
boolean isJavaLangObject = CommonClassNames.JAVA_LANG_OBJECT.equals(superClass.getQualifiedName());
return !isJavaLangObject;
});
}
private static PsiClass getClassToSearch(@NotNull DirectClassInheritorsSearch.SearchParameters parameters) {
return ReadAction.compute(() -> (PsiClass)PsiUtil.preferCompiledElement(parameters.getClassToProcess()));
}