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

Use default scripting host configuration if not provided

Browse Source
This commit is contained in:
Ilya Chernikov
2019-10-09 14:32:15 +02:00
parent 0c27b863b0
commit 7b93970ce2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/LazyScriptDescriptor.kt
+3 -2
View File
@@ -50,6 +50,7 @@ import kotlin.script.experimental.api.*
import kotlin.script.experimental.host.GetScriptingClass
import kotlin.script.experimental.host.ScriptingHostConfiguration
import kotlin.script.experimental.host.getScriptingClass
import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration
class LazyScriptDescriptor(
@@ -119,8 +120,8 @@ class LazyScriptDescriptor(
}
private val scriptingHostConfiguration: () -> ScriptingHostConfiguration = resolveSession.storageManager.createLazyValue {
scriptCompilationConfiguration()[ScriptCompilationConfiguration.hostConfiguration]
?: throw IllegalArgumentException("Expecting 'hostConfiguration' property in the script compilation configuration for the script ${scriptInfo.script.containingFile}")
// TODO: use platform-specific configuration by default instead
scriptCompilationConfiguration()[ScriptCompilationConfiguration.hostConfiguration] ?: defaultJvmScriptingHostConfiguration
}
private val scriptingClassGetter: () -> GetScriptingClass = resolveSession.storageManager.createLazyValue {