diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:25:33 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-09-04 13:25:33 -0700 |
| commit | d245f58efbfc26b13b9b9d5e52e6a83a0d76216c (patch) | |
| tree | bca7d49005d81d10c70bc3f547df041c636b4300 /java/java-indexing-api/src/com/intellij/psi/search/searches/AnnotationTargetsSearch.java | |
| parent | 9cde0e3c015174898df8b8f3672185941fad4786 (diff) | |
| parent | c3d3a90f6b4ead083d63e28e6b9fcea93d675678 (diff) | |
| download | idea-d245f58efbfc26b13b9b9d5e52e6a83a0d76216c.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Diffstat (limited to 'java/java-indexing-api/src/com/intellij/psi/search/searches/AnnotationTargetsSearch.java')
| -rw-r--r-- | java/java-indexing-api/src/com/intellij/psi/search/searches/AnnotationTargetsSearch.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/java-indexing-api/src/com/intellij/psi/search/searches/AnnotationTargetsSearch.java b/java/java-indexing-api/src/com/intellij/psi/search/searches/AnnotationTargetsSearch.java index c177985396a9..0b42ceae1709 100644 --- a/java/java-indexing-api/src/com/intellij/psi/search/searches/AnnotationTargetsSearch.java +++ b/java/java-indexing-api/src/com/intellij/psi/search/searches/AnnotationTargetsSearch.java @@ -21,6 +21,7 @@ import com.intellij.psi.PsiModifierListOwner; import com.intellij.psi.PsiPackage; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.SearchScope; +import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.MergeQuery; import com.intellij.util.Query; import org.jetbrains.annotations.NotNull; @@ -58,6 +59,6 @@ public class AnnotationTargetsSearch { } public static Query<PsiModifierListOwner> search(@NotNull PsiClass annotationClass) { - return search(annotationClass, GlobalSearchScope.allScope(annotationClass.getProject())); + return search(annotationClass, GlobalSearchScope.allScope(PsiUtilCore.getProjectInReadAction(annotationClass))); } }
\ No newline at end of file |