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

Fix freeze during loading script configurations through legacy scripting API

Browse Source 
Do not wrap the whole configuration loading process into readAction
^KT-39771 Fixed
This commit is contained in:
Natalia Selezneva
2020-06-23 15:25:48 +03:00
parent 05e8546bdb
commit bcd3921bae
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/refineCompilationConfiguration.kt
+4 -2
View File
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.psi.psiUtil.endOffset
import org.jetbrains.kotlin.psi.psiUtil.startOffset
import org.jetbrains.kotlin.scripting.definitions.KotlinScriptDefinition
import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition
import org.jetbrains.kotlin.scripting.definitions.runReadAction
import org.jetbrains.kotlin.scripting.withCorrectExtension
import java.io.File
import java.net.URL
@@ -228,8 +229,9 @@ fun refineScriptCompilationConfiguration(
if (legacyDefinition == null) {
val compilationConfiguration = definition.compilationConfiguration
val collectedData =
getScriptCollectedData(ktFileSource.ktFile, compilationConfiguration, project, definition.contextClassLoader)
runReadAction {
getScriptCollectedData(ktFileSource.ktFile, compilationConfiguration, project, definition.contextClassLoader)
}
return compilationConfiguration.refineOnAnnotations(script, collectedData)
.onSuccess {
it.refineBeforeCompiling(script, collectedData)