From cddabf140bd2c6b190d73574b4160115a5385c3d Mon Sep 17 00:00:00 2001
From: Ilya Chernikov <ilya.chernikov@jetbrains.com>
Date: Tue, 6 Aug 2019 06:34:34 +0200
Subject: [PATCH] Implement proper expression generation for the last script
 line

fixes problem with result fields
#KT-33127 fixed
---
 .../jetbrains/kotlin/codegen/MemberCodegen.java    | 10 ++++++++--
 .../script/experimental/jvmhost/test/ReplTest.kt   | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
index 2703ca7577d..58d8cdb73ac 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
@@ -484,7 +484,9 @@ public abstract class MemberCodegen<T extends KtPureElement/* TODO: & KtDeclarat
     protected void generateInitializers(@NotNull Function0<ExpressionCodegen> createCodegen) {
         NotNullLazyValue<ExpressionCodegen> codegen = LockBasedStorageManager.NO_LOCKS.createLazyValue(createCodegen);
 
-        for (KtDeclaration declaration : ((KtDeclarationContainer) element).getDeclarations()) {
+        List<KtDeclaration> declarations = ((KtDeclarationContainer) element).getDeclarations();
+        for (int i = 0; i < declarations.size(); i++) {
+            KtDeclaration declaration = declarations.get(i);
             if (declaration instanceof KtProperty) {
                 if (shouldInitializeProperty((KtProperty) declaration)) {
                     generateNopSeparatorIfNeeded(codegen);
@@ -501,7 +503,11 @@ public abstract class MemberCodegen<T extends KtPureElement/* TODO: & KtDeclarat
                     generateNopSeparatorIfNeeded(codegen);
 
                     ExpressionCodegen expressionCodegen = codegen.invoke();
-                    expressionCodegen.gen(body, Type.VOID_TYPE);
+                    Type bodyExpressionType = Type.VOID_TYPE;
+                    if (i == declarations.size() - 1 && this instanceof ScriptCodegen) {
+                        bodyExpressionType = expressionCodegen.expressionType(body);
+                    }
+                    expressionCodegen.gen(body, bodyExpressionType);
                     expressionCodegen.markLineNumber(declaration, true);
                     nopSeparatorNeeded = true;
                 }
diff --git a/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ReplTest.kt b/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ReplTest.kt
index 039aa5194be..9a8d8fc3ede 100644
--- a/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ReplTest.kt
+++ b/libraries/scripting/jvm-host-test/test/kotlin/script/experimental/jvmhost/test/ReplTest.kt
@@ -55,6 +55,20 @@ class ReplTest : TestCase() {
         )
     }
 
+    @Test
+    fun testEvalWithIfResult() {
+        chechEvaluateInRepl(
+            simpleScriptompilationConfiguration,
+            simpleScriptEvaluationConfiguration,
+            sequenceOf(
+                "val x = 5",
+                "x + 6",
+                "if (x < 10) res1 * 2 else x"
+            ),
+            sequenceOf(null, 11, 22)
+        )
+    }
+
     @Test
     fun testImplicitReceiver() {
         val receiver = TestReceiver()