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

java resolve: cache class super types corrected by resolve scope

Browse Source
This commit is contained in:
peter
2015-04-21 16:59:37 +02:00
parent 73335b28b3
commit 0f5d801fff
1 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java
+40 -8
View File
@@ -43,6 +43,7 @@ import com.intellij.util.IncorrectOperationException;
import com.intellij.util.NullableFunction;
import com.intellij.util.SmartList;
import com.intellij.util.containers.ConcurrentFactoryMap;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.HashSet;
import gnu.trove.THashMap;
import gnu.trove.THashSet;
@@ -370,7 +371,7 @@ public class PsiClassImplUtil {
@Override
protected Map<String, List<Pair<PsiMember, PsiSubstitutor>>> create(final MemberType key) {
final Map<String, List<Pair<PsiMember, PsiSubstitutor>>> map = new THashMap<String, List<Pair<PsiMember, PsiSubstitutor>>>();
final List<Pair<PsiMember, PsiSubstitutor>> allMembers = new ArrayList<Pair<PsiMember, PsiSubstitutor>>();
map.put(ALL, allMembers);
@@ -395,7 +396,7 @@ public class PsiClassImplUtil {
}
}
};
processDeclarationsInClassNotCached(myPsiClass, processor, ResolveState.initial(), null, null, myPsiClass, false,
PsiUtil.getLanguageLevel(myPsiClass), myResolveScope);
return map;
@@ -719,6 +720,41 @@ public class PsiClassImplUtil {
return new TypeCorrector(resolveScope).mapType(originalType);
}
private static List<PsiClassType.ClassResolveResult> getScopeCorrectedSuperTypes(final PsiClass aClass, GlobalSearchScope resolveScope) {
Map<GlobalSearchScope, List<PsiClassType.ClassResolveResult>> cache =
CachedValuesManager.getCachedValue(aClass, new CachedValueProvider<Map<GlobalSearchScope, List<PsiClassType.ClassResolveResult>>>() {
@Nullable
@Override
public Result<Map<GlobalSearchScope, List<PsiClassType.ClassResolveResult>>> compute() {
Map<GlobalSearchScope, List<PsiClassType.ClassResolveResult>> map = new ConcurrentFactoryMap<GlobalSearchScope, List<PsiClassType.ClassResolveResult>>() {
@NotNull
@Override
protected List<PsiClassType.ClassResolveResult> create(final GlobalSearchScope resolveScope) {
return calcScopeCorrectedSuperTypes(resolveScope, aClass);
}
};
return Result.create(map, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
}
});
return cache.get(resolveScope);
}
@NotNull
private static List<PsiClassType.ClassResolveResult> calcScopeCorrectedSuperTypes(GlobalSearchScope resolveScope, PsiClass aClass) {
List<PsiClassType.ClassResolveResult> answer = ContainerUtil.newArrayList();
for (PsiClassType type : aClass.getSuperTypes()) {
PsiClassType corrected = correctType(type, resolveScope);
if (corrected == null) continue;
PsiClassType.ClassResolveResult result = corrected.resolveGenerics();
PsiClass superClass = result.getElement();
if (superClass == null || !PsiSearchScopeUtil.isInScope(resolveScope, superClass)) continue;
answer.add(result);
}
return answer;
}
private static boolean processSuperTypes(@NotNull PsiClass aClass,
@NotNull PsiScopeProcessor processor,
@Nullable Set<PsiClass> visited,
@@ -729,13 +765,9 @@ public class PsiClassImplUtil {
@NotNull PsiElementFactory factory,
@NotNull LanguageLevel languageLevel, GlobalSearchScope resolveScope) {
boolean resolved = false;
for (PsiClassType superType : aClass.getSuperTypes()) {
superType = correctType(superType, resolveScope);
if (superType == null) continue;
final PsiClassType.ClassResolveResult superTypeResolveResult = superType.resolveGenerics();
for (PsiClassType.ClassResolveResult superTypeResolveResult : getScopeCorrectedSuperTypes(aClass, resolveScope)) {
PsiClass superClass = superTypeResolveResult.getElement();
if (superClass == null || !PsiSearchScopeUtil.isInScope(resolveScope, superClass)) continue;
assert superClass != null;
PsiSubstitutor finalSubstitutor = obtainFinalSubstitutor(superClass, superTypeResolveResult.getSubstitutor(), aClass,
state.get(PsiSubstitutor.KEY), factory, languageLevel);
if (!processDeclarationsInClass(superClass, processor, state.put(PsiSubstitutor.KEY, finalSubstitutor), visited, last, place,