From fa0398ffd3f024f372e374e813331bb4225b03b8 Mon Sep 17 00:00:00 2001
From: Vladimir Dolzhenko <vladimir.dolzhenko@jetbrains.com>
Date: Sat, 19 Oct 2019 11:35:11 +0200
Subject: [PATCH] Fix readAccess in ScriptExtraImportsProviderExtension on
 checking isScript

#EA-214435 Fixed
---
 .../extensions/ScriptExtraImportsProviderExtension.kt          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/extensions/ScriptExtraImportsProviderExtension.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/extensions/ScriptExtraImportsProviderExtension.kt
index c8455d2ee76..b5ee4ddc8ca 100644
--- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/extensions/ScriptExtraImportsProviderExtension.kt
+++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/extensions/ScriptExtraImportsProviderExtension.kt
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.psi.KtImportInfo
 import org.jetbrains.kotlin.resolve.ImportPath
 import org.jetbrains.kotlin.resolve.extensions.ExtraImportsProviderExtension
 import org.jetbrains.kotlin.scripting.definitions.ScriptDependenciesProvider
+import org.jetbrains.kotlin.scripting.definitions.runReadAction
 
 class ScriptExtraImportsProviderExtension : ExtraImportsProviderExtension {
 
@@ -27,7 +28,7 @@ class ScriptExtraImportsProviderExtension : ExtraImportsProviderExtension {
     }
 
     override fun getExtraImports(ktFile: KtFile): Collection<KtImportInfo> =
-        ktFile.takeIf { it.isScript() }?.let { file ->
+        ktFile.takeIf { runReadAction { it.isScript() } }?.let { file ->
             val refinedConfiguration = ScriptDependenciesProvider.getInstance(file.project)
                 ?.getScriptConfiguration(file.originalFile as KtFile)
             refinedConfiguration?.defaultImports?.map {