From befa94689a8f00ab1744ef1d45f462b7e3f9bf57 Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Tue, 26 Jun 2018 17:23:34 +0200
Subject: [PATCH] Return script instance from the evaluation in the basic jvm
 evaluator

---
 .../experimental/jvm/runners/BasicJvmScriptEvaluator.kt       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/runners/BasicJvmScriptEvaluator.kt b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/runners/BasicJvmScriptEvaluator.kt
index 3dce16cf58a..9dbdb8b021b 100644
--- a/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/runners/BasicJvmScriptEvaluator.kt
+++ b/libraries/scripting/jvm/src/kotlin/script/experimental/jvm/runners/BasicJvmScriptEvaluator.kt
@@ -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))
                     }
                 }
             }