From c0eca2c7971d5cf2a481c1883a39c57132909db2 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 23 Apr 2015 15:19:51 +0200 Subject: [PATCH] PsiClassImplUtil: always use member cache --- .../com/intellij/psi/impl/PsiClassImplUtil.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java index 319f8e64b2ab..48cc1bdab9a8 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/PsiClassImplUtil.java @@ -480,15 +480,11 @@ public class PsiClassImplUtil { PsiSubstitutor substitutor = state.get(PsiSubstitutor.KEY); isRaw = isRaw || PsiUtil.isRawSubstitutor(aClass, substitutor); - ParameterizedCachedValue, PsiClass> cache = getValues(aClass); //aClass.getUserData(MAP_IN_CLASS_KEY); - boolean upToDate = cache.hasUpToDateValue(); - if (/*true || */upToDate) { - final NameHint nameHint = processor.getHint(NameHint.KEY); - if (nameHint != null) { - String name = nameHint.getName(state); - return processCachedMembersByName(aClass, processor, state, visited, last, place, isRaw, substitutor, - cache.getValue(aClass).get(resolveScope), name,languageLevel); - } + final NameHint nameHint = processor.getHint(NameHint.KEY); + if (nameHint != null) { + String name = nameHint.getName(state); + return processCachedMembersByName(aClass, processor, state, visited, last, place, isRaw, substitutor, + getValues(aClass).getValue(aClass).get(resolveScope), name,languageLevel); } return processDeclarationsInClassNotCached(aClass, processor, state, visited, last, place, isRaw, languageLevel, resolveScope); }