From 7b5ffce7aa700ef2be6d47b0110e5fb64bd57434 Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Sat, 10 Nov 2018 19:42:56 +0300
Subject: [PATCH] New J2K: Separate statements in block

---
 j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt
index d3a2f9ea5d5..4dd744fb312 100644
--- a/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt
+++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt
@@ -237,9 +237,8 @@ class NewCodeBuilder {
         }
 
         private fun renderNonEnumClassDeclarations(declarations: List<JKDeclaration>) {
-            declarations.forEach {
+            renderList(declarations, { printer.println() }) {
                 it.accept(this)
-                printer.printlnWithNoIndent()
             }
         }
 
@@ -271,7 +270,7 @@ class NewCodeBuilder {
             if (ktInitDeclaration.block.statements.isNotEmpty()) {
                 printer.print("init ")
                 printer.block(multiline = true) {
-                    ktInitDeclaration.block.statements.forEach { it.accept(this) }
+                    ktInitDeclaration.block.accept(this)
                 }
             }
         }
@@ -561,7 +560,9 @@ class NewCodeBuilder {
         }
 
         override fun visitBlock(block: JKBlock) {
-            block.acceptChildren(this)
+            renderList(block.statements, { printer.println() }) {
+                it.accept(this)
+            }
         }
 
         override fun visitExpressionStatement(expressionStatement: JKExpressionStatement) {