From 730c8ca495e6f8bce884cd951bc1d353b249fb4e Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Tue, 18 Dec 2018 14:32:04 +0300
Subject: [PATCH] New J2K: Fix java assignment to also conversion

---
 .../j2k/conversions/AssignmentAsExpressionToAlsoConversion.kt   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssignmentAsExpressionToAlsoConversion.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssignmentAsExpressionToAlsoConversion.kt
index 99a8750737f..9fde107f0ad 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssignmentAsExpressionToAlsoConversion.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/AssignmentAsExpressionToAlsoConversion.kt
@@ -13,6 +13,7 @@ import org.jetbrains.kotlin.utils.addToStdlib.cast
 class AssignmentAsExpressionToAlsoConversion(val context: ConversionContext) : RecursiveApplicableConversionBase() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
         if (element !is JKJavaAssignmentExpression) return recurse(element)
+        element.invalidate()
 
         val alsoExpression = JKKtAlsoCallExpressionImpl(
             JKBlockStatementImpl(
@@ -22,7 +23,6 @@ class AssignmentAsExpressionToAlsoConversion(val context: ConversionContext) : R
             it.statement.cast<JKBlockStatement>().block.statements.first().cast<JKKtAssignmentStatement>().expression =
                     JKFieldAccessExpressionImpl(context.symbolProvider.provideUniverseSymbol(it.parameter))
         }
-        element.invalidate()
 
         return recurse(
             JKQualifiedExpressionImpl(