Add link to ScriptCompilationConfiguration into ScriptEvaluationConfiguration

#KT-48758 fixed
This commit is contained in:
Alexey Subach
2021-09-27 20:10:21 +03:00
committed by Ilya Chernikov
parent be0c4da04a
commit 7ddf83f32d
2 changed files with 8 additions and 1 deletions
@@ -59,6 +59,11 @@ val ScriptEvaluationConfigurationKeys.implicitReceivers by PropertiesCollection.
*/
val ScriptEvaluationConfigurationKeys.providedProperties by PropertiesCollection.key<Map<String, Any?>>() // external variables
/**
* The link to the actual {@link ScriptCompilationConfiguration} object that contains properties used for compiling the script
*/
val ScriptEvaluationConfigurationKeys.compilationConfiguration by PropertiesCollection.key<ScriptCompilationConfiguration>(isTransient = true)
/**
* Constructor arguments, additional to implicit receivers and provided properties, according to the script base class constructor
*/
@@ -28,7 +28,9 @@ open class BasicJvmScriptEvaluator : ScriptEvaluator {
}.onSuccess { importedScriptsEvalResults ->
val refinedEvalConfiguration =
sharedConfiguration.refineBeforeEvaluation(compiledScript).valueOr {
sharedConfiguration.with {
compilationConfiguration(compiledScript.compilationConfiguration)
}.refineBeforeEvaluation(compiledScript).valueOr {
return@invoke ResultWithDiagnostics.Failure(it.reports)
}