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

AnnotationUtil: do not cache own annotations results for local variables

Browse Source
This commit is contained in:
Tagir Valeev
2018-04-15 13:21:47 +07:00
parent 1360cb1031
commit b64b3812e6
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java
+16 -11
View File
@@ -77,25 +77,30 @@ public class AnnotationUtil {
}
private static PsiAnnotation findOwnAnnotation(final PsiModifierListOwner listOwner, Collection<String> annotationNames) {
if (listOwner instanceof PsiLocalVariable) {
return findAnnotationDirectly(listOwner, annotationNames);
}
Map<Collection<String>, PsiAnnotation> map = CachedValuesManager.getCachedValue(
listOwner,
() -> {
Map<Collection<String>, PsiAnnotation> value = ConcurrentFactoryMap.createMap(annotationNames1-> {
final PsiModifierList list = listOwner.getModifierList();
if (list == null) return null;
for (PsiAnnotation annotation : list.getAnnotations()) {
if (annotationNames1.contains(annotation.getQualifiedName())) {
return annotation;
}
}
return null;
}
);
Map<Collection<String>, PsiAnnotation> value = ConcurrentFactoryMap.createMap(names -> findAnnotationDirectly(listOwner, names));
return CachedValueProvider.Result.create(value, PsiModificationTracker.MODIFICATION_COUNT);
});
return map.get(annotationNames);
}
@Nullable
private static PsiAnnotation findAnnotationDirectly(PsiModifierListOwner listOwner, Collection<String> annotationNames) {
final PsiModifierList list = listOwner.getModifierList();
if (list == null) return null;
for (PsiAnnotation annotation : list.getAnnotations()) {
if (annotationNames.contains(annotation.getQualifiedName())) {
return annotation;
}
}
return null;
}
private static PsiAnnotation findNonCodeAnnotation(final PsiModifierListOwner listOwner, Collection<String> annotationNames) {
if (listOwner instanceof PsiLocalVariable) {
// Non-code annotations for local variables are not supported: don't bother to search them