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

properly cache result for different adapters in CompilerReferenceServiceImpl (IDEA-CR-14113)

Browse Source
This commit is contained in:
Dmitry Batkovich
2016-10-06 15:11:02 +03:00
parent 690c78e32c
commit d593f50d65
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/CompilerReferenceServiceImpl.java
+14 -14
View File
@@ -27,7 +27,11 @@ import com.intellij.openapi.vfs.*;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.util.*;
import com.intellij.psi.util.CachedValueProvider;
import com.intellij.psi.util.CachedValuesManager;
import com.intellij.psi.util.ParameterizedCachedValue;
import com.intellij.psi.util.PsiModificationTracker;
import com.intellij.util.containers.ConcurrentFactoryMap;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.indexing.FileBasedIndex;
import gnu.trove.THashSet;
@@ -143,19 +147,15 @@ public class CompilerReferenceServiceImpl extends CompilerReferenceService {
public GlobalSearchScope getScopeWithoutCodeReferences(@NotNull PsiElement element, @NotNull CompilerSearchAdapter adapter) {
if (!isServiceEnabled()) return null;
final ParameterizedCachedValueProvider<GlobalSearchScope, CompilerSearchAdapter> cachedValueProvider =
new ParameterizedCachedValueProvider<GlobalSearchScope, CompilerSearchAdapter>() {
@Nullable
@Override
public CachedValueProvider.Result<GlobalSearchScope> compute(CompilerSearchAdapter param) {
return CachedValueProvider.Result.create(calculateScopeWithoutReferences(element, param), PsiModificationTracker.MODIFICATION_COUNT);
}
};
return CachedValuesManager.getManager(myProject).getParameterizedCachedValue(element,
CACHE_KEY,
cachedValueProvider,
false,
adapter);
return CachedValuesManager.getCachedValue(element,
() -> CachedValueProvider.Result.create(new ConcurrentFactoryMap<CompilerSearchAdapter, GlobalSearchScope>() {
@Nullable
@Override
protected GlobalSearchScope create(CompilerSearchAdapter key) {
return calculateScopeWithoutReferences(element, key);
}
},
PsiModificationTracker.MODIFICATION_COUNT)).get(adapter);
}
private boolean isServiceEnabled() {