From 8810e15f08d2f2718172c35634c42a9f76e911e5 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 19 Oct 2017 15:38:00 +0300 Subject: [PATCH] ExpressionOfTypeProcessor: get member name in read action --- .../idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt index 94d8f4b7a8b..0fd332388fe 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/ExpressionsOfTypeProcessor.kt @@ -335,10 +335,11 @@ class ExpressionsOfTypeProcessor( val searchRequestCollector = SearchRequestCollector(SearchSession()) val resultProcessor = StaticMemberRequestResultProcessor(member, classes) + val memberName = runReadAction { member.name } for (klass in classes) { val request = klass.name + "." + declarationName - testLog { "Searched references to static ${member.name} in non-Java files by request $request" } + testLog { "Searched references to static $memberName in non-Java files by request $request" } searchRequestCollector.searchWord( request, classUseScope(klass).intersectWith(memberScope), UsageSearchContext.IN_CODE, true, member, resultProcessor) @@ -347,7 +348,7 @@ class ExpressionsOfTypeProcessor( if (qualifiedName != null) { val importAllUnderRequest = qualifiedName + ".*" - testLog { "Searched references to static ${member.name} in non-Java files by request $importAllUnderRequest" } + testLog { "Searched references to static $memberName in non-Java files by request $importAllUnderRequest" } searchRequestCollector.searchWord( importAllUnderRequest, classUseScope(klass).intersectWith(memberScope), UsageSearchContext.IN_CODE, true, member, resultProcessor)