From dc7ffdcbe487c1bbcec49498a131f28f8c7f76f8 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 6 Oct 2017 19:48:47 +0200 Subject: [PATCH] Add missing read action --- .../ideaExtensions/KotlinDefinitionsSearcher.kt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDefinitionsSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDefinitionsSearcher.kt index dfb3d7c82b9..f502971eabf 100644 --- a/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDefinitionsSearcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinDefinitionsSearcher.kt @@ -140,11 +140,13 @@ class KotlinDefinitionsSearcher : QueryExecutor mirrorElement - is KtPropertyAccessor -> if (mirrorElement.parent is KtProperty) mirrorElement.parent else implementation - else -> implementation + val elementToProcess = runReadAction { + val mirrorElement = (implementation as? KtLightMethod)?.kotlinOrigin + when (mirrorElement) { + is KtProperty, is KtParameter -> mirrorElement + is KtPropertyAccessor -> if (mirrorElement.parent is KtProperty) mirrorElement.parent else implementation + else -> implementation + } } if (!consumer.process(elementToProcess)) {