azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add missing read actions for Find Usages (EA-66822)

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-08-18 18:32:04 +02:00
parent 30a9a8787e
commit d53b990655
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.kt
+2 -1
View File
@@ -168,7 +168,8 @@ public class KotlinReferencesSearcher : QueryExecutorBase<PsiReference, Referenc
private fun searchNamedElement(queryParameters: ReferencesSearch.SearchParameters, element: PsiNamedElement?, private fun searchNamedElement(queryParameters: ReferencesSearch.SearchParameters, element: PsiNamedElement?,
name: String? = element?.getName()) { name: String? = element?.getName()) {
if (name != null && element != null) { 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)
} }
} }
} }
idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindMemberUsagesHandler.kt
+1 -1
View File
@@ -101,7 +101,7 @@ public abstract class KotlinFindMemberUsagesHandler<T : JetNamedDeclaration>
val psiMethod: PsiMethod? = when (element) { val psiMethod: PsiMethod? = when (element) {
is PsiMethod -> element is PsiMethod -> element
is JetConstructor<*> -> LightClassUtil.getLightClassMethod(element as JetFunction) is JetConstructor<*> -> runReadAction { LightClassUtil.getLightClassMethod(element as JetFunction) }
else -> null else -> null
} }
if (psiMethod != null) { if (psiMethod != null) {