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

search in local scope too

Browse Source
This commit is contained in:
Alexey Kudravtsev
2017-06-30 13:38:29 +03:00
parent 27768a33a8
commit a81f94669d
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyDirectInheritorsSearcher.java
+11 -14
View File
@@ -21,6 +21,7 @@ import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.impl.search.StubHierarchyInheritorSearcher;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.GlobalSearchScopeUtil;
import com.intellij.psi.search.SearchScope;
import com.intellij.psi.search.searches.DirectClassInheritorsSearch;
import com.intellij.psi.stubs.StubIndex;
@@ -71,23 +72,19 @@ public class GroovyDirectInheritorsSearcher implements QueryExecutor<PsiClass, D
final PsiClass clazz = queryParameters.getClassToProcess();
final SearchScope scope = queryParameters.getScope();
Project project = PsiUtilCore.getProjectInReadAction(clazz);
if (scope instanceof GlobalSearchScope) {
final List<PsiClass> candidates = DumbService.getInstance(project).runReadActionInSmartMode(() -> {
if (!clazz.isValid()) return Collections.emptyList();
GlobalSearchScope restrictedScope = StubHierarchyInheritorSearcher.restrictScope((GlobalSearchScope)scope);
return getDerivingClassCandidates(clazz, restrictedScope, queryParameters.includeAnonymous());
});
for (final PsiClass candidate : candidates) {
if (!queryParameters.isCheckInheritance() || isInheritor(clazz, candidate, project)) {
if (!consumer.process(candidate)) {
return false;
}
GlobalSearchScope globalSearchScope = GlobalSearchScopeUtil.toGlobalSearchScope(scope, project);
final List<PsiClass> candidates = DumbService.getInstance(project).runReadActionInSmartMode(() -> {
if (!clazz.isValid()) return Collections.emptyList();
GlobalSearchScope restrictedScope = StubHierarchyInheritorSearcher.restrictScope(globalSearchScope);
return getDerivingClassCandidates(clazz, restrictedScope, queryParameters.includeAnonymous());
});
for (final PsiClass candidate : candidates) {
if (!queryParameters.isCheckInheritance() || isInheritor(clazz, candidate, project)) {
if (!consumer.process(candidate)) {
return false;
}
}
return true;
}
return true;
}