MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-04 08:51:02 +07:00
Code Issues Packages Projects Releases Wiki Activity

respect scope when searching inheritors of Object

Browse Source 
#SCL-16771

GitOrigin-RevId: 8bf09142c2e854d09f64d80202329d059b172c96
This commit is contained in:
Nikolay.Tropin
2019-12-23 12:42:39 +03:00
committed by intellij-monorepo-bot
parent 4bbcd0421f
commit 244be8b378
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaDirectInheritorsSearcher.java
View File

@@ -48,10 +48,13 @@ public class JavaDirectInheritorsSearcher implements QueryExecutor<PsiClass, Dir
PsiClass baseClass = getClassToSearch(parameters);
assert parameters.isCheckInheritance();
SearchScope scope = parameters.getScope();
final Project project = PsiUtilCore.getProjectInReadAction(baseClass);
if (JavaClassInheritorsSearcher.isJavaLangObject(baseClass)) {
SearchScope useScope = ReadAction.compute(baseClass::getUseScope);
return AllClassesSearch.search(useScope, project).allowParallelProcessing().forEach(psiClass -> {
SearchScope actualScope = useScope.intersectWith(scope);
return AllClassesSearch.search(actualScope, project).allowParallelProcessing().forEach(psiClass -> {
ProgressManager.checkCanceled();
if (shortCircuitCandidate(psiClass)) return true;
return consumer.process(psiClass);
@@ -64,7 +67,6 @@ public class JavaDirectInheritorsSearcher implements QueryExecutor<PsiClass, Dir
return true;
}
SearchScope scope = parameters.getScope();
VirtualFile baseClassJarFile = null;
// iterate by same-FQN groups. For each group process only same-jar subclasses, or all of them if they are all outside the jarFile.
int groupStart = 0;