From b958e0d6b8b4623c51467256bace953ed08e4b79 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <Nikolay.Krasko@jetbrains.com>
Date: Tue, 13 May 2014 19:25:43 +0400
Subject: [PATCH] Allow empty blocks for classes and function literals

---
 .../com/intellij/formatting/annotations.xml   |  6 +++
 .../plugin/formatter/KotlinSpacingBuilder.kt  |  6 ++-
 .../plugin/formatter/kotlinSpacingRules.kt    |  7 ++++
 .../formatter/EmptyBlocks.after.inv.kt        | 41 +++++++++++++++++++
 idea/testData/formatter/EmptyBlocks.kt        | 41 +++++++++++++++++++
 .../SingleLineFunctionLiteral.after.inv.kt    |  6 ++-
 .../SingleLineFunctionLiteral.after.kt        |  4 ++
 .../formatter/SingleLineFunctionLiteral.kt    |  4 ++
 ...aceAroundExtendColonInObjects.after.inv.kt |  6 +--
 .../SpaceAroundExtendColonInObjects.after.kt  |  6 +--
 .../formatter/JetFormatterTestGenerated.java  |  5 +++
 j2k/tests/testData/ast/class/class.ide.kt     |  3 +-
 j2k/tests/testData/ast/class/class.kt         |  3 +-
 .../testData/ast/class/emptyClass.ide.kt      |  3 +-
 j2k/tests/testData/ast/class/emptyClass.kt    |  3 +-
 ...dsOneClassAndImplementsOneInterface.ide.kt |  3 +-
 ...xtendsOneClassAndImplementsOneInterface.kt |  3 +-
 ...ClassAndImplementsSeveralInterfaces.ide.kt |  3 +-
 ...sOneClassAndImplementsSeveralInterfaces.kt |  3 +-
 .../testData/ast/class/finalClass.ide.kt      |  3 +-
 j2k/tests/testData/ast/class/finalClass.kt    |  3 +-
 .../testData/ast/class/genericClass.ide.kt    |  3 +-
 j2k/tests/testData/ast/class/genericClass.kt  |  3 +-
 .../testData/ast/class/innerEmptyClass.ide.kt |  3 +-
 .../testData/ast/class/innerEmptyClass.kt     |  3 +-
 .../ast/class/innerStaticClass.ide.kt         |  3 +-
 .../testData/ast/class/innerStaticClass.kt    |  3 +-
 .../testData/ast/class/internalClass.ide.kt   |  3 +-
 j2k/tests/testData/ast/class/internalClass.kt |  3 +-
 .../testData/ast/class/pivateClass.ide.kt     |  3 +-
 j2k/tests/testData/ast/class/pivateClass.kt   |  3 +-
 .../testData/ast/class/protectedClass.ide.kt  |  3 +-
 .../testData/ast/class/protectedClass.kt      |  3 +-
 .../testData/ast/class/publicClass.ide.kt     |  3 +-
 j2k/tests/testData/ast/class/publicClass.kt   |  3 +-
 .../ast/class/simpleInheritance.ide.kt        |  3 +-
 .../testData/ast/class/simpleInheritance.kt   |  3 +-
 j2k/tests/testData/ast/enum/emptyEnum.ide.kt  |  3 +-
 j2k/tests/testData/ast/enum/emptyEnum.kt      |  3 +-
 .../enum/enumImplementsOneInterface.ide.kt    |  3 +-
 .../ast/enum/enumImplementsOneInterface.kt    |  3 +-
 .../enumImplementsSeveralInterfaces.ide.kt    |  3 +-
 .../enum/enumImplementsSeveralInterfaces.kt   |  3 +-
 .../testData/ast/enum/internalEnum.ide.kt     |  3 +-
 j2k/tests/testData/ast/enum/internalEnum.kt   |  3 +-
 .../testData/ast/enum/privateEnum.ide.kt      |  3 +-
 j2k/tests/testData/ast/enum/privateEnum.kt    |  3 +-
 .../testData/ast/enum/protectedEnum.ide.kt    |  3 +-
 j2k/tests/testData/ast/enum/protectedEnum.kt  |  3 +-
 j2k/tests/testData/ast/enum/publicEnum.ide.kt |  3 +-
 j2k/tests/testData/ast/enum/publicEnum.kt     |  3 +-
 .../testData/ast/for/forWithEmptyBlock.ide.kt |  2 +-
 .../testData/ast/for/forWithEmptyBlock.kt     |  2 +-
 .../ast/identifier/finalFieldReference.ide.kt |  6 +--
 .../ast/identifier/finalFieldReference.kt     |  6 +--
 .../importStatement/importWithKeywords.ide.kt |  3 +-
 .../ast/importStatement/importWithKeywords.kt |  3 +-
 .../ast/importStatement/importWithStar.ide.kt |  3 +-
 .../ast/importStatement/importWithStar.kt     |  3 +-
 .../ast/importStatement/simpleImport.ide.kt   |  3 +-
 .../ast/importStatement/simpleImport.kt       |  3 +-
 .../classOneExtendsBaseGeneric.ide.kt         |  3 +-
 .../inheritance/classOneExtendsBaseGeneric.kt |  3 +-
 .../classOneExtendsBaseWithOneParam.ide.kt    |  6 +--
 .../classOneExtendsBaseWithOneParam.kt        |  6 +--
 .../classOneExtendsBaseWithZeroParams.ide.kt  |  6 +--
 .../classOneExtendsBaseWithZeroParams.kt      |  6 +--
 ...seWithZeroParamsNonEmptyConstructor.ide.kt |  3 +-
 ...dsBaseWithZeroParamsNonEmptyConstructor.kt |  3 +-
 j2k/tests/testData/ast/issues/kt-1048.ide.kt  |  3 +-
 j2k/tests/testData/ast/issues/kt-1048.kt      |  3 +-
 .../testData/ast/issues/kt-809-string.ide.kt  |  3 +-
 .../testData/ast/issues/kt-809-string.kt      |  3 +-
 j2k/tests/testData/ast/issues/kt-809.ide.kt   |  3 +-
 j2k/tests/testData/ast/issues/kt-809.kt       |  3 +-
 .../testData/ast/misc/packageWithClass.ide.kt |  3 +-
 .../testData/ast/misc/packageWithClass.kt     |  3 +-
 .../ast/misc/packageWithClasses.ide.kt        |  6 +--
 .../testData/ast/misc/packageWithClasses.kt   |  6 +--
 .../ast/misc/packageWithOpenClass.ide.kt      |  3 +-
 .../testData/ast/misc/packageWithOpenClass.kt |  3 +-
 .../newClassByFullName.ide.kt                 |  3 +-
 .../newClassExpression/newClassByFullName.kt  |  3 +-
 .../newClassExpression/newInnerClass.ide.kt   |  3 +-
 .../ast/newClassExpression/newInnerClass.kt   |  3 +-
 .../newListAndNewMember.ide.kt                |  3 +-
 .../newClassExpression/newListAndNewMember.kt |  3 +-
 .../newStaticInnerClass.ide.kt                |  3 +-
 .../newClassExpression/newStaticInnerClass.kt |  3 +-
 .../orgJetbrainsJetJ2kIn.ide.kt               |  3 +-
 .../packageStatement/orgJetbrainsJetJ2kIn.kt  |  3 +-
 .../ast/trait/abstactInterface.ide.kt         |  3 +-
 .../testData/ast/trait/abstactInterface.kt    |  3 +-
 .../testData/ast/trait/emptyInterface.ide.kt  |  3 +-
 .../testData/ast/trait/emptyInterface.kt      |  3 +-
 ...ClassAndImplementsSeveralInterfaces.ide.kt |  3 +-
 ...sOneClassAndImplementsSeveralInterfaces.kt |  3 +-
 .../ast/trait/extendsOneInterface.ide.kt      |  3 +-
 .../testData/ast/trait/extendsOneInterface.kt |  3 +-
 .../ast/trait/internalInterface.ide.kt        |  3 +-
 .../testData/ast/trait/internalInterface.kt   |  3 +-
 .../ast/trait/privateInterface.ide.kt         |  3 +-
 .../testData/ast/trait/privateInterface.kt    |  3 +-
 .../ast/trait/protectedInterface.ide.kt       |  3 +-
 .../testData/ast/trait/protectedInterface.kt  |  3 +-
 .../testData/ast/trait/publicInterface.ide.kt |  3 +-
 .../testData/ast/trait/publicInterface.kt     |  3 +-
 ...trizationWithTwoBoundsWithExtending.ide.kt |  3 +-
 ...rametrizationWithTwoBoundsWithExtending.kt |  3 +-
 .../classParametrizationWithTwoBounds.ide.kt  |  3 +-
 .../classParametrizationWithTwoBounds.kt      |  3 +-
 ...trizationWithTwoBoundsWithExtending.ide.kt |  3 +-
 ...rametrizationWithTwoBoundsWithExtending.kt |  3 +-
 .../complexExampleWithClassExtending.ide.kt   |  3 +-
 .../complexExampleWithClassExtending.kt       |  3 +-
 ...exExampleWithClassMultiplyExtending.ide.kt |  3 +-
 ...omplexExampleWithClassMultiplyExtending.kt |  3 +-
 .../ast/typeParameters/genericClass.ide.kt    |  3 +-
 .../ast/typeParameters/genericClass.kt        |  3 +-
 ...trizationWithTwoBoundsWithExtending.ide.kt |  3 +-
 ...rametrizationWithTwoBoundsWithExtending.kt |  3 +-
 121 files changed, 240 insertions(+), 244 deletions(-)
 create mode 100644 idea/testData/formatter/EmptyBlocks.after.inv.kt
 create mode 100644 idea/testData/formatter/EmptyBlocks.kt

