Return script instance from the evaluation in the basic jvm evaluator

2018-06-26 17:23:34 +02:00
parent 2ecddc996a
commit befa94689a
1 changed files with 2 additions and 2 deletions
@@ -26,13 +26,13 @@ open class BasicJvmScriptEvaluator<ScriptBase : Any>(val environment: ScriptingE
                        ResultWithDiagnostics.Failure(ScriptDiagnostic("expecting class in this implementation, got ${scriptObject?.javaClass}"))
                    else {
                        val receivers = scriptEvaluationEnvironment.getOrNull(ScriptEvaluationEnvironmentParams.implicitReceivers)
-                        if (receivers == null) {
+                        val instance = if (receivers == null) {
                            scriptObject.getConstructor().newInstance()
                        } else {
                            scriptObject.getConstructor(Array<Any>::class.java).newInstance(receivers.toTypedArray())
                        }

-                        ResultWithDiagnostics.Success(EvaluationResult(null, scriptEvaluationEnvironment))
+                        ResultWithDiagnostics.Success(EvaluationResult(instance, scriptEvaluationEnvironment))
                    }
                }
            }