From 489ef4b7dc3d44dfa6cc6518db895e6253c74aa5 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 4 Sep 2014 15:15:01 +0400
Subject: [PATCH] read action

---
 .../psi/search/searches/ClassInheritorsSearch.java       | 7 ++++++-
 .../psi/search/searches/DefinitionsScopedSearch.java     | 9 +++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/java/java-indexing-api/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java b/java/java-indexing-api/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java
index 44d71c5e72a7..ec3599fec62e 100644
--- a/java/java-indexing-api/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java
+++ b/java/java-indexing-api/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java
@@ -167,7 +167,12 @@ public class ClassInheritorsSearch extends ExtensibleQueryFactory<PsiClass, Clas
   }
 
   public static Query<PsiClass> search(@NotNull final PsiClass aClass, final boolean checkDeep) {
-    return search(aClass, aClass.getUseScope(), checkDeep);
+    return search(aClass, ApplicationManager.getApplication().runReadAction(new Computable<SearchScope>() {
+      @Override
+      public SearchScope compute() {
+        return aClass.getUseScope();
+      }
+    }), checkDeep);
   }
 
   public static Query<PsiClass> search(@NotNull PsiClass aClass) {
diff --git a/platform/indexing-api/src/com/intellij/psi/search/searches/DefinitionsScopedSearch.java b/platform/indexing-api/src/com/intellij/psi/search/searches/DefinitionsScopedSearch.java
index 4e94617e7681..001712e0f529 100644
--- a/platform/indexing-api/src/com/intellij/psi/search/searches/DefinitionsScopedSearch.java
+++ b/platform/indexing-api/src/com/intellij/psi/search/searches/DefinitionsScopedSearch.java
@@ -63,8 +63,13 @@ public class DefinitionsScopedSearch extends ExtensibleQueryFactory<PsiElement,
     private final SearchScope myScope;
     private final boolean myCheckDeep;
 
-    public SearchParameters(@NotNull PsiElement element) {
-      this(element, element.getUseScope(), true);
+    public SearchParameters(@NotNull final PsiElement element) {
+      this(element, ApplicationManager.getApplication().runReadAction(new Computable<SearchScope>() {
+        @Override
+        public SearchScope compute() {
+          return element.getUseScope();
+        }
+      }), true);
     }
 
     public SearchParameters(@NotNull PsiElement element, @NotNull SearchScope scope, final boolean checkDeep) {