From 491fb40dd3c12aceb9ba58c1c64e1d08b5162107 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 1 Mar 2019 16:45:13 +0300 Subject: [PATCH] Fix INRE from find usages activated with Ctrl + Click (EA-137655) Only Ctrl + Click is affected as find usages from Alt + F7 is a different action (`GotoDeclarationAction` is `DumbAware`, but `ShowUsagesAction` is not). --- .../kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt index 7d85712e3f7..c09ab86aa46 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/handlers/KotlinFindUsagesHandler.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.findUsages.handlers import com.intellij.find.findUsages.FindUsagesHandler import com.intellij.find.findUsages.FindUsagesOptions import com.intellij.openapi.diagnostic.Logger +import com.intellij.openapi.project.DumbService import com.intellij.psi.PsiElement import com.intellij.psi.PsiReference import com.intellij.psi.impl.light.LightMemberReference @@ -73,7 +74,7 @@ abstract class KotlinFindUsagesHandler(psiElement: T, protected fun searchReferences(element: PsiElement, processor: Processor, options: FindUsagesOptions): Boolean { val searcher = createSearcher(element, processor, options) - if (!runReadAction { searcher.buildTaskList() }) return false + if (!DumbService.getInstance(element.project).runReadActionInSmartMode { searcher.buildTaskList() }) return false return searcher.executeTasks() }