From bcaea3182e9f7896de07afd95276d309740bd739 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Wed, 14 Nov 2018 17:41:33 +0300 Subject: [PATCH] New J2K: Fix JKStatement.isEmpty method by not considering empty block statement as empty statement --- j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/jk.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/jk.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/jk.kt index 4bf8ceec1e0..5c89471eee6 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/jk.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/tree/impl/jk.kt @@ -498,7 +498,7 @@ class JKForInStatementImpl(declaration: JKDeclaration, iterationExpression: JKEx fun JKStatement.isEmpty(): Boolean = when (this) { is JKEmptyStatement -> true - is JKBlockStatement -> block is JKBodyStub || block.statements.isEmpty() + is JKBlockStatement -> block is JKBodyStub is JKExpressionStatement -> expression is JKStubExpression else -> false }