MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-26 19:06:24 +07:00
Code Issues Packages Projects Releases Wiki Activity

check validity under read action

Browse Source
This commit is contained in:
peter
2012-03-16 15:45:02 +04:00
parent 573e0a3c23
commit 9d2aeb18a6
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/search/AnnotatedElementsSearcher.java
+14 -11
View File
@@ -56,28 +56,31 @@ public class AnnotatedElementsSearcher implements QueryExecutor<PsiModifierListO
PsiElement parent = ann.getParent();
if (!(parent instanceof PsiModifierList)) continue; // Can be a PsiNameValuePair, if annotation is used to annotate annotation parameters
PsiModifierList modlist = (PsiModifierList)parent;
final PsiElement owner = modlist.getParent();
final PsiElement owner = parent.getParent();
if (!isInstanceof(owner, types)) continue;
PsiModifierListOwner candidate = (PsiModifierListOwner)owner;
if (!candidate.isValid()) {
throw new PsiInvalidElementAccessException(candidate);
}
final PsiModifierListOwner candidate = (PsiModifierListOwner)owner;
if (!ApplicationManager.getApplication().runReadAction(new Computable<Boolean>() {
@Override
public Boolean compute() {
return psiManager.areElementsEquivalent(ref.resolve(), annClass);
if (!candidate.isValid()) {
return false;
}
if (!psiManager.areElementsEquivalent(ref.resolve(), annClass)) {
return false;
}
if (useScope instanceof GlobalSearchScope &&
!((GlobalSearchScope)useScope).contains(candidate.getContainingFile().getVirtualFile())) {
return false;
}
return true;
}
})) {
continue;
}
if (useScope instanceof GlobalSearchScope &&
!((GlobalSearchScope)useScope).contains(candidate.getContainingFile().getVirtualFile())) {
continue;
}
if (!consumer.process(candidate)) {
return false;
}