diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt
index 7d67ea10fa0..1da906cb4ac 100644
--- a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt
+++ b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt
@@ -2,12 +2,15 @@ package test
 
 public class Test(str: String) {
     var myStr: String = "String2"
+
     public fun sout(str: String) {
         System.out.println(str)
     }
+
     public fun dummy(str: String): String {
         return str
     }
+
     public fun test() {
         sout("String")
         val test = "String2"
@@ -16,6 +19,7 @@ public class Test(str: String) {
 
         Test(test)
     }
+
     {
         myStr = str
     }
diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.kt
index 9e809ad1f48..6740f27ca31 100644
--- a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.kt
+++ b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.kt
@@ -2,12 +2,15 @@ package test
 
 public open class Test(str: String) {
     var myStr: String = "String2"
+
     public open fun sout(str: String) {
         System.out?.println(str)
     }
+
     public open fun dummy(str: String): String {
         return str
     }
+
     public open fun test() {
         sout("String")
         var test: String = "String2"
@@ -16,6 +19,7 @@ public open class Test(str: String) {
 
         Test(test)
     }
+
     {
         myStr = str
     }
diff --git a/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.ide.kt b/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.ide.kt
index 71539ec1470..511ac6c621e 100644
--- a/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.ide.kt
+++ b/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.ide.kt
@@ -1,5 +1,6 @@
 class Test() {
     var str: String = 0
+
     class object {
         {
             str = "Ola"
diff --git a/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.kt b/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.kt
index ccd6b065994..5eae1d06822 100644
--- a/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.kt
+++ b/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.kt
@@ -1,5 +1,6 @@
 open class Test() {
     var str: String? = null
+
     class object {
         {
             str = "Ola"
diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt
index bd6d2431339..b81169c7655 100644
--- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt
+++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt
@@ -2,6 +2,7 @@ class Library() {
     class object {
         fun call() {
         }
+
         fun getString(): String {
             return ""
         }
diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt
index ba645c4e442..e45cfcdd5a2 100644
--- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt
+++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt
@@ -2,6 +2,7 @@ open class Library() {
     class object {
         open fun call() {
         }
+
         open fun getString(): String? {
             return ""
         }
diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt
index 0b42879d01a..b05fb65e85e 100644
--- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt
+++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt
@@ -1,6 +1,7 @@
 class Library() {
     fun call() {
     }
+
     fun getString(): String {
         return ""
     }
diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt
index 0c69557e7c0..a174ca78c09 100644
--- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt
+++ b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt
@@ -1,6 +1,7 @@
 open class Library() {
     open fun call() {
     }
+
     open fun getString(): String? {
         return ""
     }
diff --git a/j2k/tests/testData/ast/class/abstractClass.ide.kt b/j2k/tests/testData/ast/class/abstractClass.ide.kt
index a894b31bc7b..865a601b10a 100644
--- a/j2k/tests/testData/ast/class/abstractClass.ide.kt
+++ b/j2k/tests/testData/ast/class/abstractClass.ide.kt
@@ -1,5 +1,6 @@
 abstract class A() {
     abstract fun callme()
+
     fun callmetoo() {
         print("This is a concrete method.")
     }
diff --git a/j2k/tests/testData/ast/class/abstractClass.kt b/j2k/tests/testData/ast/class/abstractClass.kt
index 1671a7deb5d..f3772f0baf9 100644
--- a/j2k/tests/testData/ast/class/abstractClass.kt
+++ b/j2k/tests/testData/ast/class/abstractClass.kt
@@ -1,5 +1,6 @@
 abstract class A() {
     abstract fun callme()
+
     open fun callmetoo() {
         print("This is a concrete method.")
     }
diff --git a/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.ide.kt b/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.ide.kt
index 2a73b17155c..fa2ebfe0b04 100644
--- a/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.ide.kt
+++ b/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.ide.kt
@@ -2,6 +2,7 @@ class S() {
     fun sB(): Boolean {
         return true
     }
+
     class object {
         var myI: Int = 10
     }
diff --git a/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.kt b/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.kt
index 2a73b17155c..fa2ebfe0b04 100644
--- a/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.kt
+++ b/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.kt
@@ -2,6 +2,7 @@ class S() {
     fun sB(): Boolean {
         return true
     }
+
     class object {
         var myI: Int = 10
     }
diff --git a/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.ide.kt b/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.ide.kt
index acdc60cbc79..8106a282485 100644
--- a/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.ide.kt
+++ b/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.ide.kt
@@ -2,6 +2,7 @@ class S() {
     fun sB(): Boolean {
         return true
     }
+
     class object {
         fun sI(): Int {
             return 1
diff --git a/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.kt b/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.kt
index acdc60cbc79..8106a282485 100644
--- a/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.kt
+++ b/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.kt
@@ -2,6 +2,7 @@ class S() {
     fun sB(): Boolean {
         return true
     }
+
     class object {
         fun sI(): Int {
             return 1
diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt
index 3ab24ceca3b..fcf083a9e77 100644
--- a/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt
+++ b/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt
@@ -1,9 +1,11 @@
 class C(arg1: Int, arg2: Int, arg3: Int) {
     class object {
+
         fun init(arg1: Int, arg2: Int): C {
             val __ = C(arg1, arg2, 0)
             return __
         }
+
         fun init(arg1: Int): C {
             val __ = C(arg1, 0, 0)
             return __
diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary.kt
index f715feb090f..2fea1e3464b 100644
--- a/j2k/tests/testData/ast/constructors/allCallsPrimary.kt
+++ b/j2k/tests/testData/ast/constructors/allCallsPrimary.kt
@@ -1,9 +1,11 @@
 open class C(arg1: Int, arg2: Int, arg3: Int) {
     class object {
+
         open fun init(arg1: Int, arg2: Int): C {
             val __ = C(arg1, arg2, 0)
             return __
         }
+
         open fun init(arg1: Int): C {
             val __ = C(arg1, 0, 0)
             return __
diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt
index dc341646b60..25ff360f172 100644
--- a/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt
+++ b/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt
@@ -2,18 +2,22 @@ class C(arg1: Int) {
     val myArg1: Int
     var myArg2: Int = 0
     var myArg3: Int = 0
+
     {
         myArg1 = arg1
         myArg2 = 0
         myArg3 = 0
     }
+
     class object {
+
         fun init(arg1: Int, arg2: Int, arg3: Int): C {
             val __ = C(arg1)
             __.myArg2 = arg2
             __.myArg3 = arg3
             return __
         }
+
         fun init(arg1: Int, arg2: Int): C {
             val __ = C(arg1)
             __.myArg2 = arg2
diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt
index b98593e7ef0..cdb8c9e71df 100644
--- a/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt
+++ b/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt
@@ -2,18 +2,22 @@ open class C(arg1: Int) {
     val myArg1: Int
     var myArg2: Int = 0
     var myArg3: Int = 0
+
     {
         myArg1 = arg1
         myArg2 = 0
         myArg3 = 0
     }
+
     class object {
+
         open fun init(arg1: Int, arg2: Int, arg3: Int): C {
             val __ = C(arg1)
             __.myArg2 = arg2
             __.myArg3 = arg3
             return __
         }
+
         open fun init(arg1: Int, arg2: Int): C {
             val __ = C(arg1)
             __.myArg2 = arg2
diff --git a/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt b/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt
index 8d1591b4fa6..0da3fc218bb 100644
--- a/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt
+++ b/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt
@@ -3,16 +3,20 @@ package org.test.customer
 class Customer(first: String, last: String) {
     public val _firstName: String
     public val _lastName: String
+
     public fun getFirstName(): String {
         return _firstName
     }
+
     public fun getLastName(): String {
         return _lastName
     }
+
     private fun doSmthBefore() {
     }
     private fun doSmthAfter() {
     }
+
     {
         doSmthBefore()
         _firstName = first
@@ -23,14 +27,17 @@ class Customer(first: String, last: String) {
 class CustomerBuilder() {
     public var _firstName: String = "Homer"
     public var _lastName: String = "Simpson"
+
     public fun WithFirstName(firstName: String): CustomerBuilder {
         _firstName = firstName
         return this
     }
+
     public fun WithLastName(lastName: String): CustomerBuilder {
         _lastName = lastName
         return this
     }
+
     public fun Build(): Customer {
         return Customer(_firstName, _lastName)
     }
diff --git a/j2k/tests/testData/ast/constructors/customerBuilder.kt b/j2k/tests/testData/ast/constructors/customerBuilder.kt
index cea083b908e..e44b7f5e001 100644
--- a/j2k/tests/testData/ast/constructors/customerBuilder.kt
+++ b/j2k/tests/testData/ast/constructors/customerBuilder.kt
@@ -3,16 +3,20 @@ package org.test.customer
 open class Customer(first: String?, last: String?) {
     public val _firstName: String?
     public val _lastName: String?
+
     public open fun getFirstName(): String? {
         return _firstName
     }
+
     public open fun getLastName(): String? {
         return _lastName
     }
+
     private fun doSmthBefore() {
     }
     private fun doSmthAfter() {
     }
+
     {
         doSmthBefore()
         _firstName = first
@@ -23,14 +27,17 @@ open class Customer(first: String?, last: String?) {
 open class CustomerBuilder() {
     public var _firstName: String? = "Homer"
     public var _lastName: String? = "Simpson"
+
     public open fun WithFirstName(firstName: String?): CustomerBuilder? {
         _firstName = firstName
         return this
     }
+
     public open fun WithLastName(lastName: String?): CustomerBuilder? {
         _lastName = lastName
         return this
     }
+
     public open fun Build(): Customer? {
         return Customer(_firstName, _lastName)
     }
diff --git a/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt b/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt
index 8df85bc4457..a1702366bda 100644
--- a/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt
+++ b/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt
@@ -2,23 +2,29 @@ public class Identifier<T>(_myName: T, _myHasDollar: Boolean) {
     private val myName: T
     private var myHasDollar: Boolean = false
     private var myNullable: Boolean = true
+
     public fun getName(): T {
         return myName
     }
+
     {
         myName = _myName
         myHasDollar = _myHasDollar
     }
+
     class object {
+
         public fun <T> init(name: T): Identifier<T> {
             val __ = Identifier(name, false)
             return __
         }
+
         public fun <T> init(name: T, isNullable: Boolean): Identifier<T> {
             val __ = Identifier(name, false)
             __.myNullable = isNullable
             return __
         }
+
         public fun <T> init(name: T, hasDollar: Boolean, isNullable: Boolean): Identifier<T> {
             val __ = Identifier(name, hasDollar)
             __.myNullable = isNullable
diff --git a/j2k/tests/testData/ast/constructors/genericIdentifier.kt b/j2k/tests/testData/ast/constructors/genericIdentifier.kt
index 6d9fd2bb17c..4947a90dec4 100644
--- a/j2k/tests/testData/ast/constructors/genericIdentifier.kt
+++ b/j2k/tests/testData/ast/constructors/genericIdentifier.kt
@@ -2,23 +2,29 @@ public open class Identifier<T>(_myName: T?, _myHasDollar: Boolean) {
     private val myName: T?
     private var myHasDollar: Boolean = false
     private var myNullable: Boolean = true
+
     public open fun getName(): T? {
         return myName
     }
+
     {
         myName = _myName
         myHasDollar = _myHasDollar
     }
+
     class object {
+
         public open fun <T> init(name: T?): Identifier<T> {
             val __ = Identifier(name, false)
             return __
         }
+
         public open fun <T> init(name: T?, isNullable: Boolean): Identifier<T> {
             val __ = Identifier(name, false)
             __.myNullable = isNullable
             return __
         }
+
         public open fun <T> init(name: T?, hasDollar: Boolean, isNullable: Boolean): Identifier<T> {
             val __ = Identifier(name, hasDollar)
             __.myNullable = isNullable
diff --git a/j2k/tests/testData/ast/constructors/identifier.ide.kt b/j2k/tests/testData/ast/constructors/identifier.ide.kt
index 52c7bfa51f9..8cb0c31237d 100644
--- a/j2k/tests/testData/ast/constructors/identifier.ide.kt
+++ b/j2k/tests/testData/ast/constructors/identifier.ide.kt
@@ -2,23 +2,29 @@ public class Identifier(_myName: String, _myHasDollar: Boolean) {
     private val myName: String
     private var myHasDollar: Boolean = false
     private var myNullable: Boolean = true
+
     public fun getName(): String {
         return myName
     }
+
     {
         myName = _myName
         myHasDollar = _myHasDollar
     }
+
     class object {
+
         public fun init(name: String): Identifier {
             val __ = Identifier(name, false)
             return __
         }
+
         public fun init(name: String, isNullable: Boolean): Identifier {
             val __ = Identifier(name, false)
             __.myNullable = isNullable
             return __
         }
+
         public fun init(name: String, hasDollar: Boolean, isNullable: Boolean): Identifier {
             val __ = Identifier(name, hasDollar)
             __.myNullable = isNullable
diff --git a/j2k/tests/testData/ast/constructors/identifier.kt b/j2k/tests/testData/ast/constructors/identifier.kt
index 45737d68bab..7d92c5c4f0c 100644
--- a/j2k/tests/testData/ast/constructors/identifier.kt
+++ b/j2k/tests/testData/ast/constructors/identifier.kt
@@ -2,23 +2,29 @@ public open class Identifier(_myName: String?, _myHasDollar: Boolean) {
     private val myName: String?
     private var myHasDollar: Boolean = false
     private var myNullable: Boolean = true
+
     public open fun getName(): String? {
         return myName
     }
+
     {
         myName = _myName
         myHasDollar = _myHasDollar
     }
+
     class object {
+
         public open fun init(name: String?): Identifier {
             val __ = Identifier(name, false)
             return __
         }
+
         public open fun init(name: String?, isNullable: Boolean): Identifier {
             val __ = Identifier(name, false)
             __.myNullable = isNullable
             return __
         }
+
         public open fun init(name: String?, hasDollar: Boolean, isNullable: Boolean): Identifier {
             val __ = Identifier(name, hasDollar)
             __.myNullable = isNullable
diff --git a/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt b/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt
index 61a3625fc40..02e5c0b6574 100644
--- a/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt
+++ b/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt
@@ -7,6 +7,7 @@ public class Test(_myName: String, _a: Boolean, _b: Double, _c: Float, _d: Long,
     private var e: Int = 0
     private var f: Short = 0
     private var g: Char = ' '
+
     {
         myName = _myName
         a = _a
@@ -17,15 +18,20 @@ public class Test(_myName: String, _a: Boolean, _b: Double, _c: Float, _d: Long,
         f = _f
         g = _g
     }
+
     class object {
+
         public fun init(): Test {
             val __ = Test(0, false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ')
             return __
         }
+
         public fun init(name: String): Test {
             val __ = Test(foo(name), false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ')
             return __
         }
+
+
         fun foo(n: String): String {
             return ""
         }
diff --git a/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt b/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt
index 9e6dc503d7c..39fad35fc99 100644
--- a/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt
+++ b/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt
@@ -7,6 +7,7 @@ public open class Test(_myName: String?, _a: Boolean, _b: Double, _c: Float, _d:
     private var e: Int = 0
     private var f: Short = 0
     private var g: Char = ' '
+
     {
         myName = _myName
         a = _a
@@ -17,15 +18,20 @@ public open class Test(_myName: String?, _a: Boolean, _b: Double, _c: Float, _d:
         f = _f
         g = _g
     }
+
     class object {
+
         public open fun init(): Test {
             val __ = Test(null, false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ')
             return __
         }
+
         public open fun init(name: String?): Test {
             val __ = Test(foo(name), false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ')
             return __
         }
+
+
         open fun foo(n: String?): String? {
             return ""
         }
diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.ide.kt b/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.ide.kt
index 7018b864e5e..245cb4d5856 100644
--- a/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.ide.kt
+++ b/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.ide.kt
@@ -1,4 +1,3 @@
 do
-{
-}
+{}
 while (true)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.kt b/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.kt
index 7018b864e5e..245cb4d5856 100644
--- a/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.kt
+++ b/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.kt
@@ -1,4 +1,3 @@
 do
-{
-}
+{}
 while (true)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/colorEnum.ide.kt b/j2k/tests/testData/ast/enum/colorEnum.ide.kt
index 10b747a106f..95287f39598 100644
--- a/j2k/tests/testData/ast/enum/colorEnum.ide.kt
+++ b/j2k/tests/testData/ast/enum/colorEnum.ide.kt
@@ -3,10 +3,13 @@ package demo
 enum class MyEnum(_color: Int) {
     RED : MyEnum(10)
     BLUE : MyEnum(20)
+
     private val color: Int
+
     public fun getColor(): Int {
         return color
     }
+
     {
         color = _color
     }
diff --git a/j2k/tests/testData/ast/enum/colorEnum.kt b/j2k/tests/testData/ast/enum/colorEnum.kt
index 10b747a106f..95287f39598 100644
--- a/j2k/tests/testData/ast/enum/colorEnum.kt
+++ b/j2k/tests/testData/ast/enum/colorEnum.kt
@@ -3,10 +3,13 @@ package demo
 enum class MyEnum(_color: Int) {
     RED : MyEnum(10)
     BLUE : MyEnum(20)
+
     private val color: Int
+
     public fun getColor(): Int {
         return color
     }
+
     {
         color = _color
     }
diff --git a/j2k/tests/testData/ast/enum/enumConstantIsNotNull.ide.kt b/j2k/tests/testData/ast/enum/enumConstantIsNotNull.ide.kt
index 08c5dc6212e..b55fb50de2b 100644
--- a/j2k/tests/testData/ast/enum/enumConstantIsNotNull.ide.kt
+++ b/j2k/tests/testData/ast/enum/enumConstantIsNotNull.ide.kt
@@ -1,5 +1,6 @@
 enum class E {
     FOO
+
     fun foo() {
         FOO.toString()
     }
diff --git a/j2k/tests/testData/ast/enum/enumConstantIsNotNull.kt b/j2k/tests/testData/ast/enum/enumConstantIsNotNull.kt
index 08c5dc6212e..b55fb50de2b 100644
--- a/j2k/tests/testData/ast/enum/enumConstantIsNotNull.kt
+++ b/j2k/tests/testData/ast/enum/enumConstantIsNotNull.kt
@@ -1,5 +1,6 @@
 enum class E {
     FOO
+
     fun foo() {
         FOO.toString()
     }
diff --git a/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.ide.kt b/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.ide.kt
index 51343206acf..3cfe7700f2d 100644
--- a/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.ide.kt
+++ b/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.ide.kt
@@ -4,10 +4,13 @@ enum class Color(c: Int) {
     RED : Color(23)
     YELLOW : Color(24)
     BLUE : Color(25)
+
     private var code: Int = 0
+
     public fun getCode(): Int {
         return code
     }
+
     {
         code = c
     }
diff --git a/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.kt b/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.kt
index 51343206acf..3cfe7700f2d 100644
--- a/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.kt
+++ b/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.kt
@@ -4,10 +4,13 @@ enum class Color(c: Int) {
     RED : Color(23)
     YELLOW : Color(24)
     BLUE : Color(25)
+
     private var code: Int = 0
+
     public fun getCode(): Int {
         return code
     }
+
     {
         code = c
     }
diff --git a/j2k/tests/testData/ast/enum/primaryPrivateConstructor.ide.kt b/j2k/tests/testData/ast/enum/primaryPrivateConstructor.ide.kt
index 6360c71872b..18e22a93922 100644
--- a/j2k/tests/testData/ast/enum/primaryPrivateConstructor.ide.kt
+++ b/j2k/tests/testData/ast/enum/primaryPrivateConstructor.ide.kt
@@ -2,9 +2,11 @@ package demo
 
 enum class Color(c: Int) {
     private var code: Int = 0
+
     public fun getCode(): Int {
         return code
     }
+
     {
         code = c
     }
diff --git a/j2k/tests/testData/ast/enum/primaryPrivateConstructor.kt b/j2k/tests/testData/ast/enum/primaryPrivateConstructor.kt
index 6360c71872b..18e22a93922 100644
--- a/j2k/tests/testData/ast/enum/primaryPrivateConstructor.kt
+++ b/j2k/tests/testData/ast/enum/primaryPrivateConstructor.kt
@@ -2,9 +2,11 @@ package demo
 
 enum class Color(c: Int) {
     private var code: Int = 0
+
     public fun getCode(): Int {
         return code
     }
+
     {
         code = c
     }
diff --git a/j2k/tests/testData/ast/enum/runnableImplementation.ide.kt b/j2k/tests/testData/ast/enum/runnableImplementation.ide.kt
index 1c5655a0f00..bb01ce3f3be 100644
--- a/j2k/tests/testData/ast/enum/runnableImplementation.ide.kt
+++ b/j2k/tests/testData/ast/enum/runnableImplementation.ide.kt
@@ -4,6 +4,7 @@ enum class Color : Runnable {
     RED
     YELLOW
     BLUE
+
     override fun run() {
         System.out.println("name()=" + name() + ", toString()=" + toString())
     }
diff --git a/j2k/tests/testData/ast/enum/runnableImplementation.kt b/j2k/tests/testData/ast/enum/runnableImplementation.kt
index 4f097ba5fae..563be8ad292 100644
--- a/j2k/tests/testData/ast/enum/runnableImplementation.kt
+++ b/j2k/tests/testData/ast/enum/runnableImplementation.kt
@@ -4,6 +4,7 @@ enum class Color : Runnable {
     RED
     YELLOW
     BLUE
+
     override fun run() {
         System.out?.println("name()=" + name() + ", toString()=" + toString())
     }
diff --git a/j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt b/j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt
index f13a8a6ac9f..fd915d7ca50 100644
--- a/j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt
+++ b/j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt
@@ -2,8 +2,7 @@
 val i = 0
 while (i <0)
 {
-{
-}
+{}
 {
 j++
 i++
diff --git a/j2k/tests/testData/ast/for/forWithEmptyBlock.kt b/j2k/tests/testData/ast/for/forWithEmptyBlock.kt
index 9c657331381..28acafae030 100644
--- a/j2k/tests/testData/ast/for/forWithEmptyBlock.kt
+++ b/j2k/tests/testData/ast/for/forWithEmptyBlock.kt
@@ -2,8 +2,7 @@
 var i: Int = 0
 while (i <0)
 {
-{
-}
+{}
 {
 j++
 i++
diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.ide.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.ide.kt
index 7fa0c32db4d..9f0afd80670 100644
--- a/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.ide.kt
+++ b/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.ide.kt
@@ -1,3 +1,2 @@
 for (n in list)
-{
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.kt
index 7fa0c32db4d..9f0afd80670 100644
--- a/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.kt
+++ b/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.kt
@@ -1,3 +1,2 @@
 for (n in list)
-{
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt
index c9fc63e66d0..f107c6e7200 100644
--- a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt
+++ b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt
@@ -4,15 +4,19 @@ class Test() : Base() {
     override fun hashCode(): Int {
         return super.hashCode()
     }
+
     override fun equals(o: Any): Boolean {
         return super.equals(o)
     }
+
     override fun clone(): Any {
         return super.clone()
     }
+
     override fun toString(): String {
         return super.toString()
     }
+
     override fun finalize() {
         super.finalize()
     }
@@ -21,15 +25,19 @@ class Base() {
     public fun hashCode(): Int {
         return System.identityHashCode(this)
     }
+
     public fun equals(o: Any): Boolean {
         return this.identityEquals(o)
     }
+
     protected fun clone(): Any {
         return super.clone()
     }
+
     public fun toString(): String {
         return getJavaClass<Base>.getName() + '@' + Integer.toHexString(hashCode())
     }
+
     protected fun finalize() {
         super.finalize()
     }
diff --git a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt
index 7d55cefb60d..87f2ac5e24d 100644
--- a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt
+++ b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt
@@ -4,15 +4,19 @@ open class Test() : Base() {
     override fun hashCode(): Int {
         return super.hashCode()
     }
+
     override fun equals(o: Any?): Boolean {
         return super.equals(o)
     }
+
     override fun clone(): Any? {
         return super.clone()
     }
+
     override fun toString(): String? {
         return super.toString()
     }
+
     override fun finalize() {
         super.finalize()
     }
@@ -21,15 +25,19 @@ open class Base() {
     public open fun hashCode(): Int {
         return System.identityHashCode(this)
     }
+
     public open fun equals(o: Any?): Boolean {
         return this.identityEquals(o)
     }
+
     protected open fun clone(): Any? {
         return super.clone()
     }
+
     public open fun toString(): String? {
         return getJavaClass<Base>.getName() + '@' + Integer.toHexString(hashCode())
     }
+
     protected open fun finalize() {
         super.finalize()
     }
diff --git a/j2k/tests/testData/ast/function/overrideObject.ide.kt b/j2k/tests/testData/ast/function/overrideObject.ide.kt
index ba7e97297ea..65bf9dcdc49 100644
--- a/j2k/tests/testData/ast/function/overrideObject.ide.kt
+++ b/j2k/tests/testData/ast/function/overrideObject.ide.kt
@@ -4,15 +4,19 @@ class Test() {
     public fun hashCode(): Int {
         return System.identityHashCode(this)
     }
+
     public fun equals(o: Any): Boolean {
         return this.identityEquals(o)
     }
+
     protected fun clone(): Any {
         return super.clone()
     }
+
     public fun toString(): String {
         return getJavaClass<Test>.getName() + '@' + Integer.toHexString(hashCode())
     }
+
     protected fun finalize() {
         super.finalize()
     }
diff --git a/j2k/tests/testData/ast/function/overrideObject.kt b/j2k/tests/testData/ast/function/overrideObject.kt
index 365d330ecd0..553a15151de 100644
--- a/j2k/tests/testData/ast/function/overrideObject.kt
+++ b/j2k/tests/testData/ast/function/overrideObject.kt
@@ -4,15 +4,19 @@ open class Test() {
     public open fun hashCode(): Int {
         return System.identityHashCode(this)
     }
+
     public open fun equals(o: Any?): Boolean {
         return this.identityEquals(o)
     }
+
     protected open fun clone(): Any? {
         return super.clone()
     }
+
     public open fun toString(): String? {
         return getJavaClass<Test>.getName() + '@' + Integer.toHexString(hashCode())
     }
+
     protected open fun finalize() {
         super.finalize()
     }
diff --git a/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt b/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt
index 78d53a75b25..c126ffbde45 100644
--- a/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt
+++ b/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt
@@ -4,9 +4,11 @@ class `$`() {
 }
 class `$$`(`$$$$`: `$$$$$`) : `$`() {
     val `$$$`: `$$$$$`
+
     public fun `$$$$$$`(): `$$$$$` {
         return `$$$`
     }
+
     {
         `$$$` = `$$$$`
     }
diff --git a/j2k/tests/testData/ast/identifier/finalFieldReference.kt b/j2k/tests/testData/ast/identifier/finalFieldReference.kt
index 36a1a60ee84..32ccdc95222 100644
--- a/j2k/tests/testData/ast/identifier/finalFieldReference.kt
+++ b/j2k/tests/testData/ast/identifier/finalFieldReference.kt
@@ -4,9 +4,11 @@ open class `$`() {
 }
 open class `$$`(`$$$$`: `$$$$$`?) : `$`() {
     val `$$$`: `$$$$$`?
+
     public open fun `$$$$$$`(): `$$$$$`? {
         return `$$$`
     }
+
     {
         `$$$` = `$$$$`
     }
diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.ide.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.ide.kt
index 4587b89bf1e..8b46ffb918e 100644
--- a/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.ide.kt
+++ b/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.ide.kt
@@ -1,6 +1,4 @@
 if (1 > 0)
-{
-}
+{}
 else
-{
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.kt
index 4587b89bf1e..8b46ffb918e 100644
--- a/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.kt
+++ b/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.kt
@@ -1,6 +1,4 @@
 if (1 > 0)
-{
-}
+{}
 else
-{
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt
index a787629a59e..c59a2861c90 100644
--- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt
@@ -2,6 +2,7 @@ class Base<T>(name: T) {
 }
 class One<T, K>(name: T, second: K) : Base<T>(name) {
     private var mySecond: K = 0
+
     {
         mySecond = second
     }
diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt
index fa23657209a..d1a79a88fc9 100644
--- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt
@@ -2,6 +2,7 @@ open class Base<T>(name: T?) {
 }
 open class One<T, K>(name: T?, second: K?) : Base<T?>(name) {
     private var mySecond: K? = null
+
     {
         mySecond = second
     }
diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt
index 6a6f6183046..052aa7006ed 100644
--- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt
@@ -2,6 +2,7 @@ class Base(name: String) {
 }
 class One(name: String, second: String) : Base(name) {
     private var mySecond: String = 0
+
     {
         mySecond = second
     }
diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt
index 403bd4a4c5f..89bbbb3fa6c 100644
--- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt
@@ -2,6 +2,7 @@ open class Base(name: String?) {
 }
 open class One(name: String?, second: String?) : Base(name) {
     private var mySecond: String? = null
+
     {
         mySecond = second
     }
diff --git a/j2k/tests/testData/ast/issues/comments.ide.kt b/j2k/tests/testData/ast/issues/comments.ide.kt
index 36caef222c6..ff80c727415 100644
--- a/j2k/tests/testData/ast/issues/comments.ide.kt
+++ b/j2k/tests/testData/ast/issues/comments.ide.kt
@@ -4,10 +4,12 @@ This is a block comment
 */
 class C() {
     // This is a class comment
+
     /**
      * This is a field doc comment.
      */
     private var i: Int = 0
+
     /**
      * This is a function doc comment.
      */
diff --git a/j2k/tests/testData/ast/issues/comments.kt b/j2k/tests/testData/ast/issues/comments.kt
index 9b4a400aefe..6c0f6c36712 100644
--- a/j2k/tests/testData/ast/issues/comments.kt
+++ b/j2k/tests/testData/ast/issues/comments.kt
@@ -4,10 +4,12 @@ This is a block comment
 */
 open class C() {
     // This is a class comment
+
     /**
      * This is a field doc comment.
      */
     private var i: Int = 0
+
     /**
      * This is a function doc comment.
      */
diff --git a/j2k/tests/testData/ast/issues/kt-1016.ide.kt b/j2k/tests/testData/ast/issues/kt-1016.ide.kt
index b7eb2f7cb80..456bd25872d 100644
--- a/j2k/tests/testData/ast/issues/kt-1016.ide.kt
+++ b/j2k/tests/testData/ast/issues/kt-1016.ide.kt
@@ -2,6 +2,7 @@ package demo
 
 class C(i: Int) {
     private val i: Int
+
     {
         this.i = i
     }
diff --git a/j2k/tests/testData/ast/issues/kt-1016.kt b/j2k/tests/testData/ast/issues/kt-1016.kt
index 3d14dea29ee..b339041eee8 100644
--- a/j2k/tests/testData/ast/issues/kt-1016.kt
+++ b/j2k/tests/testData/ast/issues/kt-1016.kt
@@ -2,6 +2,7 @@ package demo
 
 open class C(i: Int) {
     private val i: Int
+
     {
         this.i = i
     }
diff --git a/j2k/tests/testData/ast/issues/kt-543-boxed.ide.kt b/j2k/tests/testData/ast/issues/kt-543-boxed.ide.kt
index 3d0e06f7a60..a66932aa467 100644
--- a/j2k/tests/testData/ast/issues/kt-543-boxed.ide.kt
+++ b/j2k/tests/testData/ast/issues/kt-543-boxed.ide.kt
@@ -3,6 +3,7 @@ package demo
 class Test() {
     fun putInt(i: Int) {
     }
+
     fun test() {
         val b = 10
         putInt(b.toInt())
diff --git a/j2k/tests/testData/ast/issues/kt-543-boxed.kt b/j2k/tests/testData/ast/issues/kt-543-boxed.kt
index 51104a05a1b..fe129ae366f 100644
--- a/j2k/tests/testData/ast/issues/kt-543-boxed.kt
+++ b/j2k/tests/testData/ast/issues/kt-543-boxed.kt
@@ -3,6 +3,7 @@ package demo
 open class Test() {
     open fun putInt(i: Int?) {
     }
+
     open fun test() {
         var b: Byte = 10
         putInt(b.toInt())
diff --git a/j2k/tests/testData/ast/issues/kt-543-mixed.ide.kt b/j2k/tests/testData/ast/issues/kt-543-mixed.ide.kt
index fa60b2b2919..553cbc1888c 100644
--- a/j2k/tests/testData/ast/issues/kt-543-mixed.ide.kt
+++ b/j2k/tests/testData/ast/issues/kt-543-mixed.ide.kt
@@ -3,6 +3,7 @@ package demo
 class Test() {
     fun putInt(i: Int) {
     }
+
     fun test() {
         val i = 10
         putInt(i)
diff --git a/j2k/tests/testData/ast/issues/kt-543-mixed.kt b/j2k/tests/testData/ast/issues/kt-543-mixed.kt
index 40da8120e33..7b05d582845 100644
--- a/j2k/tests/testData/ast/issues/kt-543-mixed.kt
+++ b/j2k/tests/testData/ast/issues/kt-543-mixed.kt
@@ -3,6 +3,7 @@ package demo
 open class Test() {
     open fun putInt(i: Int?) {
     }
+
     open fun test() {
         var i: Int = 10
         putInt(i)
diff --git a/j2k/tests/testData/ast/issues/kt-543.ide.kt b/j2k/tests/testData/ast/issues/kt-543.ide.kt
index 2e6b93b5a3d..804c0e4e7ec 100644
--- a/j2k/tests/testData/ast/issues/kt-543.ide.kt
+++ b/j2k/tests/testData/ast/issues/kt-543.ide.kt
@@ -3,6 +3,7 @@ package demo
 class Test() {
     fun putInt(i: Int) {
     }
+
     fun test() {
         val b = 10
         putInt(b.toInt())
diff --git a/j2k/tests/testData/ast/issues/kt-543.kt b/j2k/tests/testData/ast/issues/kt-543.kt
index 13008455c58..595ca46d31f 100644
--- a/j2k/tests/testData/ast/issues/kt-543.kt
+++ b/j2k/tests/testData/ast/issues/kt-543.kt
@@ -3,6 +3,7 @@ package demo
 open class Test() {
     open fun putInt(i: Int) {
     }
+
     open fun test() {
         var b: Byte = 10
         putInt(b.toInt())
diff --git a/j2k/tests/testData/ast/issues/kt-638.ide.kt b/j2k/tests/testData/ast/issues/kt-638.ide.kt
index 8237d8ad8c1..45ffdcbf65e 100644
--- a/j2k/tests/testData/ast/issues/kt-638.ide.kt
+++ b/j2k/tests/testData/ast/issues/kt-638.ide.kt
@@ -2,23 +2,29 @@ public class Identifier<T>(_myName: T, _myHasDollar: Boolean) {
     private val myName: T
     private var myHasDollar: Boolean = false
     private var myNullable: Boolean = true
+
     public fun getName(): T {
         return myName
     }
+
     {
         myName = _myName
         myHasDollar = _myHasDollar
     }
+
     class object {
+
         public fun <T> init(name: T): Identifier<T> {
             val __ = Identifier(name, false)
             return __
         }
+
         public fun <T> init(name: T, isNullable: Boolean): Identifier<T> {
             val __ = Identifier(name, false)
             __.myNullable = isNullable
             return __
         }
+
         public fun <T> init(name: T, hasDollar: Boolean, isNullable: Boolean): Identifier<T> {
             val __ = Identifier(name, hasDollar)
             __.myNullable = isNullable
diff --git a/j2k/tests/testData/ast/issues/kt-638.kt b/j2k/tests/testData/ast/issues/kt-638.kt
index fc80ebb18a4..ddcc0017819 100644
--- a/j2k/tests/testData/ast/issues/kt-638.kt
+++ b/j2k/tests/testData/ast/issues/kt-638.kt
@@ -2,23 +2,29 @@ public open class Identifier<T>(_myName: T?, _myHasDollar: Boolean) {
     private val myName: T?
     private var myHasDollar: Boolean = false
     private var myNullable: Boolean = true
+
     public open fun getName(): T? {
         return myName
     }
+
     {
         myName = _myName
         myHasDollar = _myHasDollar
     }
+
     class object {
+
         public open fun <T> init(name: T?): Identifier<T> {
             val __ = Identifier(name, false)
             return __
         }
+
         public open fun <T> init(name: T?, isNullable: Boolean): Identifier<T> {
             val __ = Identifier(name, false)
             __.myNullable = isNullable
             return __
         }
+
         public open fun <T> init(name: T?, hasDollar: Boolean, isNullable: Boolean): Identifier<T> {
             val __ = Identifier(name, hasDollar)
             __.myNullable = isNullable
diff --git a/j2k/tests/testData/ast/issues/kt-696.ide.kt b/j2k/tests/testData/ast/issues/kt-696.ide.kt
index 9adf5f0dec4..03e9185181c 100644
--- a/j2k/tests/testData/ast/issues/kt-696.ide.kt
+++ b/j2k/tests/testData/ast/issues/kt-696.ide.kt
@@ -4,9 +4,11 @@ class Base() {
     public fun hashCode(): Int {
         return System.identityHashCode(this)
     }
+
     public fun equals(o: Any): Boolean {
         return this.identityEquals(o)
     }
+
     public fun toString(): String {
         return getJavaClass<Base>.getName() + '@' + Integer.toHexString(hashCode())
     }
@@ -15,9 +17,11 @@ class Child() : Base() {
     override fun hashCode(): Int {
         return super.hashCode()
     }
+
     override fun equals(o: Any): Boolean {
         return super.equals(o)
     }
+
     override fun toString(): String {
         return super.toString()
     }
diff --git a/j2k/tests/testData/ast/issues/kt-696.kt b/j2k/tests/testData/ast/issues/kt-696.kt
index 6f7a0b9aae2..e69949e2a1c 100644
--- a/j2k/tests/testData/ast/issues/kt-696.kt
+++ b/j2k/tests/testData/ast/issues/kt-696.kt
@@ -4,9 +4,11 @@ open class Base() {
     public open fun hashCode(): Int {
         return System.identityHashCode(this)
     }
+
     public open fun equals(o: Any?): Boolean {
         return this.identityEquals(o)
     }
+
     public open fun toString(): String? {
         return getJavaClass<Base>.getName() + '@' + Integer.toHexString(hashCode())
     }
@@ -15,9 +17,11 @@ open class Child() : Base() {
     override fun hashCode(): Int {
         return super.hashCode()
     }
+
     override fun equals(o: Any?): Boolean {
         return super.equals(o)
     }
+
     override fun toString(): String? {
         return super.toString()
     }
diff --git a/j2k/tests/testData/ast/issues/kt-792-mixed.ide.kt b/j2k/tests/testData/ast/issues/kt-792-mixed.ide.kt
index c7b886e0e11..e8eb0dc6c4b 100644
--- a/j2k/tests/testData/ast/issues/kt-792-mixed.ide.kt
+++ b/j2k/tests/testData/ast/issues/kt-792-mixed.ide.kt
@@ -1,6 +1,7 @@
 package demo
 
 class Test(i: Int) {
+
     fun test() {
         val i = 10
         Test(i)
diff --git a/j2k/tests/testData/ast/issues/kt-792-mixed.kt b/j2k/tests/testData/ast/issues/kt-792-mixed.kt
index 2c71b72c9ff..7c4142e4c56 100644
--- a/j2k/tests/testData/ast/issues/kt-792-mixed.kt
+++ b/j2k/tests/testData/ast/issues/kt-792-mixed.kt
@@ -1,6 +1,7 @@
 package demo
 
 open class Test(i: Int?) {
+
     open fun test() {
         var i: Int = 10
         Test(i)
diff --git a/j2k/tests/testData/ast/issues/kt-792.ide.kt b/j2k/tests/testData/ast/issues/kt-792.ide.kt
index f947568586b..ec6ecf6b300 100644
--- a/j2k/tests/testData/ast/issues/kt-792.ide.kt
+++ b/j2k/tests/testData/ast/issues/kt-792.ide.kt
@@ -1,6 +1,7 @@
 package demo
 
 class Test(i: Int) {
+
     fun test() {
         val b = 10
         Test(b.toInt())
diff --git a/j2k/tests/testData/ast/issues/kt-792.kt b/j2k/tests/testData/ast/issues/kt-792.kt
index 342d735dc88..efe164c999a 100644
--- a/j2k/tests/testData/ast/issues/kt-792.kt
+++ b/j2k/tests/testData/ast/issues/kt-792.kt
@@ -1,6 +1,7 @@
 package demo
 
 open class Test(i: Int) {
+
     open fun test() {
         var b: Byte = 10
         Test(b.toInt())
diff --git a/j2k/tests/testData/ast/issues/kt-794-mixed.ide.kt b/j2k/tests/testData/ast/issues/kt-794-mixed.ide.kt
index 6cf64956d7b..50b165d27f0 100644
--- a/j2k/tests/testData/ast/issues/kt-794-mixed.ide.kt
+++ b/j2k/tests/testData/ast/issues/kt-794-mixed.ide.kt
@@ -4,6 +4,7 @@ class Test() {
     fun getInteger(i: Int): Int {
         return i
     }
+
     fun test() {
         val i = getInteger(10)!!
     }
diff --git a/j2k/tests/testData/ast/issues/kt-794-mixed.kt b/j2k/tests/testData/ast/issues/kt-794-mixed.kt
index 6bc4e670398..e955c799520 100644
--- a/j2k/tests/testData/ast/issues/kt-794-mixed.kt
+++ b/j2k/tests/testData/ast/issues/kt-794-mixed.kt
@@ -4,6 +4,7 @@ open class Test() {
     open fun getInteger(i: Int?): Int? {
         return i
     }
+
     open fun test() {
         var i: Int = getInteger(10)!!
     }
diff --git a/j2k/tests/testData/ast/issues/kt-836.ide.kt b/j2k/tests/testData/ast/issues/kt-836.ide.kt
index fb1b78b4f11..9d8fab784f2 100644
--- a/j2k/tests/testData/ast/issues/kt-836.ide.kt
+++ b/j2k/tests/testData/ast/issues/kt-836.ide.kt
@@ -4,9 +4,11 @@ import java.io.Serializable
 
 public class Language(code: String) : Serializable {
     protected var code: String = 0
+
     override fun toString(): String {
         return this.code
     }
+
     {
         this.code = code
     }
diff --git a/j2k/tests/testData/ast/issues/kt-836.kt b/j2k/tests/testData/ast/issues/kt-836.kt
index b51e71678a6..0f3b35b7aba 100644
--- a/j2k/tests/testData/ast/issues/kt-836.kt
+++ b/j2k/tests/testData/ast/issues/kt-836.kt
@@ -4,9 +4,11 @@ import java.io.Serializable
 
 public open class Language(code: String?) : Serializable {
     protected var code: String? = null
+
     override fun toString(): String? {
         return this.code
     }
+
     {
         this.code = code
     }
diff --git a/j2k/tests/testData/ast/issues/kt-837.ide.kt b/j2k/tests/testData/ast/issues/kt-837.ide.kt
index d770f4caecf..1e7e085ad2c 100644
--- a/j2k/tests/testData/ast/issues/kt-837.ide.kt
+++ b/j2k/tests/testData/ast/issues/kt-837.ide.kt
@@ -3,13 +3,17 @@ package com.voltvoodoo.saplo4j.model
 import java.io.Serializable
 
 public class Language(code: String) : Serializable {
+
     protected var code: String = 0
+
     public fun equals(other: Language): Boolean {
         return other.toString().equals(this.toString())
     }
+
     {
         this.code = code
     }
+
     class object {
         public var ENGLISH: Language = Language("en")
         public var SWEDISH: Language = Language("sv")
diff --git a/j2k/tests/testData/ast/issues/kt-837.kt b/j2k/tests/testData/ast/issues/kt-837.kt
index 85df0dcad1f..17219cffb16 100644
--- a/j2k/tests/testData/ast/issues/kt-837.kt
+++ b/j2k/tests/testData/ast/issues/kt-837.kt
@@ -3,13 +3,17 @@ package com.voltvoodoo.saplo4j.model
 import java.io.Serializable
 
 public open class Language(code: String?) : Serializable {
+
     protected var code: String? = null
+
     public open fun equals(other: Language?): Boolean {
         return other?.toString()?.equals(this.toString())!!
     }
+
     {
         this.code = code
     }
+
     class object {
         public var ENGLISH: Language? = Language("en")
         public var SWEDISH: Language? = Language("sv")
diff --git a/j2k/tests/testData/ast/issues/kt-963.ide.kt b/j2k/tests/testData/ast/issues/kt-963.ide.kt
index 8f15dd9b5a3..b3a33d854cd 100644
--- a/j2k/tests/testData/ast/issues/kt-963.ide.kt
+++ b/j2k/tests/testData/ast/issues/kt-963.ide.kt
@@ -2,6 +2,7 @@ package demo
 
 class C(a: Int) {
     var abc: Int = 0
+
     {
         abc = a * 2
     }
diff --git a/j2k/tests/testData/ast/issues/kt-963.kt b/j2k/tests/testData/ast/issues/kt-963.kt
index 499d4d36381..2faaee613b0 100644
--- a/j2k/tests/testData/ast/issues/kt-963.kt
+++ b/j2k/tests/testData/ast/issues/kt-963.kt
@@ -2,6 +2,7 @@ package demo
 
 open class C(a: Int) {
     var abc: Int = 0
+
     {
         abc = a * 2
     }
diff --git a/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt b/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt
index 54b8fb14b79..6455539e102 100644
--- a/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt
+++ b/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt
@@ -4,6 +4,7 @@ class Test() : java.lang.Iterable<String> {
     override fun iterator(): java.util.Iterator<String> {
         return null
     }
+
     public fun push(i: java.util.Iterator<String>): java.util.Iterator<String> {
         val j = i
         return j
@@ -13,6 +14,7 @@ class FullTest() : java.lang.Iterable<String> {
     override fun iterator(): java.util.Iterator<String> {
         return null
     }
+
     public fun push(i: java.util.Iterator<String>): java.util.Iterator<String> {
         val j = i
         return j
diff --git a/j2k/tests/testData/ast/kotlinExclusion/kt-656.kt b/j2k/tests/testData/ast/kotlinExclusion/kt-656.kt
index fc63d0dd5ab..e8ae1dd7919 100644
--- a/j2k/tests/testData/ast/kotlinExclusion/kt-656.kt
+++ b/j2k/tests/testData/ast/kotlinExclusion/kt-656.kt
@@ -4,6 +4,7 @@ open class Test() : java.lang.Iterable<String?> {
     override fun iterator(): java.util.Iterator<String?>? {
         return null
     }
+
     public open fun push(i: java.util.Iterator<String?>?): java.util.Iterator<String?>? {
         var j: java.util.Iterator<String?>? = i
         return j
@@ -13,6 +14,7 @@ open class FullTest() : java.lang.Iterable<String?> {
     override fun iterator(): java.util.Iterator<String?>? {
         return null
     }
+
     public open fun push(i: java.util.Iterator<String?>?): java.util.Iterator<String?>? {
         var j: java.util.Iterator<String?>? = i
         return j
diff --git a/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt b/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt
index 54c6059e5c2..969bf6ff0ea 100644
--- a/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt
+++ b/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt
@@ -8,6 +8,7 @@ class Test() {
         val d2 = 10.0
         val f2 = 10.0.toFloat()
     }
+
     fun testBoxed() {
         val l1 = 10
         val d1 = 10.0
diff --git a/j2k/tests/testData/ast/literalExpression/endsWithDFL.kt b/j2k/tests/testData/ast/literalExpression/endsWithDFL.kt
index 2b374766552..afa8dec2801 100644
--- a/j2k/tests/testData/ast/literalExpression/endsWithDFL.kt
+++ b/j2k/tests/testData/ast/literalExpression/endsWithDFL.kt
@@ -8,6 +8,7 @@ open class Test() {
         var d2: Double = 10.0
         var f2: Float = 10.0.toFloat()
     }
+
     open fun testBoxed() {
         var l1: Long? = 10
         var d1: Double? = 10.0
diff --git a/j2k/tests/testData/ast/prefixOperator/nullableIf.ide.kt b/j2k/tests/testData/ast/prefixOperator/nullableIf.ide.kt
index 911034707aa..d0a36b99c8e 100644
--- a/j2k/tests/testData/ast/prefixOperator/nullableIf.ide.kt
+++ b/j2k/tests/testData/ast/prefixOperator/nullableIf.ide.kt
@@ -1,4 +1,3 @@
 val s = null
 if (!s.isEmpty())
-{
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/prefixOperator/nullableIf.kt b/j2k/tests/testData/ast/prefixOperator/nullableIf.kt
index 57590122e66..4d1e55dd60b 100644
--- a/j2k/tests/testData/ast/prefixOperator/nullableIf.kt
+++ b/j2k/tests/testData/ast/prefixOperator/nullableIf.kt
@@ -1,4 +1,3 @@
 var s: String? = null
 if (!s?.isEmpty()!!)
-{
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt b/j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt
index 9c24efb73a0..026423c3d48 100644
--- a/j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt
+++ b/j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt
@@ -4,6 +4,7 @@ class B(i: Int) {
     }
 }
 class A() : B(10) {
+
     override fun call(): Int {
         return super.call()
     }
diff --git a/j2k/tests/testData/ast/superExpression/classAextendsB.kt b/j2k/tests/testData/ast/superExpression/classAextendsB.kt
index 3e19fb5638a..e72376a9b48 100644
--- a/j2k/tests/testData/ast/superExpression/classAextendsB.kt
+++ b/j2k/tests/testData/ast/superExpression/classAextendsB.kt
@@ -4,6 +4,7 @@ open class B(i: Int) {
     }
 }
 open class A() : B(10) {
+
     override fun call(): Int {
         return super.call()
     }
diff --git a/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt b/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt
index 412ca6a4804..64f45d06a8c 100644
--- a/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt
+++ b/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt
@@ -5,6 +5,7 @@ public class SwitchDemo() {
         public fun print(o: Any) {
             System.out.println(o)
         }
+
         public fun test(i: Int) {
             val monthString = "<empty>"
             when (i) {
@@ -81,6 +82,7 @@ public class SwitchDemo() {
             }
             System.out.println(monthString)
         }
+
         public fun main(args: Array<String>) {
             for (i in 1..12) test(i)
         }
diff --git a/j2k/tests/testData/ast/switch/comlicatedFallDown.kt b/j2k/tests/testData/ast/switch/comlicatedFallDown.kt
index b7407421c00..8f3ca8b5959 100644
--- a/j2k/tests/testData/ast/switch/comlicatedFallDown.kt
+++ b/j2k/tests/testData/ast/switch/comlicatedFallDown.kt
@@ -5,6 +5,7 @@ public open class SwitchDemo() {
         public open fun print(o: Any?) {
             System.out?.println(o)
         }
+
         public open fun test(i: Int) {
             var monthString: String? = "<empty>"
             when (i) {
@@ -81,6 +82,7 @@ public open class SwitchDemo() {
             }
             System.out?.println(monthString)
         }
+
         public open fun main(args: Array<String?>?) {
             for (i in 1..12) test(i)
         }
diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.ide.kt b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.ide.kt
index 40e83f0667f..9b74b7d382e 100644
--- a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.ide.kt
+++ b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.ide.kt
@@ -1,6 +1,5 @@
 try
-{
-}
+{}
 catch (e : Exception) {
 println(1)
 }
@@ -8,5 +7,4 @@ catch (e : IOException) {
 println(0)
 }
 finally
-{
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.kt b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.kt
index 40e83f0667f..9b74b7d382e 100644
--- a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.kt
+++ b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.kt
@@ -1,6 +1,5 @@
 try
-{
-}
+{}
 catch (e : Exception) {
 println(1)
 }
@@ -8,5 +7,4 @@ catch (e : IOException) {
 println(0)
 }
 finally
-{
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.ide.kt b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.ide.kt
index 92e60f280d4..ed8478684ca 100644
--- a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.ide.kt
+++ b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.ide.kt
@@ -1,6 +1,5 @@
 try
-{
-}
+{}
 catch (e : Exception) {
 println(1)
 }
diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.kt b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.kt
index 92e60f280d4..ed8478684ca 100644
--- a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.kt
+++ b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.kt
@@ -1,6 +1,5 @@
 try
-{
-}
+{}
 catch (e : Exception) {
 println(1)
 }
diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.ide.kt b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.ide.kt
index 2f5deb07c0b..5cb15169daa 100644
--- a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.ide.kt
+++ b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.ide.kt
@@ -1,6 +1,5 @@
 try
-{
-}
+{}
 catch (e : Exception) {
 println(1)
 }
diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.kt b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.kt
index 2f5deb07c0b..5cb15169daa 100644
--- a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.kt
+++ b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.kt
@@ -1,6 +1,5 @@
 try
-{
-}
+{}
 catch (e : Exception) {
 println(1)
 }
diff --git a/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.ide.kt b/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.ide.kt
index 7c69899ce77..38cc1444190 100644
--- a/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.ide.kt
+++ b/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.ide.kt
@@ -1,3 +1,2 @@
 while (true)
-{
-}
\ No newline at end of file
+{}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.kt b/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.kt
index 7c69899ce77..38cc1444190 100644
--- a/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.kt
+++ b/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.kt
@@ -1,3 +1,2 @@
 while (true)
-{
-}
\ No newline at end of file
+{}
\ No newline at end of file