From d53b99065574d9433a7d1931fe9df78703bf394f Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 18 Aug 2015 18:32:04 +0200
Subject: [PATCH] add missing read actions for Find Usages (EA-66822)

---
 .../idea/search/ideaExtensions/KotlinReferencesSearcher.kt     | 3 ++-
 .../idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt
index b3d8ee11a81..3505a6eebf6 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt
@@ -168,7 +168,8 @@ public class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, Referenc
         private fun searchNamedElement(queryParameters: ReferencesSearch.SearchParameters, element: PsiNamedElement?,
                                        name: String? = element?.getName()) {
             if (name != null && element != null) {
-                queryParameters.getOptimizer().searchWord(name, queryParameters.getEffectiveSearchScope(), true, element)
+                val scope = runReadAction { queryParameters.getEffectiveSearchScope() }
+                queryParameters.getOptimizer().searchWord(name, scope, true, element)
             }
         }
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt
index 6b579046fd0..3506afcdb26 100644
--- a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt
@@ -101,7 +101,7 @@ public abstract class KotlinFindMemberUsagesHandler<T : JetNamedDeclaration>
 
         val psiMethod: PsiMethod? = when (element) {
             is PsiMethod -> element
-            is JetConstructor<*> -> LightClassUtil.getLightClassMethod(element as JetFunction)
+            is JetConstructor<*> -> runReadAction { LightClassUtil.getLightClassMethod(element as JetFunction) }
             else -> null
         }
         if (psiMethod != null) {