azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix readAccess in ScriptExtraImportsProviderExtension on checking isScript

Browse Source 
#EA-214435 Fixed
This commit is contained in:
Vladimir Dolzhenko
2019-10-19 11:35:11 +02:00
parent 34e941f26f
commit fa0398ffd3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/extensions/ScriptExtraImportsProviderExtension.kt
+2 -1
View File
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.psi.KtImportInfo
import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.resolve.ImportPath
import org.jetbrains.kotlin.resolve.extensions.ExtraImportsProviderExtension import org.jetbrains.kotlin.resolve.extensions.ExtraImportsProviderExtension
import org.jetbrains.kotlin.scripting.definitions.ScriptDependenciesProvider import org.jetbrains.kotlin.scripting.definitions.ScriptDependenciesProvider
import org.jetbrains.kotlin.scripting.definitions.runReadAction
class ScriptExtraImportsProviderExtension : ExtraImportsProviderExtension { class ScriptExtraImportsProviderExtension : ExtraImportsProviderExtension {
@@ -27,7 +28,7 @@ class ScriptExtraImportsProviderExtension : ExtraImportsProviderExtension {
} }
override fun getExtraImports(ktFile: KtFile): Collection<KtImportInfo> = 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) val refinedConfiguration = ScriptDependenciesProvider.getInstance(file.project)
?.getScriptConfiguration(file.originalFile as KtFile) ?.getScriptConfiguration(file.originalFile as KtFile)
refinedConfiguration?.defaultImports?.map { refinedConfiguration?.defaultImports?.map {