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

IDEA-367535 cache classes by name and scope if multiverse is enabled

Browse Source 
GitOrigin-RevId: 5c8d0a1d6eaf2aee46f3e3a6fa41743d45b06208
This commit is contained in:
Max Medvedev
2025-08-21 18:11:44 +00:00
committed by intellij-monorepo-bot
parent 1b85bc83a1
commit d3f92d820d
1 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java
+25 -19
View File
@@ -44,7 +44,7 @@ public class PsiPackageImpl extends PsiPackageBase implements PsiPackage, Querya
private static final Logger LOG = Logger.getInstance(PsiPackageImpl.class);
private volatile CachedValue<PsiModifierList> myAnnotationList;
private volatile SoftReference<Map<String, PsiClass[]>> myClassCache;
private volatile SoftReference<Map<GlobalSearchScope, Map<String, PsiClass[]>>> myClassCache;
private volatile CachedValue<Collection<PsiDirectory>> myDirectories;
private volatile CachedValue<Collection<PsiDirectory>> myDirectoriesWithLibSources;
private volatile CachedValue<Collection<PsiFile>> myFiles;
@@ -191,27 +191,33 @@ public class PsiPackageImpl extends PsiPackageBase implements PsiPackage, Querya
return getCachedClassesInDumbMode(name, scope);
}
if (CodeInsightContexts.isSharedSourceSupportEnabled(getProject())) {
// todo IJPL-339 this line introduces performance degradation, see IDEA-367535
return findAllClasses(name, scope);
}
else {
Map<String, PsiClass[]> map = dereference(myClassCache);
if (map == null) {
myClassCache = new SoftReference<>(map = ContainerUtil.createConcurrentSoftValueMap());
}
PsiClass[] classes = map.get(name);
if (classes != null) {
return classes;
}
// if shared source support is enabled, we need to use the real scope,
// because we need to specify the proper context for files with several contexts
boolean sharedSourceSupportEnabled = CodeInsightContexts.isSharedSourceSupportEnabled(getProject());
GlobalSearchScope effectiveScope = sharedSourceSupportEnabled ? scope : GlobalSearchScope.everythingScope(getProject());
RecursionGuard.StackStamp stamp = RecursionManager.markStack();
classes = findAllClasses(name, GlobalSearchScope.everythingScope(getProject()));
if (stamp.mayCacheNow()) {
map.put(name, classes);
}
return getCachedClassesByNameImpl(name, effectiveScope);
}
private PsiClass @NotNull [] getCachedClassesByNameImpl(@NotNull String name, @NotNull GlobalSearchScope scope) {
Map<GlobalSearchScope, Map<String, PsiClass[]>> cache = dereference(myClassCache);
if (cache == null) {
cache = ContainerUtil.createConcurrentSoftValueMap();
myClassCache = new SoftReference<>(cache);
}
Map<String, PsiClass[]> map = cache.computeIfAbsent(scope, __ -> ContainerUtil.createConcurrentSoftValueMap());
PsiClass[] classes = map.get(name);
if (classes != null) {
return classes;
}
RecursionGuard.StackStamp stamp = RecursionManager.markStack();
classes = findAllClasses(name, scope);
if (stamp.mayCacheNow()) {
map.put(name, classes);
}
return classes;
}
private PsiClass @NotNull [] findAllClasses(@NotNull String shortName, @NotNull GlobalSearchScope scope) {