From 255ad4740687dca521ed12727cce124b52088ec4 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Wed, 13 May 2020 21:36:07 +0200
Subject: [PATCH] Use copied key to extract default jdkHome from host
 configuration

---
 .../kotlin/script/experimental/jvm/jvmScriptCompilation.kt  | 6 +++++-
 .../scripting/resolve/refineCompilationConfiguration.kt     | 2 +-
 .../scripting/compiler/plugin/impl/compilationContext.kt    | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptCompilation.kt b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptCompilation.kt
index 8c35113d162..1c9e4fce182 100644
--- a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptCompilation.kt
+++ b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/jvmScriptCompilation.kt
@@ -95,7 +95,11 @@ private fun Collection<File>.filterNewClasspath(known: Collection<ScriptDependen
 @Suppress("DEPRECATION")
 val JvmScriptCompilationConfigurationKeys.javaHome by PropertiesCollection.keyCopy(ScriptingHostConfiguration.jvm.javaHome)
 
-val JvmScriptCompilationConfigurationKeys.jdkHome by PropertiesCollection.keyCopy(ScriptingHostConfiguration.jvm.jdkHome)
+val JvmScriptCompilationConfigurationKeys.jdkHome
+        by PropertiesCollection.keyCopy(
+            ScriptingHostConfiguration.jvm.jdkHome,
+            getSourceProperties = { get(ScriptCompilationConfiguration.hostConfiguration) }
+        )
 
 @Suppress("unused")
 val ScriptCompilationConfigurationKeys.jvm
diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/refineCompilationConfiguration.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/refineCompilationConfiguration.kt
index 4065e5488b2..2a7bdb1f985 100644
--- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/refineCompilationConfiguration.kt
+++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/refineCompilationConfiguration.kt
@@ -134,7 +134,7 @@ abstract class ScriptCompilationConfigurationWrapper(val script: SourceCode) {
         }
 
         override val javaHome: File?
-            get() = configuration?.get(ScriptCompilationConfiguration.hostConfiguration)?.get(ScriptingHostConfiguration.jvm.jdkHome)
+            get() = configuration?.get(ScriptCompilationConfiguration.jvm.jdkHome)
 
         override val defaultImports: List<String>
             get() = configuration?.get(ScriptCompilationConfiguration.defaultImports).orEmpty()
diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/compilationContext.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/compilationContext.kt
index d8d49ec3365..45f6ecf0894 100644
--- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/compilationContext.kt
+++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/impl/compilationContext.kt
@@ -213,7 +213,8 @@ private fun createInitialCompilerConfiguration(
         // Default value differs from the argument's default (see #KT-29405 and #KT-29319)
         put(JVMConfigurationKeys.JVM_TARGET, JvmTarget.JVM_1_8)
 
-        val jdkHomeFromConfigurations = scriptCompilationConfiguration.getNoDefault(ScriptCompilationConfiguration.jvm.jdkHome)
+        val jdkHomeFromConfigurations = scriptCompilationConfiguration[ScriptCompilationConfiguration.jvm.jdkHome]
+            // TODO: check if this is redundant and/or incorrect since the default is now taken from the host configuration anyway (the one linked to the compilation config)
             ?: hostConfiguration[ScriptingHostConfiguration.jvm.jdkHome]
         if (jdkHomeFromConfigurations != null) {
             messageCollector.report(CompilerMessageSeverity.LOGGING, "Using JDK home directory $jdkHomeFromConfigurations")