diff --git a/annotations/com/intellij/formatting/annotations.xml b/annotations/com/intellij/formatting/annotations.xml
index 1b6175d1c7d..1cfb7a382a8 100644
--- a/annotations/com/intellij/formatting/annotations.xml
+++ b/annotations/com/intellij/formatting/annotations.xml
@@ -1,4 +1,10 @@
 <root>
+  <item name='com.intellij.formatting.Spacing com.intellij.formatting.Spacing createKeepingFirstColumnSpacing(int, int, boolean, int)'>
+    <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
+  <item name='com.intellij.formatting.Spacing com.intellij.formatting.Spacing createSpacing(int, int, int, boolean, int)'>
+    <annotation name='org.jetbrains.annotations.NotNull'/>
+  </item>
   <item name='com.intellij.formatting.SpacingBuilder com.intellij.formatting.SpacingBuilder append(com.intellij.formatting.SpacingBuilder)'>
     <annotation name='org.jetbrains.annotations.NotNull'/>
   </item>
diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/KotlinSpacingBuilder.kt b/idea/src/org/jetbrains/jet/plugin/formatter/KotlinSpacingBuilder.kt
index 54570596bdb..ab86b7df4d6 100644
--- a/idea/src/org/jetbrains/jet/plugin/formatter/KotlinSpacingBuilder.kt
+++ b/idea/src/org/jetbrains/jet/plugin/formatter/KotlinSpacingBuilder.kt
@@ -77,7 +77,11 @@ class KotlinSpacingBuilder(val codeStyleSettings: CodeStyleSettings) {
             }
         }
 
