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

Script configuration: fix getting javaHome

Browse Source
This commit is contained in:
Sergey Rostov
2020-04-30 23:36:12 +03:00
parent b04fabf1e8
commit 802c03b934
1 changed files with 1 additions and 0 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
+1
View File
@@ -135,6 +135,7 @@ abstract class ScriptCompilationConfigurationWrapper(val script: SourceCode) {
override val javaHome: File? override val javaHome: File?
get() = configuration?.get(ScriptCompilationConfiguration.hostConfiguration)?.get(ScriptingHostConfiguration.jvm.jdkHome) get() = configuration?.get(ScriptCompilationConfiguration.hostConfiguration)?.get(ScriptingHostConfiguration.jvm.jdkHome)
?: configuration?.get(ScriptingHostConfiguration.jvm.jdkHome)
override val defaultImports: List<String> override val defaultImports: List<String>
get() = configuration?.get(ScriptCompilationConfiguration.defaultImports).orEmpty() get() = configuration?.get(ScriptCompilationConfiguration.defaultImports).orEmpty()