From 19164781f4665ef7b159389c83d9f88c499ac2cf Mon Sep 17 00:00:00 2001 From: Vladimir Dolzhenko Date: Thu, 9 Jan 2020 11:06:41 +0100 Subject: [PATCH] Access index under runReadActionInSmartMode in KotlinRuntimeLibraryUtil #EA-220414 Fixed --- .../kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt index 367677e71a4..f5a69830284 100644 --- a/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/versions/KotlinRuntimeLibraryUtil.kt @@ -41,10 +41,9 @@ import org.jetbrains.kotlin.config.JvmTarget import org.jetbrains.kotlin.config.KotlinCompilerVersion import org.jetbrains.kotlin.idea.framework.JavaRuntimeDetectionUtil import org.jetbrains.kotlin.idea.framework.isExternalLibrary -import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.idea.util.isSnapshot import org.jetbrains.kotlin.idea.util.projectStructure.version -import org.jetbrains.kotlin.idea.util.runWithAlternativeResolveEnabled +import org.jetbrains.kotlin.idea.util.runReadActionInSmartMode import org.jetbrains.kotlin.idea.vfilefinder.KotlinJavaScriptMetaFileIndex import org.jetbrains.kotlin.idea.vfilefinder.hasSomethingInPackage import org.jetbrains.kotlin.metadata.deserialization.BinaryVersion @@ -192,10 +191,8 @@ fun showRuntimeJarNotFoundDialog(project: Project, jarName: String) { private val KOTLIN_JS_FQ_NAME = FqName("kotlin.js") fun hasKotlinJsKjsmFile(project: Project, scope: GlobalSearchScope): Boolean { - return runReadAction { - project.runWithAlternativeResolveEnabled { - KotlinJavaScriptMetaFileIndex.hasSomethingInPackage(KOTLIN_JS_FQ_NAME, scope) - } + return project.runReadActionInSmartMode { + KotlinJavaScriptMetaFileIndex.hasSomethingInPackage(KOTLIN_JS_FQ_NAME, scope) } }