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 } }