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

read access

Browse Source
This commit is contained in:
anna
2011-10-18 17:03:59 +02:00
parent 5a935bfb1e
commit 96b06308db
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/search/AnnotatedElementsSearcher.java
+7 -5
View File
@@ -35,7 +35,7 @@ public class AnnotatedElementsSearcher implements QueryExecutor<PsiModifierListO
final String annotationFQN = annClass.getQualifiedName();
assert annotationFQN != null;
PsiManagerImpl psiManager = (PsiManagerImpl)PsiManager.getInstance(annClass.getProject());
final PsiManagerImpl psiManager = (PsiManagerImpl)PsiManager.getInstance(annClass.getProject());
final SearchScope useScope = p.getScope();
Class<? extends PsiModifierListOwner>[] types = p.getTypes();
@@ -65,12 +65,14 @@ public class AnnotatedElementsSearcher implements QueryExecutor<PsiModifierListO
throw new PsiInvalidElementAccessException(candidate);
}
if (!psiManager.areElementsEquivalent(ApplicationManager.getApplication().runReadAction(new Computable<PsiElement>() {
if (!ApplicationManager.getApplication().runReadAction(new Computable<Boolean>() {
@Override
public PsiElement compute() {
return ref.resolve();
public Boolean compute() {
return psiManager.areElementsEquivalent(ref.resolve(), annClass);
}
}), annClass)) continue;
})) {
continue;
}
if (useScope instanceof GlobalSearchScope &&
!((GlobalSearchScope)useScope).contains(candidate.getContainingFile().getVirtualFile())) {
continue;