From ca28d023009a0936044bbce2e07dfa0c51993eba Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Thu, 20 Oct 2016 17:54:04 +0300
Subject: [PATCH] Minor

---
 .../ConstructedExpressionWrapperWithIntroduceFeature.kt   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/idea/idea-replacement-engine/src/org/jetbrains/kotlin/idea/replacement/ConstructedExpressionWrapperWithIntroduceFeature.kt b/idea/idea-replacement-engine/src/org/jetbrains/kotlin/idea/replacement/ConstructedExpressionWrapperWithIntroduceFeature.kt
index 98c1fd03481..e90d0819601 100644
--- a/idea/idea-replacement-engine/src/org/jetbrains/kotlin/idea/replacement/ConstructedExpressionWrapperWithIntroduceFeature.kt
+++ b/idea/idea-replacement-engine/src/org/jetbrains/kotlin/idea/replacement/ConstructedExpressionWrapperWithIntroduceFeature.kt
@@ -42,11 +42,13 @@ internal open class ConstructedExpressionWrapper(
 
     fun replaceExpression(oldExpression: KtExpression, newExpression: KtExpression): KtExpression {
         assert(expression.isAncestor(oldExpression))
-        val result = oldExpression.replace(newExpression) as KtExpression
         if (oldExpression == expression) {
-            expression = result
+            expression = newExpression
+            return expression
+        }
+        else {
+            return oldExpression.replace(newExpression) as KtExpression
         }
-        return result
     }
 }