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

HighlightingCaches#ALL_SUB_CLASSES_NO_ANONYMOUS: separate cache for non-anonymous classes

Browse Source 
GitOrigin-RevId: ce4b5c26adf7a1e0a960cbe6270b0dcb4ea6373f
This commit is contained in:
Tagir Valeev
2019-08-09 15:03:05 +03:00
committed by intellij-monorepo-bot
parent 85a468f267
commit 25ebe168b4
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-indexing-impl/src/com/intellij/psi/impl/search/HighlightingCaches.java
+2
View File
@@ -55,6 +55,8 @@ class HighlightingCaches {
final ConcurrentMap<PsiClass, PsiClass[]> DIRECT_SUB_CLASSES = createWeakCache();
// baseClass -> all sub classes transitively, including anonymous
final ConcurrentMap<PsiClass, Iterable<PsiClass>> ALL_SUB_CLASSES = createWeakCache();
// baseClass -> all sub classes transitively, excluding anonymous
final ConcurrentMap<PsiClass, Iterable<PsiClass>> ALL_SUB_CLASSES_NO_ANONYMOUS = createWeakCache();
// baseMethod -> all overriding methods
final Map<PsiMethod, Iterable<PsiMethod>> OVERRIDING_METHODS = createWeakCache();
java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaClassInheritorsSearcher.java
+8 -7
View File
@@ -77,13 +77,10 @@ public class JavaClassInheritorsSearcher extends QueryExecutorBase<PsiClass, Cla
return;
}
Iterable<PsiClass> cached = getOrComputeSubClasses(project, baseClass, searchScope);
Iterable<PsiClass> cached = getOrComputeSubClasses(project, baseClass, searchScope, parameters.isIncludeAnonymous());
for (final PsiClass subClass : cached) {
ProgressManager.checkCanceled();
if (subClass instanceof PsiAnonymousClass && !parameters.isIncludeAnonymous()) {
continue;
}
if (ReadAction.compute(() ->
checkCandidate(subClass, parameters) && !consumer.process(subClass))) {
return;
@@ -92,8 +89,12 @@ public class JavaClassInheritorsSearcher extends QueryExecutorBase<PsiClass, Cla
}
@NotNull
private static Iterable<PsiClass> getOrComputeSubClasses(@NotNull Project project, @NotNull PsiClass baseClass, @NotNull SearchScope searchScopeForNonPhysical) {
ConcurrentMap<PsiClass, Iterable<PsiClass>> map = HighlightingCaches.getInstance(project).ALL_SUB_CLASSES;
private static Iterable<PsiClass> getOrComputeSubClasses(@NotNull Project project,
@NotNull PsiClass baseClass,
@NotNull SearchScope searchScopeForNonPhysical,
boolean includeAnonymous) {
HighlightingCaches caches = HighlightingCaches.getInstance(project);
ConcurrentMap<PsiClass, Iterable<PsiClass>> map = includeAnonymous ? caches.ALL_SUB_CLASSES : caches.ALL_SUB_CLASSES_NO_ANONYMOUS;
Iterable<PsiClass> cached = map.get(baseClass);
if (cached == null) {
// returns lazy collection of subclasses. Each call to next() leads to calculation of next batch of subclasses.
@@ -105,7 +106,7 @@ public class JavaClassInheritorsSearcher extends QueryExecutorBase<PsiClass, Cla
boolean isPhysical = ReadAction.compute(baseClass::isPhysical);
SearchScope scopeToUse = isPhysical ? GlobalSearchScope.allScope(project) : searchScopeForNonPhysical;
LazyConcurrentCollection.MoreElementsGenerator<PsiAnchor, PsiClass> generator = (candidate, processor) ->
DirectClassInheritorsSearch.search(candidate, scopeToUse).allowParallelProcessing().forEach(subClass -> {
DirectClassInheritorsSearch.search(candidate, scopeToUse, includeAnonymous).allowParallelProcessing().forEach(subClass -> {
ProgressManager.checkCanceled();
PsiAnchor pointer = ReadAction.compute(() -> PsiAnchor.create(subClass));
// append found result to subClasses as early as possible to allow other waiting threads to continue