Add link to ScriptCompilationConfiguration into ScriptEvaluationConfiguration
#KT-48758 fixed
This commit is contained in:
committed by
Ilya Chernikov
parent
be0c4da04a
commit
7ddf83f32d
@@ -59,6 +59,11 @@ val ScriptEvaluationConfigurationKeys.implicitReceivers by PropertiesCollection.
|
|||||||
*/
|
*/
|
||||||
val ScriptEvaluationConfigurationKeys.providedProperties by PropertiesCollection.key<Map<String, Any?>>() // external variables
|
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
|
* Constructor arguments, additional to implicit receivers and provided properties, according to the script base class constructor
|
||||||
*/
|
*/
|
||||||
|
|||||||
+3
-1
@@ -28,7 +28,9 @@ open class BasicJvmScriptEvaluator : ScriptEvaluator {
|
|||||||
}.onSuccess { importedScriptsEvalResults ->
|
}.onSuccess { importedScriptsEvalResults ->
|
||||||
|
|
||||||
val refinedEvalConfiguration =
|
val refinedEvalConfiguration =
|
||||||
sharedConfiguration.refineBeforeEvaluation(compiledScript).valueOr {
|
sharedConfiguration.with {
|
||||||
|
compilationConfiguration(compiledScript.compilationConfiguration)
|
||||||
|
}.refineBeforeEvaluation(compiledScript).valueOr {
|
||||||
return@invoke ResultWithDiagnostics.Failure(it.reports)
|
return@invoke ResultWithDiagnostics.Failure(it.reports)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user