Fix script arguments order for imports with implicit receivers
#KT-33572 fixed
This commit is contained in:
+5
-4
@@ -75,6 +75,11 @@ open class BasicJvmScriptEvaluator : ScriptEvaluator {
|
||||
refinedEvalConfiguration[ScriptEvaluationConfiguration.constructorArgs]?.let {
|
||||
args.addAll(it)
|
||||
}
|
||||
|
||||
importedScriptsEvalResults.forEach {
|
||||
args.add(it.returnValue.scriptInstance)
|
||||
}
|
||||
|
||||
refinedEvalConfiguration[ScriptEvaluationConfiguration.implicitReceivers]?.let {
|
||||
args.addAll(it)
|
||||
}
|
||||
@@ -82,10 +87,6 @@ open class BasicJvmScriptEvaluator : ScriptEvaluator {
|
||||
args.add(it.value)
|
||||
}
|
||||
|
||||
importedScriptsEvalResults.forEach {
|
||||
args.add(it.returnValue.scriptInstance)
|
||||
}
|
||||
|
||||
val ctor = java.constructors.single()
|
||||
|
||||
return ctor.newInstance(*args.toArray())
|
||||
|
||||
Reference in New Issue
Block a user