-        fun customRule(block: (ASTBlock, ASTBlock, ASTBlock) -> Spacing?) {
+        fun spacing(spacing: Spacing) {
+            newRule { (parent, left, right) -> spacing }
+        }
+
+        fun customRule(block: (parent: ASTBlock, left: ASTBlock, right: ASTBlock) -> Spacing?) {
             newRule(block)
         }
 
diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt b/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt
index 5d803a67fad..e08e70d500d 100644
--- a/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt
+++ b/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt
@@ -57,6 +57,8 @@ fun createSpacingBuilder(settings: CodeStyleSettings): KotlinSpacingBuilder {
             between(FUN, PROPERTY).blankLines(1)
 
             // =============== Spacing ================
+            betweenInside(LBRACE, RBRACE, CLASS_BODY).spaces(0)
+
             before(COMMA).spaceIf(jetCommonSettings.SPACE_BEFORE_COMMA)
             after(COMMA).spaceIf(jetCommonSettings.SPACE_AFTER_COMMA)
 
@@ -225,6 +227,11 @@ fun createSpacingBuilder(settings: CodeStyleSettings): KotlinSpacingBuilder {
                        right = BLOCK)
                     .lineBreakIfLineBreakInParent(numSpacesOtherwise = 1)
 
+            inPosition(parent = FUNCTION_LITERAL,
+                       left = LBRACE,
+                       right = RBRACE)
+                    .spacing(Spacing.createSpacing(0, 1, 0, settings.KEEP_LINE_BREAKS, settings.KEEP_BLANK_LINES_IN_CODE))
+
             inPosition(parent = FUNCTION_LITERAL,
                        right = RBRACE)
                     .lineBreakIfLineBreakInParent(numSpacesOtherwise = spacesInSimpleFunction)
diff --git a/idea/testData/formatter/EmptyBlocks.after.inv.kt b/idea/testData/formatter/EmptyBlocks.after.inv.kt
new file mode 100644
index 00000000000..2758eec0453
--- /dev/null
+++ b/idea/testData/formatter/EmptyBlocks.after.inv.kt
@@ -0,0 +1,41 @@
+class Test {}
+
+class Other {
+    class object {}
+}
+
+object TestObject {}
+
+val testVal = {}
+
+val testObject = object {}
+
+fun foo(f: (String) -> Unit = {}) = {}
+
+fun call() {
+    foo({})
+    foo {}
+}
+
+class Test1 {
+}
+
+class Other1 {
+    class object {
+    }
+}
+
+object TestObject1 {
+}
+
+val testVal1 = { }
+
+val testObject1 = object {
+}
+
+fun foo1(f: (String) -> Unit = { }) = { }
+
+fun call1() {
+    foo1({ })
+    foo1 { }
+}
\ No newline at end of file
diff --git a/idea/testData/formatter/EmptyBlocks.kt b/idea/testData/formatter/EmptyBlocks.kt
new file mode 100644
index 00000000000..2758eec0453
--- /dev/null
+++ b/idea/testData/formatter/EmptyBlocks.kt
@@ -0,0 +1,41 @@
+class Test {}
+
+class Other {
+    class object {}
+}
+
+object TestObject {}
+
+val testVal = {}
+
+val testObject = object {}
+
+fun foo(f: (String) -> Unit = {}) = {}
+
+fun call() {
+    foo({})
+    foo {}
+}
+
+class Test1 {
+}
+
+class Other1 {
+    class object {
+    }
+}
+
+object TestObject1 {
+}
+
+val testVal1 = { }
+
+val testObject1 = object {
+}
+
+fun foo1(f: (String) -> Unit = { }) = { }
+
+fun call1() {
+    foo1({ })
+    foo1 { }
+}
\ No newline at end of file
diff --git a/idea/testData/formatter/SingleLineFunctionLiteral.after.inv.kt b/idea/testData/formatter/SingleLineFunctionLiteral.after.inv.kt
index 5c49457094e..ba120739995 100644
--- a/idea/testData/formatter/SingleLineFunctionLiteral.after.inv.kt
+++ b/idea/testData/formatter/SingleLineFunctionLiteral.after.inv.kt
@@ -4,6 +4,10 @@ fun test(some: (Int) -> Int) {
 fun foo() = test() {it}
 val function = test {(a: Int) -> a}
 val function1 = test {a : Int -> a}
-val function2 = test {}
+val function2 = test { }
+val function3 = test {}
+val function4 = test { }
+val function5 = test {
+}
 
 // SET_TRUE: INSERT_WHITESPACES_IN_SIMPLE_ONE_LINE_METHOD
\ No newline at end of file
diff --git a/idea/testData/formatter/SingleLineFunctionLiteral.after.kt b/idea/testData/formatter/SingleLineFunctionLiteral.after.kt
index 5b898ed18a2..230a834d82a 100644
--- a/idea/testData/formatter/SingleLineFunctionLiteral.after.kt
+++ b/idea/testData/formatter/SingleLineFunctionLiteral.after.kt
@@ -5,5 +5,9 @@ fun foo() = test() { it }
 val function = test {(a: Int) -> a }
 val function1 = test { a : Int -> a }
 val function2 = test { }
+val function3 = test {}
+val function4 = test { }
+val function5 = test {
+}
 
 // SET_TRUE: INSERT_WHITESPACES_IN_SIMPLE_ONE_LINE_METHOD
\ No newline at end of file
diff --git a/idea/testData/formatter/SingleLineFunctionLiteral.kt b/idea/testData/formatter/SingleLineFunctionLiteral.kt
index c0a9e8f12be..9167be85bb9 100644
--- a/idea/testData/formatter/SingleLineFunctionLiteral.kt
+++ b/idea/testData/formatter/SingleLineFunctionLiteral.kt
@@ -5,5 +5,9 @@ fun foo() = test() { it }
 val function = test { (a: Int) -> a }
 val function1 = test {a : Int -> a}
 val function2 = test {    }
+val function3 = test {}
+val function4 = test { }
+val function5 = test {
+}
 
 // SET_TRUE: INSERT_WHITESPACES_IN_SIMPLE_ONE_LINE_METHOD
\ No newline at end of file
diff --git a/idea/testData/formatter/SpaceAroundExtendColonInObjects.after.inv.kt b/idea/testData/formatter/SpaceAroundExtendColonInObjects.after.inv.kt
index a361dce8cbb..57fca849e8d 100644
--- a/idea/testData/formatter/SpaceAroundExtendColonInObjects.after.inv.kt
+++ b/idea/testData/formatter/SpaceAroundExtendColonInObjects.after.inv.kt
@@ -13,11 +13,9 @@ object Some3
 
         A
 
-val a = object: A {
-}
+val a = object: A {}
 
-val b = object: A {
-}
+val b = object: A {}
 
 class B {
     class object: A {
diff --git a/idea/testData/formatter/SpaceAroundExtendColonInObjects.after.kt b/idea/testData/formatter/SpaceAroundExtendColonInObjects.after.kt
index f95c073f6de..e22ce61ab8f 100644
--- a/idea/testData/formatter/SpaceAroundExtendColonInObjects.after.kt
+++ b/idea/testData/formatter/SpaceAroundExtendColonInObjects.after.kt
@@ -13,11 +13,9 @@ object Some3
 
         A
 
-val a = object :A {
-}
+val a = object :A {}
 
-val b = object :A {
-}
+val b = object :A {}
 
 class B {
     class object :A {
diff --git a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java b/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java
index 6bcf845f775..6189b2d49e2 100644
--- a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java
+++ b/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java
@@ -504,6 +504,11 @@ public class JetFormatterTestGenerated extends AbstractJetFormatterTest {
             doTestInverted("idea/testData/formatter/ElseOnNewLine.after.inv.kt");
         }
         
+        @TestMetadata("EmptyBlocks.after.inv.kt")
+        public void testEmptyBlocks() throws Exception {
+            doTestInverted("idea/testData/formatter/EmptyBlocks.after.inv.kt");
+        }
+        
         @TestMetadata("ForLineBreak.after.inv.kt")
         public void testForLineBreak() throws Exception {
             doTestInverted("idea/testData/formatter/ForLineBreak.after.inv.kt");
diff --git a/j2k/tests/testData/ast/class/class.ide.kt b/j2k/tests/testData/ast/class/class.ide.kt
index 98c16b37053..448f2c6caeb 100644
--- a/j2k/tests/testData/ast/class/class.ide.kt
+++ b/j2k/tests/testData/ast/class/class.ide.kt
@@ -1,2 +1 @@
-class Test() {
-}
\ No newline at end of file
+class Test() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/class.kt b/j2k/tests/testData/ast/class/class.kt
index bc29d4b27a1..7cd9a445411 100644
--- a/j2k/tests/testData/ast/class/class.kt
+++ b/j2k/tests/testData/ast/class/class.kt
@@ -1,2 +1 @@
-open class Test() {
-}
\ No newline at end of file
+open class Test() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/emptyClass.ide.kt b/j2k/tests/testData/ast/class/emptyClass.ide.kt
index 161cb193d08..411e9bd2c68 100644
--- a/j2k/tests/testData/ast/class/emptyClass.ide.kt
+++ b/j2k/tests/testData/ast/class/emptyClass.ide.kt
@@ -1,2 +1 @@
-class A() {
-}
\ No newline at end of file
+class A() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/emptyClass.kt b/j2k/tests/testData/ast/class/emptyClass.kt
index 161cb193d08..411e9bd2c68 100644
--- a/j2k/tests/testData/ast/class/emptyClass.kt
+++ b/j2k/tests/testData/ast/class/emptyClass.kt
@@ -1,2 +1 @@
-class A() {
-}
\ No newline at end of file
+class A() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.ide.kt b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.ide.kt
index 7206c054962..7d8113607af 100644
--- a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.ide.kt
+++ b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.ide.kt
@@ -1,2 +1 @@
-class A() : Base(), I {
-}
\ No newline at end of file
+class A() : Base(), I {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.kt b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.kt
index 7206c054962..7d8113607af 100644
--- a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.kt
+++ b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.kt
@@ -1,2 +1 @@
-class A() : Base(), I {
-}
\ No newline at end of file
+class A() : Base(), I {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.ide.kt b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.ide.kt
index 7812e054bda..a951aef745d 100644
--- a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.ide.kt
+++ b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.ide.kt
@@ -1,2 +1 @@
-class A() : Base(), I0, I1, I2 {
-}
\ No newline at end of file
+class A() : Base(), I0, I1, I2 {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.kt b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.kt
index 7812e054bda..a951aef745d 100644
--- a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.kt
+++ b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.kt
@@ -1,2 +1 @@
-class A() : Base(), I0, I1, I2 {
-}
\ No newline at end of file
+class A() : Base(), I0, I1, I2 {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/finalClass.ide.kt b/j2k/tests/testData/ast/class/finalClass.ide.kt
index 98c16b37053..448f2c6caeb 100644
--- a/j2k/tests/testData/ast/class/finalClass.ide.kt
+++ b/j2k/tests/testData/ast/class/finalClass.ide.kt
@@ -1,2 +1 @@
-class Test() {
-}
\ No newline at end of file
+class Test() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/finalClass.kt b/j2k/tests/testData/ast/class/finalClass.kt
index 98c16b37053..448f2c6caeb 100644
--- a/j2k/tests/testData/ast/class/finalClass.kt
+++ b/j2k/tests/testData/ast/class/finalClass.kt
@@ -1,2 +1 @@
-class Test() {
-}
\ No newline at end of file
+class Test() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/genericClass.ide.kt b/j2k/tests/testData/ast/class/genericClass.ide.kt
index f3565e5ec30..7e478bcfd56 100644
--- a/j2k/tests/testData/ast/class/genericClass.ide.kt
+++ b/j2k/tests/testData/ast/class/genericClass.ide.kt
@@ -1,2 +1 @@
-class Entry<K, V>() {
-}
\ No newline at end of file
+class Entry<K, V>() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/genericClass.kt b/j2k/tests/testData/ast/class/genericClass.kt
index f3565e5ec30..7e478bcfd56 100644
--- a/j2k/tests/testData/ast/class/genericClass.kt
+++ b/j2k/tests/testData/ast/class/genericClass.kt
@@ -1,2 +1 @@
-class Entry<K, V>() {
-}
\ No newline at end of file
+class Entry<K, V>() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/innerEmptyClass.ide.kt b/j2k/tests/testData/ast/class/innerEmptyClass.ide.kt
index 7258221afde..dab431167d3 100644
--- a/j2k/tests/testData/ast/class/innerEmptyClass.ide.kt
+++ b/j2k/tests/testData/ast/class/innerEmptyClass.ide.kt
@@ -1,4 +1,3 @@
 class A() {
-    class B() {
-    }
+    class B() {}
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/innerEmptyClass.kt b/j2k/tests/testData/ast/class/innerEmptyClass.kt
index 7258221afde..dab431167d3 100644
--- a/j2k/tests/testData/ast/class/innerEmptyClass.kt
+++ b/j2k/tests/testData/ast/class/innerEmptyClass.kt
@@ -1,4 +1,3 @@
 class A() {
-    class B() {
-    }
+    class B() {}
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/innerStaticClass.ide.kt b/j2k/tests/testData/ast/class/innerStaticClass.ide.kt
index 3acaf484fcf..f936033ee01 100644
--- a/j2k/tests/testData/ast/class/innerStaticClass.ide.kt
+++ b/j2k/tests/testData/ast/class/innerStaticClass.ide.kt
@@ -1,6 +1,5 @@
 class S() {
     class object {
-        class Inner() {
-        }
+        class Inner() {}
     }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/innerStaticClass.kt b/j2k/tests/testData/ast/class/innerStaticClass.kt
index 36ff7f18334..6e53b365350 100644
--- a/j2k/tests/testData/ast/class/innerStaticClass.kt
+++ b/j2k/tests/testData/ast/class/innerStaticClass.kt
@@ -1,6 +1,5 @@
 class S() {
     class object {
-        open class Inner() {
-        }
+        open class Inner() {}
     }
 }
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/internalClass.ide.kt b/j2k/tests/testData/ast/class/internalClass.ide.kt
index 98c16b37053..448f2c6caeb 100644
--- a/j2k/tests/testData/ast/class/internalClass.ide.kt
+++ b/j2k/tests/testData/ast/class/internalClass.ide.kt
@@ -1,2 +1 @@
-class Test() {
-}
\ No newline at end of file
+class Test() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/internalClass.kt b/j2k/tests/testData/ast/class/internalClass.kt
index bc29d4b27a1..7cd9a445411 100644
--- a/j2k/tests/testData/ast/class/internalClass.kt
+++ b/j2k/tests/testData/ast/class/internalClass.kt
@@ -1,2 +1 @@
-open class Test() {
-}
\ No newline at end of file
+open class Test() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/pivateClass.ide.kt b/j2k/tests/testData/ast/class/pivateClass.ide.kt
index 0cb88d1d7d3..fd6b72fcdd0 100644
--- a/j2k/tests/testData/ast/class/pivateClass.ide.kt
+++ b/j2k/tests/testData/ast/class/pivateClass.ide.kt
@@ -1,2 +1 @@
-private class Test() {
-}
\ No newline at end of file
+private class Test() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/pivateClass.kt b/j2k/tests/testData/ast/class/pivateClass.kt
index 96001c69f28..ea7c0129c3d 100644
--- a/j2k/tests/testData/ast/class/pivateClass.kt
+++ b/j2k/tests/testData/ast/class/pivateClass.kt
@@ -1,2 +1 @@
-private open class Test() {
-}
\ No newline at end of file
+private open class Test() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/protectedClass.ide.kt b/j2k/tests/testData/ast/class/protectedClass.ide.kt
index 1eceac9e138..5cd832d082a 100644
--- a/j2k/tests/testData/ast/class/protectedClass.ide.kt
+++ b/j2k/tests/testData/ast/class/protectedClass.ide.kt
@@ -1,2 +1 @@
-protected class Test() {
-}
\ No newline at end of file
+protected class Test() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/protectedClass.kt b/j2k/tests/testData/ast/class/protectedClass.kt
index e82caa26cd0..927a6bc1705 100644
--- a/j2k/tests/testData/ast/class/protectedClass.kt
+++ b/j2k/tests/testData/ast/class/protectedClass.kt
@@ -1,2 +1 @@
-protected open class Test() {
-}
\ No newline at end of file
+protected open class Test() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/publicClass.ide.kt b/j2k/tests/testData/ast/class/publicClass.ide.kt
index a3e0691f699..e2c1c414eb5 100644
--- a/j2k/tests/testData/ast/class/publicClass.ide.kt
+++ b/j2k/tests/testData/ast/class/publicClass.ide.kt
@@ -1,2 +1 @@
-public class Test() {
-}
\ No newline at end of file
+public class Test() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/publicClass.kt b/j2k/tests/testData/ast/class/publicClass.kt
index 98e32f1aca0..ff1961c4eed 100644
--- a/j2k/tests/testData/ast/class/publicClass.kt
+++ b/j2k/tests/testData/ast/class/publicClass.kt
@@ -1,2 +1 @@
-public open class Test() {
-}
\ No newline at end of file
+public open class Test() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/simpleInheritance.ide.kt b/j2k/tests/testData/ast/class/simpleInheritance.ide.kt
index 7bf6ef80f75..1837bca55a9 100644
--- a/j2k/tests/testData/ast/class/simpleInheritance.ide.kt
+++ b/j2k/tests/testData/ast/class/simpleInheritance.ide.kt
@@ -1,2 +1 @@
-class A() : Base() {
-}
\ No newline at end of file
+class A() : Base() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/class/simpleInheritance.kt b/j2k/tests/testData/ast/class/simpleInheritance.kt
index 7bf6ef80f75..1837bca55a9 100644
--- a/j2k/tests/testData/ast/class/simpleInheritance.kt
+++ b/j2k/tests/testData/ast/class/simpleInheritance.kt
@@ -1,2 +1 @@
-class A() : Base() {
-}
\ No newline at end of file
+class A() : Base() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/emptyEnum.ide.kt b/j2k/tests/testData/ast/enum/emptyEnum.ide.kt
index c8338128138..cf0c22de5bd 100644
--- a/j2k/tests/testData/ast/enum/emptyEnum.ide.kt
+++ b/j2k/tests/testData/ast/enum/emptyEnum.ide.kt
@@ -1,2 +1 @@
-enum class A {
-}
\ No newline at end of file
+enum class A {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/emptyEnum.kt b/j2k/tests/testData/ast/enum/emptyEnum.kt
index c8338128138..cf0c22de5bd 100644
--- a/j2k/tests/testData/ast/enum/emptyEnum.kt
+++ b/j2k/tests/testData/ast/enum/emptyEnum.kt
@@ -1,2 +1 @@
-enum class A {
-}
\ No newline at end of file
+enum class A {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/enumImplementsOneInterface.ide.kt b/j2k/tests/testData/ast/enum/enumImplementsOneInterface.ide.kt
index 9cd0e207155..09b2e590bef 100644
--- a/j2k/tests/testData/ast/enum/enumImplementsOneInterface.ide.kt
+++ b/j2k/tests/testData/ast/enum/enumImplementsOneInterface.ide.kt
@@ -1,2 +1 @@
-enum class A : I {
-}
\ No newline at end of file
+enum class A : I {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/enumImplementsOneInterface.kt b/j2k/tests/testData/ast/enum/enumImplementsOneInterface.kt
index 9cd0e207155..09b2e590bef 100644
--- a/j2k/tests/testData/ast/enum/enumImplementsOneInterface.kt
+++ b/j2k/tests/testData/ast/enum/enumImplementsOneInterface.kt
@@ -1,2 +1 @@
-enum class A : I {
-}
\ No newline at end of file
+enum class A : I {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.ide.kt b/j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.ide.kt
index 9cf25118b35..183b15c4fff 100644
--- a/j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.ide.kt
+++ b/j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.ide.kt
@@ -1,2 +1 @@
-enum class A : I0, I1, I2 {
-}
\ No newline at end of file
+enum class A : I0, I1, I2 {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.kt b/j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.kt
index 9cf25118b35..183b15c4fff 100644
--- a/j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.kt
+++ b/j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.kt
@@ -1,2 +1 @@
-enum class A : I0, I1, I2 {
-}
\ No newline at end of file
+enum class A : I0, I1, I2 {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/internalEnum.ide.kt b/j2k/tests/testData/ast/enum/internalEnum.ide.kt
index 79279032cc3..04f0bcf787a 100644
--- a/j2k/tests/testData/ast/enum/internalEnum.ide.kt
+++ b/j2k/tests/testData/ast/enum/internalEnum.ide.kt
@@ -1,2 +1 @@
-enum class Test {
-}
\ No newline at end of file
+enum class Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/internalEnum.kt b/j2k/tests/testData/ast/enum/internalEnum.kt
index 79279032cc3..04f0bcf787a 100644
--- a/j2k/tests/testData/ast/enum/internalEnum.kt
+++ b/j2k/tests/testData/ast/enum/internalEnum.kt
@@ -1,2 +1 @@
-enum class Test {
-}
\ No newline at end of file
+enum class Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/privateEnum.ide.kt b/j2k/tests/testData/ast/enum/privateEnum.ide.kt
index a3a71c70855..3dc188a912b 100644
--- a/j2k/tests/testData/ast/enum/privateEnum.ide.kt
+++ b/j2k/tests/testData/ast/enum/privateEnum.ide.kt
@@ -1,2 +1 @@
-private enum class Test {
-}
\ No newline at end of file
+private enum class Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/privateEnum.kt b/j2k/tests/testData/ast/enum/privateEnum.kt
index a3a71c70855..3dc188a912b 100644
--- a/j2k/tests/testData/ast/enum/privateEnum.kt
+++ b/j2k/tests/testData/ast/enum/privateEnum.kt
@@ -1,2 +1 @@
-private enum class Test {
-}
\ No newline at end of file
+private enum class Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/protectedEnum.ide.kt b/j2k/tests/testData/ast/enum/protectedEnum.ide.kt
index 586bab108fd..0cfa23e3ab5 100644
--- a/j2k/tests/testData/ast/enum/protectedEnum.ide.kt
+++ b/j2k/tests/testData/ast/enum/protectedEnum.ide.kt
@@ -1,2 +1 @@
-protected enum class Test {
-}
\ No newline at end of file
+protected enum class Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/protectedEnum.kt b/j2k/tests/testData/ast/enum/protectedEnum.kt
index 586bab108fd..0cfa23e3ab5 100644
--- a/j2k/tests/testData/ast/enum/protectedEnum.kt
+++ b/j2k/tests/testData/ast/enum/protectedEnum.kt
@@ -1,2 +1 @@
-protected enum class Test {
-}
\ No newline at end of file
+protected enum class Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/publicEnum.ide.kt b/j2k/tests/testData/ast/enum/publicEnum.ide.kt
index 4ef7f4c4c6b..0059e39d75d 100644
--- a/j2k/tests/testData/ast/enum/publicEnum.ide.kt
+++ b/j2k/tests/testData/ast/enum/publicEnum.ide.kt
@@ -1,2 +1 @@
-public enum class Test {
-}
\ No newline at end of file
+public enum class Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/enum/publicEnum.kt b/j2k/tests/testData/ast/enum/publicEnum.kt
index 4ef7f4c4c6b..0059e39d75d 100644
--- a/j2k/tests/testData/ast/enum/publicEnum.kt
+++ b/j2k/tests/testData/ast/enum/publicEnum.kt
@@ -1,2 +1 @@
-public enum class Test {
-}
\ No newline at end of file
+public enum class Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt b/j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt
index aaa605d46f6..fab9b579c8d 100644
--- a/j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt
+++ b/j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt
@@ -1,7 +1,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 e2e024205a8..1535058e9bf 100644
--- a/j2k/tests/testData/ast/for/forWithEmptyBlock.kt
+++ b/j2k/tests/testData/ast/for/forWithEmptyBlock.kt
@@ -1,7 +1,7 @@
 {
     var i: Int = 0
     while (i < 0) {
-        { }
+        {}
         {
             j++
             i++
diff --git a/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt b/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt
index eac4f2d944c..0f5061f72e7 100644
--- a/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt
+++ b/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt
@@ -1,8 +1,6 @@
-class `$$$$$`() {
-}
+class `$$$$$`() {}
 
-class `$`() {
-}
+class `$`() {}
 
 class `$$`(`$$$$`: `$$$$$`) : `$`() {
     val `$$$`: `$$$$$`
diff --git a/j2k/tests/testData/ast/identifier/finalFieldReference.kt b/j2k/tests/testData/ast/identifier/finalFieldReference.kt
index 981547da7c2..6919d913d51 100644
--- a/j2k/tests/testData/ast/identifier/finalFieldReference.kt
+++ b/j2k/tests/testData/ast/identifier/finalFieldReference.kt
@@ -1,8 +1,6 @@
-open class `$$$$$`() {
-}
+open class `$$$$$`() {}
 
-open class `$`() {
-}
+open class `$`() {}
 
 open class `$$`(`$$$$`: `$$$$$`?) : `$`() {
     val `$$$`: `$$$$$`?
diff --git a/j2k/tests/testData/ast/importStatement/importWithKeywords.ide.kt b/j2k/tests/testData/ast/importStatement/importWithKeywords.ide.kt
index 98b8ed3ed83..c69b1188e32 100644
--- a/j2k/tests/testData/ast/importStatement/importWithKeywords.ide.kt
+++ b/j2k/tests/testData/ast/importStatement/importWithKeywords.ide.kt
@@ -2,5 +2,4 @@ package test
 
 import `as`.`type`.`val`.`var`.`fun`.`is`.`in`.`object`.`when`.`trait`.`This`
 
-class Test() {
-}
\ No newline at end of file
+class Test() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/importStatement/importWithKeywords.kt b/j2k/tests/testData/ast/importStatement/importWithKeywords.kt
index f47afc622d6..0562bc1f70c 100644
--- a/j2k/tests/testData/ast/importStatement/importWithKeywords.kt
+++ b/j2k/tests/testData/ast/importStatement/importWithKeywords.kt
@@ -2,5 +2,4 @@ package test
 
 import `as`.`type`.`val`.`var`.`fun`.`is`.`in`.`object`.`when`.`trait`.`This`
 
-open class Test() {
-}
\ No newline at end of file
+open class Test() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/importStatement/importWithStar.ide.kt b/j2k/tests/testData/ast/importStatement/importWithStar.ide.kt
index 610d38e7eee..53ed53b22ef 100644
--- a/j2k/tests/testData/ast/importStatement/importWithStar.ide.kt
+++ b/j2k/tests/testData/ast/importStatement/importWithStar.ide.kt
@@ -2,5 +2,4 @@ package org.jetbrains.jet.j2k
 
 import org.jetbrains.annotations.*
 
-public class Converter() {
-}
\ No newline at end of file
+public class Converter() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/importStatement/importWithStar.kt b/j2k/tests/testData/ast/importStatement/importWithStar.kt
index 92bc61b3392..8032c26418c 100644
--- a/j2k/tests/testData/ast/importStatement/importWithStar.kt
+++ b/j2k/tests/testData/ast/importStatement/importWithStar.kt
@@ -2,5 +2,4 @@ package org.jetbrains.jet.j2k
 
 import org.jetbrains.annotations.*
 
-public open class Converter() {
-}
\ No newline at end of file
+public open class Converter() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/importStatement/simpleImport.ide.kt b/j2k/tests/testData/ast/importStatement/simpleImport.ide.kt
index c444c00d280..dee31ac86e3 100644
--- a/j2k/tests/testData/ast/importStatement/simpleImport.ide.kt
+++ b/j2k/tests/testData/ast/importStatement/simpleImport.ide.kt
@@ -1,4 +1,3 @@
 package org.jetbrains.jet.j2k
 
-public class Converter() {
-}
\ No newline at end of file
+public class Converter() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/importStatement/simpleImport.kt b/j2k/tests/testData/ast/importStatement/simpleImport.kt
index 78622841398..9319e848f16 100644
--- a/j2k/tests/testData/ast/importStatement/simpleImport.kt
+++ b/j2k/tests/testData/ast/importStatement/simpleImport.kt
@@ -1,4 +1,3 @@
 package org.jetbrains.jet.j2k
 
-public open class Converter() {
-}
\ No newline at end of file
+public open class Converter() {}
\ 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 c816a4b07f1..c9b0de82178 100644
--- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt
@@ -1,5 +1,4 @@
-class Base<T>(name: T) {
-}
+class Base<T>(name: T) {}
 
 class One<T, K>(name: T, second: K) : Base<T>(name) {
     private var mySecond: K = 0
diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt
index 3b3bffeb37d..04c8337df2b 100644
--- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt
@@ -1,5 +1,4 @@
-open class Base<T>(name: T?) {
-}
+open class Base<T>(name: T?) {}
 
 open class One<T, K>(name: T?, second: K?) : Base<T?>(name) {
     private var mySecond: K? = null
diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt
index 0ec4afc7103..c282d40f6f5 100644
--- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt
@@ -1,5 +1,3 @@
-class Base(name: String) {
-}
+class Base(name: String) {}
 
-class One(name: String, second: String) : Base(name) {
-}
\ No newline at end of file
+class One(name: String, second: String) : Base(name) {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.kt
index 7265fbc4c48..758d1e52700 100644
--- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.kt
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.kt
@@ -1,5 +1,3 @@
-open class Base(name: String?) {
-}
+open class Base(name: String?) {}
 
-open class One(name: String?, second: String?) : Base(name) {
-}
\ No newline at end of file
+open class One(name: String?, second: String?) : Base(name) {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.ide.kt
index d1f5b5a64da..18f8b49e5a3 100644
--- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.ide.kt
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.ide.kt
@@ -1,5 +1,3 @@
-class Base() {
-}
+class Base() {}
 
-class One() : Base() {
-}
\ No newline at end of file
+class One() : Base() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt
index 7265e0be4da..9a9cdbd6aeb 100644
--- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt
@@ -1,5 +1,3 @@
-open class Base() {
-}
+open class Base() {}
 
-open class One() : Base() {
-}
\ No newline at end of file
+open class One() : Base() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt
index e619b963c41..d04f443b2e5 100644
--- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt
@@ -1,5 +1,4 @@
-class Base(name: String) {
-}
+class Base(name: String) {}
 
 class One(name: String, second: String) : Base(name) {
     private var mySecond: String = 0
diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt
index 2c6d388b3c6..8d89712b956 100644
--- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt
@@ -1,5 +1,4 @@
-open class Base(name: String?) {
-}
+open class Base(name: String?) {}
 
 open class One(name: String?, second: String?) : Base(name) {
     private var mySecond: String? = null
diff --git a/j2k/tests/testData/ast/issues/kt-1048.ide.kt b/j2k/tests/testData/ast/issues/kt-1048.ide.kt
index ad199e56856..d7ae21c13de 100644
--- a/j2k/tests/testData/ast/issues/kt-1048.ide.kt
+++ b/j2k/tests/testData/ast/issues/kt-1048.ide.kt
@@ -1,7 +1,6 @@
 import java.util.HashMap
 
-class G<T : String>(t: T) {
-}
+class G<T : String>(t: T) {}
 
 public class Java() {
     fun test() {
diff --git a/j2k/tests/testData/ast/issues/kt-1048.kt b/j2k/tests/testData/ast/issues/kt-1048.kt
index ed2caa4722d..77efd5317a1 100644
--- a/j2k/tests/testData/ast/issues/kt-1048.kt
+++ b/j2k/tests/testData/ast/issues/kt-1048.kt
@@ -1,7 +1,6 @@
 import java.util.HashMap
 
-open class G<T : String?>(t: T?) {
-}
+open class G<T : String?>(t: T?) {}
 
 public open class Java() {
     open fun test() {
diff --git a/j2k/tests/testData/ast/issues/kt-809-string.ide.kt b/j2k/tests/testData/ast/issues/kt-809-string.ide.kt
index adb62983557..30789cd9625 100644
--- a/j2k/tests/testData/ast/issues/kt-809-string.ide.kt
+++ b/j2k/tests/testData/ast/issues/kt-809-string.ide.kt
@@ -10,8 +10,7 @@ class One() {
     }
 }
 
-class StringContainer(s: String) {
-}
+class StringContainer(s: String) {}
 
 class Test() {
     fun putString(s: String) {
diff --git a/j2k/tests/testData/ast/issues/kt-809-string.kt b/j2k/tests/testData/ast/issues/kt-809-string.kt
index 8940c23fb19..7337d66de95 100644
--- a/j2k/tests/testData/ast/issues/kt-809-string.kt
+++ b/j2k/tests/testData/ast/issues/kt-809-string.kt
@@ -10,8 +10,7 @@ open class One() {
     }
 }
 
-open class StringContainer(s: String?) {
-}
+open class StringContainer(s: String?) {}
 
 open class Test() {
     open fun putString(s: String?) {
diff --git a/j2k/tests/testData/ast/issues/kt-809.ide.kt b/j2k/tests/testData/ast/issues/kt-809.ide.kt
index 663b3f3e6f2..acdc96a31ae 100644
--- a/j2k/tests/testData/ast/issues/kt-809.ide.kt
+++ b/j2k/tests/testData/ast/issues/kt-809.ide.kt
@@ -10,8 +10,7 @@ class One() {
     }
 }
 
-class IntContainer(i: Int) {
-}
+class IntContainer(i: Int) {}
 
 class Test() {
     fun putInt(i: Int) {
diff --git a/j2k/tests/testData/ast/issues/kt-809.kt b/j2k/tests/testData/ast/issues/kt-809.kt
index a973e8a2ae8..bd7e1f9e347 100644
--- a/j2k/tests/testData/ast/issues/kt-809.kt
+++ b/j2k/tests/testData/ast/issues/kt-809.kt
@@ -10,8 +10,7 @@ open class One() {
     }
 }
 
-open class IntContainer(i: Int) {
-}
+open class IntContainer(i: Int) {}
 
 open class Test() {
     open fun putInt(i: Int) {
diff --git a/j2k/tests/testData/ast/misc/packageWithClass.ide.kt b/j2k/tests/testData/ast/misc/packageWithClass.ide.kt
index 3eba9865a4d..11944a90f72 100644
--- a/j2k/tests/testData/ast/misc/packageWithClass.ide.kt
+++ b/j2k/tests/testData/ast/misc/packageWithClass.ide.kt
@@ -1,4 +1,3 @@
 package test
 
-class C() {
-}
\ No newline at end of file
+class C() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/misc/packageWithClass.kt b/j2k/tests/testData/ast/misc/packageWithClass.kt
index 3eba9865a4d..11944a90f72 100644
--- a/j2k/tests/testData/ast/misc/packageWithClass.kt
+++ b/j2k/tests/testData/ast/misc/packageWithClass.kt
@@ -1,4 +1,3 @@
 package test
 
-class C() {
-}
\ No newline at end of file
+class C() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/misc/packageWithClasses.ide.kt b/j2k/tests/testData/ast/misc/packageWithClasses.ide.kt
index 4ed94efde09..1542670b839 100644
--- a/j2k/tests/testData/ast/misc/packageWithClasses.ide.kt
+++ b/j2k/tests/testData/ast/misc/packageWithClasses.ide.kt
@@ -1,4 +1,2 @@
-class A() {
-}
-class B() {
-}
\ No newline at end of file
+class A() {}
+class B() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/misc/packageWithClasses.kt b/j2k/tests/testData/ast/misc/packageWithClasses.kt
index 4ed94efde09..1542670b839 100644
--- a/j2k/tests/testData/ast/misc/packageWithClasses.kt
+++ b/j2k/tests/testData/ast/misc/packageWithClasses.kt
@@ -1,4 +1,2 @@
-class A() {
-}
-class B() {
-}
\ No newline at end of file
+class A() {}
+class B() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/misc/packageWithOpenClass.ide.kt b/j2k/tests/testData/ast/misc/packageWithOpenClass.ide.kt
index 3eba9865a4d..11944a90f72 100644
--- a/j2k/tests/testData/ast/misc/packageWithOpenClass.ide.kt
+++ b/j2k/tests/testData/ast/misc/packageWithOpenClass.ide.kt
@@ -1,4 +1,3 @@
 package test
 
-class C() {
-}
\ No newline at end of file
+class C() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/misc/packageWithOpenClass.kt b/j2k/tests/testData/ast/misc/packageWithOpenClass.kt
index 9885503c2d2..0101363d020 100644
--- a/j2k/tests/testData/ast/misc/packageWithOpenClass.kt
+++ b/j2k/tests/testData/ast/misc/packageWithOpenClass.kt
@@ -1,4 +1,3 @@
 package test
 
-open class C() {
-}
\ No newline at end of file
+open class C() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt
index 1b616709337..8e4ac2d6326 100644
--- a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt
+++ b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt
@@ -1,7 +1,6 @@
 package org.test
 
-class Library() {
-}
+class Library() {}
 
 class User() {
     fun main() {
diff --git a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt
index 612268c52af..aca3a160eea 100644
--- a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt
+++ b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt
@@ -1,7 +1,6 @@
 package org.test
 
-open class Library() {
-}
+open class Library() {}
 
 open class User() {
     open fun main() {
diff --git a/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt b/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt
index 1c97a6b0252..4ffa3d3b994 100644
--- a/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt
+++ b/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt
@@ -1,8 +1,7 @@
 package org.test
 
 class OuterClass() {
-    class InnerClass() {
-    }
+    class InnerClass() {}
 }
 
 class User() {
diff --git a/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt b/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt
index 90d61e81bde..1193b063ddf 100644
--- a/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt
+++ b/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt
@@ -1,8 +1,7 @@
 package org.test
 
 open class OuterClass() {
-    open class InnerClass() {
-    }
+    open class InnerClass() {}
 }
 
 open class User() {
diff --git a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt
index 74be47a1ab9..0cb675176fd 100644
--- a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt
+++ b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt
@@ -2,8 +2,7 @@ package org.test
 
 import java.util.LinkedList
 
-class Member() {
-}
+class Member() {}
 
 class User() {
     fun main() {
diff --git a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt
index cdecd897627..942681c8974 100644
--- a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt
+++ b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt
@@ -2,8 +2,7 @@ package org.test
 
 import java.util.LinkedList
 
-open class Member() {
-}
+open class Member() {}
 
 open class User() {
     open fun main() {
diff --git a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt
index d36322ed9f5..9b4634494f8 100644
--- a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt
+++ b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt
@@ -2,8 +2,7 @@ package demo
 
 class Foo() {
     class object {
-        class Bar() {
-        }
+        class Bar() {}
     }
 }
 
diff --git a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt
index 3e1ecc0d656..b1e4bbfbd7c 100644
--- a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt
+++ b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt
@@ -2,8 +2,7 @@ package demo
 
 open class Foo() {
     class object {
-        open class Bar() {
-        }
+        open class Bar() {}
     }
 }
 
diff --git a/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.ide.kt b/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.ide.kt
index a8d47460aa1..10f448e1b22 100644
--- a/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.ide.kt
+++ b/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.ide.kt
@@ -2,5 +2,4 @@ package org.jetbrains.jet.j2k.`in`
 
 import org.jetbrains.annotations.Nullable
 
-public class Converter() {
-}
\ No newline at end of file
+public class Converter() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt b/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt
index 08264274970..acc944d728b 100644
--- a/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt
+++ b/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt
@@ -2,5 +2,4 @@ package org.jetbrains.jet.j2k.`in`
 
 import org.jetbrains.annotations.Nullable
 
-public open class Converter() {
-}
\ No newline at end of file
+public open class Converter() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/abstactInterface.ide.kt b/j2k/tests/testData/ast/trait/abstactInterface.ide.kt
index 97c0b5c0bed..8a7f1df514c 100644
--- a/j2k/tests/testData/ast/trait/abstactInterface.ide.kt
+++ b/j2k/tests/testData/ast/trait/abstactInterface.ide.kt
@@ -1,2 +1 @@
-abstract trait I {
-}
\ No newline at end of file
+abstract trait I {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/abstactInterface.kt b/j2k/tests/testData/ast/trait/abstactInterface.kt
index 97c0b5c0bed..8a7f1df514c 100644
--- a/j2k/tests/testData/ast/trait/abstactInterface.kt
+++ b/j2k/tests/testData/ast/trait/abstactInterface.kt
@@ -1,2 +1 @@
-abstract trait I {
-}
\ No newline at end of file
+abstract trait I {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/emptyInterface.ide.kt b/j2k/tests/testData/ast/trait/emptyInterface.ide.kt
index 670cabdb241..aef0f68ed7c 100644
--- a/j2k/tests/testData/ast/trait/emptyInterface.ide.kt
+++ b/j2k/tests/testData/ast/trait/emptyInterface.ide.kt
@@ -1,2 +1 @@
-trait A {
-}
\ No newline at end of file
+trait A {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/emptyInterface.kt b/j2k/tests/testData/ast/trait/emptyInterface.kt
index 670cabdb241..aef0f68ed7c 100644
--- a/j2k/tests/testData/ast/trait/emptyInterface.kt
+++ b/j2k/tests/testData/ast/trait/emptyInterface.kt
@@ -1,2 +1 @@
-trait A {
-}
\ No newline at end of file
+trait A {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.ide.kt b/j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.ide.kt
index 3bbc299803d..625e613041a 100644
--- a/j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.ide.kt
+++ b/j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.ide.kt
@@ -1,2 +1 @@
-trait A : I0, I1, I2 {
-}
\ No newline at end of file
+trait A : I0, I1, I2 {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.kt b/j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.kt
index 3bbc299803d..625e613041a 100644
--- a/j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.kt
+++ b/j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.kt
@@ -1,2 +1 @@
-trait A : I0, I1, I2 {
-}
\ No newline at end of file
+trait A : I0, I1, I2 {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/extendsOneInterface.ide.kt b/j2k/tests/testData/ast/trait/extendsOneInterface.ide.kt
index a5d59a56576..8787a54a9c2 100644
--- a/j2k/tests/testData/ast/trait/extendsOneInterface.ide.kt
+++ b/j2k/tests/testData/ast/trait/extendsOneInterface.ide.kt
@@ -1,2 +1 @@
-trait A : I {
-}
\ No newline at end of file
+trait A : I {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/extendsOneInterface.kt b/j2k/tests/testData/ast/trait/extendsOneInterface.kt
index a5d59a56576..8787a54a9c2 100644
--- a/j2k/tests/testData/ast/trait/extendsOneInterface.kt
+++ b/j2k/tests/testData/ast/trait/extendsOneInterface.kt
@@ -1,2 +1 @@
-trait A : I {
-}
\ No newline at end of file
+trait A : I {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/internalInterface.ide.kt b/j2k/tests/testData/ast/trait/internalInterface.ide.kt
index 802809a5724..ef207ebb1a3 100644
--- a/j2k/tests/testData/ast/trait/internalInterface.ide.kt
+++ b/j2k/tests/testData/ast/trait/internalInterface.ide.kt
@@ -1,2 +1 @@
-trait Test {
-}
\ No newline at end of file
+trait Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/internalInterface.kt b/j2k/tests/testData/ast/trait/internalInterface.kt
index 802809a5724..ef207ebb1a3 100644
--- a/j2k/tests/testData/ast/trait/internalInterface.kt
+++ b/j2k/tests/testData/ast/trait/internalInterface.kt
@@ -1,2 +1 @@
-trait Test {
-}
\ No newline at end of file
+trait Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/privateInterface.ide.kt b/j2k/tests/testData/ast/trait/privateInterface.ide.kt
index 72942402d0b..7990648ae71 100644
--- a/j2k/tests/testData/ast/trait/privateInterface.ide.kt
+++ b/j2k/tests/testData/ast/trait/privateInterface.ide.kt
@@ -1,2 +1 @@
-private trait Test {
-}
\ No newline at end of file
+private trait Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/privateInterface.kt b/j2k/tests/testData/ast/trait/privateInterface.kt
index 72942402d0b..7990648ae71 100644
--- a/j2k/tests/testData/ast/trait/privateInterface.kt
+++ b/j2k/tests/testData/ast/trait/privateInterface.kt
@@ -1,2 +1 @@
-private trait Test {
-}
\ No newline at end of file
+private trait Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/protectedInterface.ide.kt b/j2k/tests/testData/ast/trait/protectedInterface.ide.kt
index 359d3b99929..b466c384c1d 100644
--- a/j2k/tests/testData/ast/trait/protectedInterface.ide.kt
+++ b/j2k/tests/testData/ast/trait/protectedInterface.ide.kt
@@ -1,2 +1 @@
-protected trait Test {
-}
\ No newline at end of file
+protected trait Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/protectedInterface.kt b/j2k/tests/testData/ast/trait/protectedInterface.kt
index 359d3b99929..b466c384c1d 100644
--- a/j2k/tests/testData/ast/trait/protectedInterface.kt
+++ b/j2k/tests/testData/ast/trait/protectedInterface.kt
@@ -1,2 +1 @@
-protected trait Test {
-}
\ No newline at end of file
+protected trait Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/publicInterface.ide.kt b/j2k/tests/testData/ast/trait/publicInterface.ide.kt
index 14565fbd6b3..3c9ae6450a3 100644
--- a/j2k/tests/testData/ast/trait/publicInterface.ide.kt
+++ b/j2k/tests/testData/ast/trait/publicInterface.ide.kt
@@ -1,2 +1 @@
-public trait Test {
-}
\ No newline at end of file
+public trait Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/trait/publicInterface.kt b/j2k/tests/testData/ast/trait/publicInterface.kt
index 14565fbd6b3..3c9ae6450a3 100644
--- a/j2k/tests/testData/ast/trait/publicInterface.kt
+++ b/j2k/tests/testData/ast/trait/publicInterface.kt
@@ -1,2 +1 @@
-public trait Test {
-}
\ No newline at end of file
+public trait Test {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.ide.kt b/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.ide.kt
index 80eb93690f7..ceafb598ec8 100644
--- a/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.ide.kt
+++ b/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.ide.kt
@@ -1,2 +1 @@
-class CC<T : INode, K : Node>() : A() where T : Comparable<in T>, K : Collection<in K> {
-}
\ No newline at end of file
+class CC<T : INode, K : Node>() : A() where T : Comparable<in T>, K : Collection<in K> {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt b/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt
index f40a6cda574..74b5967e824 100644
--- a/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt
+++ b/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt
@@ -1,2 +1 @@
-class CC<T : INode?, K : Node?>() : A() where T : Comparable<in T?>?, K : Collection<in K?>? {
-}
\ No newline at end of file
+class CC<T : INode?, K : Node?>() : A() where T : Comparable<in T?>?, K : Collection<in K?>? {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.ide.kt b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.ide.kt
index 0417ab3d582..f610f325f60 100644
--- a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.ide.kt
+++ b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.ide.kt
@@ -1,2 +1 @@
-class C<T : INode>() where T : Comparable<in T> {
-}
\ No newline at end of file
+class C<T : INode>() where T : Comparable<in T> {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.kt b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.kt
index e6fa0f4ce21..5feac799804 100644
--- a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.kt
+++ b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.kt
@@ -1,2 +1 @@
-class C<T : INode?>() where T : Comparable<in T?>? {
-}
\ No newline at end of file
+class C<T : INode?>() where T : Comparable<in T?>? {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.ide.kt b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.ide.kt
index 59bc7d58339..63960b9a264 100644
--- a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.ide.kt
+++ b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.ide.kt
@@ -1,2 +1 @@
-class C<T : INode>() : A() where T : Comparable<in T> {
-}
\ No newline at end of file
+class C<T : INode>() : A() where T : Comparable<in T> {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt
index e05e75db415..d070a257782 100644
--- a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt
+++ b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt
@@ -1,2 +1 @@
-class C<T : INode?>() : A() where T : Comparable<in T?>? {
-}
\ No newline at end of file
+class C<T : INode?>() : A() where T : Comparable<in T?>? {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.ide.kt b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.ide.kt
index c1b49e64cfa..793144a6ce1 100644
--- a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.ide.kt
+++ b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.ide.kt
@@ -1,2 +1 @@
-trait CommandHandler<T : Command> {
-}
\ No newline at end of file
+trait CommandHandler<T : Command> {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.kt b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.kt
index 077c6618b24..dbb560bee58 100644
--- a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.kt
+++ b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.kt
@@ -1,2 +1 @@
-trait CommandHandler<T : Command?> {
-}
\ No newline at end of file
+trait CommandHandler<T : Command?> {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.ide.kt b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.ide.kt
index dfb1ccaa1cf..45b32095d0d 100644
--- a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.ide.kt
+++ b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.ide.kt
@@ -1,2 +1 @@
-trait CommandHandler<T : INode, String> {
-}
\ No newline at end of file
+trait CommandHandler<T : INode, String> {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.kt b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.kt
index 4c3fd7537b6..2a2e1fa81d2 100644
--- a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.kt
+++ b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.kt
@@ -1,2 +1 @@
-trait CommandHandler<T : INode?, String> {
-}
\ No newline at end of file
+trait CommandHandler<T : INode?, String> {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/genericClass.ide.kt b/j2k/tests/testData/ast/typeParameters/genericClass.ide.kt
index dd8d1147200..184ac2d58d3 100644
--- a/j2k/tests/testData/ast/typeParameters/genericClass.ide.kt
+++ b/j2k/tests/testData/ast/typeParameters/genericClass.ide.kt
@@ -1,2 +1 @@
-class Comparable<T>() {
-}
\ No newline at end of file
+class Comparable<T>() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/genericClass.kt b/j2k/tests/testData/ast/typeParameters/genericClass.kt
index dd8d1147200..184ac2d58d3 100644
--- a/j2k/tests/testData/ast/typeParameters/genericClass.kt
+++ b/j2k/tests/testData/ast/typeParameters/genericClass.kt
@@ -1,2 +1 @@
-class Comparable<T>() {
-}
\ No newline at end of file
+class Comparable<T>() {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.ide.kt b/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.ide.kt
index 6b62010cb69..dc0a7c09ee6 100644
--- a/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.ide.kt
+++ b/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.ide.kt
@@ -1,2 +1 @@
-trait I<T : INode, K : Node> : II where T : Comparable<in T>, K : Collection<in K> {
-}
\ No newline at end of file
+trait I<T : INode, K : Node> : II where T : Comparable<in T>, K : Collection<in K> {}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt b/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt
index f73bbabea8b..60497edf604 100644
--- a/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt
+++ b/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt
@@ -1,2 +1 @@
-trait I<T : INode?, K : Node?> : II where T : Comparable<in T?>?, K : Collection<in K?>? {
-}
\ No newline at end of file
+trait I<T : INode?, K : Node?> : II where T : Comparable<in T?>?, K : Collection<in K?>? {}
\ No newline at end of file