From d3a6b4f12b72e7ac872a0ffa0f70c9558d3681ea Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Tue, 15 Jan 2019 18:05:44 +0300
Subject: [PATCH] New J2K: Fix labeled while conversion

---
 .../org/jetbrains/kotlin/j2k/conversions/ForConversion.kt     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ForConversion.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ForConversion.kt
index 7c7dbf9330b..80846950fa0 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ForConversion.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/ForConversion.kt
@@ -42,7 +42,9 @@ class ForConversion(private val context: ConversionContext) : RecursiveApplicabl
                 loopStatement::initializer.detached(),
                 whileStatement
             )
-        return if (loopStatement.parent!! is JKBlock) convertedFromForLoopSyntheticWhileStatement
+        val notNeedParentBlock = loopStatement.parent is JKBlock
+                || loopStatement.parent is JKLabeledStatement && loopStatement.parent?.parent is JKBlock
+        return if (notNeedParentBlock) convertedFromForLoopSyntheticWhileStatement
         else blockStatement(convertedFromForLoopSyntheticWhileStatement)
     }