From 86d718de29db5d09e295c23720455ddce0e861f0 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Mon, 2 Jun 2014 22:24:30 +0400
Subject: [PATCH] Java to Kotlin convertor: no empty class body

---
 j2k/src/org/jetbrains/jet/j2k/ast/Class.kt                  | 6 ++----
 j2k/tests/testData/ast/class/class.ide.kt                   | 2 +-
 j2k/tests/testData/ast/class/class.kt                       | 2 +-
 j2k/tests/testData/ast/class/emptyClass.ide.kt              | 2 +-
 j2k/tests/testData/ast/class/emptyClass.kt                  | 2 +-
 .../class/extendsOneClassAndImplementsOneInterface.ide.kt   | 2 +-
 .../ast/class/extendsOneClassAndImplementsOneInterface.kt   | 2 +-
 .../extendsOneClassAndImplementsSeveralInterfaces.ide.kt    | 2 +-
 .../class/extendsOneClassAndImplementsSeveralInterfaces.kt  | 2 +-
 j2k/tests/testData/ast/class/finalClass.ide.kt              | 2 +-
 j2k/tests/testData/ast/class/finalClass.kt                  | 2 +-
 j2k/tests/testData/ast/class/genericClass.ide.kt            | 2 +-
 j2k/tests/testData/ast/class/genericClass.kt                | 2 +-
 j2k/tests/testData/ast/class/innerEmptyClass.ide.kt         | 2 +-
 j2k/tests/testData/ast/class/innerEmptyClass.kt             | 2 +-
 j2k/tests/testData/ast/class/innerStaticClass.ide.kt        | 2 +-
 j2k/tests/testData/ast/class/innerStaticClass.kt            | 2 +-
 j2k/tests/testData/ast/class/internalClass.ide.kt           | 2 +-
 j2k/tests/testData/ast/class/internalClass.kt               | 2 +-
 j2k/tests/testData/ast/class/pivateClass.ide.kt             | 2 +-
 j2k/tests/testData/ast/class/pivateClass.kt                 | 2 +-
 j2k/tests/testData/ast/class/protectedClass.ide.kt          | 2 +-
 j2k/tests/testData/ast/class/protectedClass.kt              | 2 +-
 j2k/tests/testData/ast/class/publicClass.ide.kt             | 2 +-
 j2k/tests/testData/ast/class/publicClass.kt                 | 2 +-
 j2k/tests/testData/ast/class/simpleInheritance.ide.kt       | 2 +-
 j2k/tests/testData/ast/class/simpleInheritance.kt           | 2 +-
 .../ast/constructors/fieldsInitializedFromParams1.ide.kt    | 2 +-
 .../ast/constructors/fieldsInitializedFromParams1.kt        | 2 +-
 .../ast/constructors/fieldsInitializedFromParams2.ide.kt    | 2 +-
 .../ast/constructors/fieldsInitializedFromParams2.kt        | 2 +-
 .../ast/constructors/fieldsInitializedFromParams3.ide.kt    | 2 +-
 .../ast/constructors/fieldsInitializedFromParams3.kt        | 2 +-
 .../ast/constructors/fieldsInitializedFromParams4.ide.kt    | 2 +-
 .../ast/constructors/fieldsInitializedFromParams4.kt        | 2 +-
 .../ast/constructors/fieldsInitializedFromParams5.ide.kt    | 2 +-
 .../ast/constructors/fieldsInitializedFromParams5.kt        | 2 +-
 .../ast/constructors/fieldsInitializedFromParams6.ide.kt    | 2 +-
 .../ast/constructors/fieldsInitializedFromParams6.kt        | 2 +-
 .../ast/constructors/fieldsInitializedFromParams7.ide.kt    | 2 +-
 .../ast/constructors/fieldsInitializedFromParams7.kt        | 2 +-
 j2k/tests/testData/ast/field/privateField.ide.kt            | 2 +-
 j2k/tests/testData/ast/field/privateField.kt                | 2 +-
 .../testData/ast/identifier/finalFieldReference.ide.kt      | 4 ++--
 j2k/tests/testData/ast/identifier/finalFieldReference.kt    | 4 ++--
 .../testData/ast/importStatement/importWithKeywords.ide.kt  | 2 +-
 .../testData/ast/importStatement/importWithKeywords.kt      | 2 +-
 .../testData/ast/importStatement/importWithStar.ide.kt      | 2 +-
 j2k/tests/testData/ast/importStatement/importWithStar.kt    | 2 +-
 j2k/tests/testData/ast/importStatement/simpleImport.ide.kt  | 2 +-
 j2k/tests/testData/ast/importStatement/simpleImport.kt      | 2 +-
 .../ast/inheritance/classOneExtendsBaseGeneric.ide.kt       | 4 ++--
 .../testData/ast/inheritance/classOneExtendsBaseGeneric.kt  | 4 ++--
 .../ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt  | 4 ++--
 .../ast/inheritance/classOneExtendsBaseWithOneParam.kt      | 4 ++--
 .../inheritance/classOneExtendsBaseWithZeroParams.ide.kt    | 4 ++--
 .../ast/inheritance/classOneExtendsBaseWithZeroParams.kt    | 4 ++--
 ...ssOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt | 4 ++--
 .../classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt | 4 ++--
 j2k/tests/testData/ast/issues/comments.ide.kt               | 2 +-
 j2k/tests/testData/ast/issues/comments.kt                   | 2 +-
 j2k/tests/testData/ast/issues/kt-1016.ide.kt                | 2 +-
 j2k/tests/testData/ast/issues/kt-1016.kt                    | 2 +-
 j2k/tests/testData/ast/issues/kt-1048.ide.kt                | 2 +-
 j2k/tests/testData/ast/issues/kt-1048.kt                    | 2 +-
 j2k/tests/testData/ast/issues/kt-809-string.ide.kt          | 2 +-
 j2k/tests/testData/ast/issues/kt-809-string.kt              | 2 +-
 j2k/tests/testData/ast/issues/kt-809.ide.kt                 | 2 +-
 j2k/tests/testData/ast/issues/kt-809.kt                     | 2 +-
 j2k/tests/testData/ast/issues/kt-836.ide.kt                 | 2 +-
 j2k/tests/testData/ast/issues/kt-836.kt                     | 2 +-
 j2k/tests/testData/ast/issues/qualifyStatic.ide.kt          | 2 +-
 j2k/tests/testData/ast/issues/qualifyStatic.kt              | 2 +-
 j2k/tests/testData/ast/misc/packageWithClass.ide.kt         | 2 +-
 j2k/tests/testData/ast/misc/packageWithClass.kt             | 2 +-
 j2k/tests/testData/ast/misc/packageWithClasses.ide.kt       | 4 ++--
 j2k/tests/testData/ast/misc/packageWithClasses.kt           | 4 ++--
 j2k/tests/testData/ast/misc/packageWithOpenClass.ide.kt     | 2 +-
 j2k/tests/testData/ast/misc/packageWithOpenClass.kt         | 2 +-
 .../ast/newClassExpression/newClassByFullName.ide.kt        | 2 +-
 .../testData/ast/newClassExpression/newClassByFullName.kt   | 2 +-
 .../testData/ast/newClassExpression/newInnerClass.ide.kt    | 2 +-
 j2k/tests/testData/ast/newClassExpression/newInnerClass.kt  | 2 +-
 .../ast/newClassExpression/newListAndNewMember.ide.kt       | 2 +-
 .../testData/ast/newClassExpression/newListAndNewMember.kt  | 2 +-
 .../ast/newClassExpression/newStaticInnerClass.ide.kt       | 2 +-
 .../testData/ast/newClassExpression/newStaticInnerClass.kt  | 2 +-
 .../ast/packageStatement/orgJetbrainsJetJ2kIn.ide.kt        | 2 +-
 .../testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt   | 2 +-
 j2k/tests/testData/ast/trait/abstactInterface.ide.kt        | 2 +-
 j2k/tests/testData/ast/trait/abstactInterface.kt            | 2 +-
 j2k/tests/testData/ast/trait/emptyInterface.ide.kt          | 2 +-
 j2k/tests/testData/ast/trait/emptyInterface.kt              | 2 +-
 .../extendsOneClassAndImplementsSeveralInterfaces.ide.kt    | 2 +-
 .../trait/extendsOneClassAndImplementsSeveralInterfaces.kt  | 2 +-
 j2k/tests/testData/ast/trait/extendsOneInterface.ide.kt     | 2 +-
 j2k/tests/testData/ast/trait/extendsOneInterface.kt         | 2 +-
 j2k/tests/testData/ast/trait/internalInterface.ide.kt       | 2 +-
 j2k/tests/testData/ast/trait/internalInterface.kt           | 2 +-
 j2k/tests/testData/ast/trait/privateInterface.ide.kt        | 2 +-
 j2k/tests/testData/ast/trait/privateInterface.kt            | 2 +-
 j2k/tests/testData/ast/trait/protectedInterface.ide.kt      | 2 +-
 j2k/tests/testData/ast/trait/protectedInterface.kt          | 2 +-
 j2k/tests/testData/ast/trait/publicInterface.ide.kt         | 2 +-
 j2k/tests/testData/ast/trait/publicInterface.kt             | 2 +-
 ...ssDoubleParametrizationWithTwoBoundsWithExtending.ide.kt | 2 +-
 .../classDoubleParametrizationWithTwoBoundsWithExtending.kt | 2 +-
 .../typeParameters/classParametrizationWithTwoBounds.ide.kt | 2 +-
 .../ast/typeParameters/classParametrizationWithTwoBounds.kt | 2 +-
 .../classParametrizationWithTwoBoundsWithExtending.ide.kt   | 2 +-
 .../classParametrizationWithTwoBoundsWithExtending.kt       | 2 +-
 .../typeParameters/complexExampleWithClassExtending.ide.kt  | 2 +-
 .../ast/typeParameters/complexExampleWithClassExtending.kt  | 2 +-
 .../complexExampleWithClassMultiplyExtending.ide.kt         | 2 +-
 .../complexExampleWithClassMultiplyExtending.kt             | 2 +-
 j2k/tests/testData/ast/typeParameters/genericClass.ide.kt   | 2 +-
 j2k/tests/testData/ast/typeParameters/genericClass.kt       | 2 +-
 ...itDoubleParametrizationWithTwoBoundsWithExtending.ide.kt | 2 +-
 .../traitDoubleParametrizationWithTwoBoundsWithExtending.kt | 2 +-
 119 files changed, 132 insertions(+), 134 deletions(-)

diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Class.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Class.kt
index c674d40f78f..18ac2388535 100644
--- a/j2k/src/org/jetbrains/jet/j2k/ast/Class.kt
+++ b/j2k/src/org/jetbrains/jet/j2k/ast/Class.kt
@@ -104,10 +104,8 @@ open class Class(
             = !isDefinitelyFinal() && converter.settings.openByDefault
 
     fun bodyToKotlin(): String {
-        return " {" + classMembers.nonStaticMembers.toKotlin() + primaryConstructorBodyToKotlin() + classObjectToKotlin() + "}"
-        //TODO:
-        //val insideBody = classMembers.nonStaticMembers.toKotlin() + primaryConstructorBodyToKotlin() + classObjectToKotlin()
-        //return if (insideBody.trim().isNotEmpty()) " {" + insideBody + "}" else ""
+        val innerBody = classMembers.nonStaticMembers.toKotlin() + primaryConstructorBodyToKotlin() + classObjectToKotlin()
+        return if (innerBody.trim().isNotEmpty()) " {" + innerBody + "}" else ""
     }
 
     private fun classObjectToKotlin(): String {
diff --git a/j2k/tests/testData/ast/class/class.ide.kt b/j2k/tests/testData/ast/class/class.ide.kt
index 448f2c6caeb..9eb0d07da4b 100644
--- a/j2k/tests/testData/ast/class/class.ide.kt
+++ b/j2k/tests/testData/ast/class/class.ide.kt
@@ -1 +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 7cd9a445411..388efa65aa9 100644
--- a/j2k/tests/testData/ast/class/class.kt
+++ b/j2k/tests/testData/ast/class/class.kt
@@ -1 +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 411e9bd2c68..889a7ca7324 100644
--- a/j2k/tests/testData/ast/class/emptyClass.ide.kt
+++ b/j2k/tests/testData/ast/class/emptyClass.ide.kt
@@ -1 +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 411e9bd2c68..889a7ca7324 100644
--- a/j2k/tests/testData/ast/class/emptyClass.kt
+++ b/j2k/tests/testData/ast/class/emptyClass.kt
@@ -1 +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 7d8113607af..2fb3570566d 100644
--- a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.ide.kt
+++ b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.ide.kt
@@ -1 +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 7d8113607af..2fb3570566d 100644
--- a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.kt
+++ b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.kt
@@ -1 +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 a951aef745d..d253a077cee 100644
--- a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.ide.kt
+++ b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.ide.kt
@@ -1 +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 a951aef745d..d253a077cee 100644
--- a/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.kt
+++ b/j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.kt
@@ -1 +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 448f2c6caeb..9eb0d07da4b 100644
--- a/j2k/tests/testData/ast/class/finalClass.ide.kt
+++ b/j2k/tests/testData/ast/class/finalClass.ide.kt
@@ -1 +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 448f2c6caeb..9eb0d07da4b 100644
--- a/j2k/tests/testData/ast/class/finalClass.kt
+++ b/j2k/tests/testData/ast/class/finalClass.kt
@@ -1 +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 7e478bcfd56..eb27b9ce86e 100644
--- a/j2k/tests/testData/ast/class/genericClass.ide.kt
+++ b/j2k/tests/testData/ast/class/genericClass.ide.kt
@@ -1 +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 7e478bcfd56..eb27b9ce86e 100644
--- a/j2k/tests/testData/ast/class/genericClass.kt
+++ b/j2k/tests/testData/ast/class/genericClass.kt
@@ -1 +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 dab431167d3..316afd78138 100644
--- a/j2k/tests/testData/ast/class/innerEmptyClass.ide.kt
+++ b/j2k/tests/testData/ast/class/innerEmptyClass.ide.kt
@@ -1,3 +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 dab431167d3..316afd78138 100644
--- a/j2k/tests/testData/ast/class/innerEmptyClass.kt
+++ b/j2k/tests/testData/ast/class/innerEmptyClass.kt
@@ -1,3 +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 f936033ee01..21c9a0e2e11 100644
--- a/j2k/tests/testData/ast/class/innerStaticClass.ide.kt
+++ b/j2k/tests/testData/ast/class/innerStaticClass.ide.kt
@@ -1,5 +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 6e53b365350..414d4ba04eb 100644
--- a/j2k/tests/testData/ast/class/innerStaticClass.kt
+++ b/j2k/tests/testData/ast/class/innerStaticClass.kt
@@ -1,5 +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 448f2c6caeb..9eb0d07da4b 100644
--- a/j2k/tests/testData/ast/class/internalClass.ide.kt
+++ b/j2k/tests/testData/ast/class/internalClass.ide.kt
@@ -1 +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 7cd9a445411..388efa65aa9 100644
--- a/j2k/tests/testData/ast/class/internalClass.kt
+++ b/j2k/tests/testData/ast/class/internalClass.kt
@@ -1 +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 fd6b72fcdd0..ed5c74e2ac8 100644
--- a/j2k/tests/testData/ast/class/pivateClass.ide.kt
+++ b/j2k/tests/testData/ast/class/pivateClass.ide.kt
@@ -1 +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 ea7c0129c3d..cc401415daf 100644
--- a/j2k/tests/testData/ast/class/pivateClass.kt
+++ b/j2k/tests/testData/ast/class/pivateClass.kt
@@ -1 +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 5cd832d082a..fc6c1ec5ff3 100644
--- a/j2k/tests/testData/ast/class/protectedClass.ide.kt
+++ b/j2k/tests/testData/ast/class/protectedClass.ide.kt
@@ -1 +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 927a6bc1705..c65c6796260 100644
--- a/j2k/tests/testData/ast/class/protectedClass.kt
+++ b/j2k/tests/testData/ast/class/protectedClass.kt
@@ -1 +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 e2c1c414eb5..97dcb46fa1b 100644
--- a/j2k/tests/testData/ast/class/publicClass.ide.kt
+++ b/j2k/tests/testData/ast/class/publicClass.ide.kt
@@ -1 +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 ff1961c4eed..7f22c020830 100644
--- a/j2k/tests/testData/ast/class/publicClass.kt
+++ b/j2k/tests/testData/ast/class/publicClass.kt
@@ -1 +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 1837bca55a9..b22be127052 100644
--- a/j2k/tests/testData/ast/class/simpleInheritance.ide.kt
+++ b/j2k/tests/testData/ast/class/simpleInheritance.ide.kt
@@ -1 +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 1837bca55a9..b22be127052 100644
--- a/j2k/tests/testData/ast/class/simpleInheritance.kt
+++ b/j2k/tests/testData/ast/class/simpleInheritance.kt
@@ -1 +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/constructors/fieldsInitializedFromParams1.ide.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.ide.kt
index 457be03be24..f95f76bfb79 100644
--- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.ide.kt
+++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.ide.kt
@@ -1 +1 @@
-class C(private val p1: Int, private val myP2: Int, public var p3: Int) {}
+class C(private val p1: Int, private val myP2: Int, public var p3: Int)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.kt
index 8d089c99574..bcb2044129a 100644
--- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.kt
+++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams1.kt
@@ -1 +1 @@
-open class C(private val p1: Int, private val myP2: Int, public var p3: Int) {}
+open class C(private val p1: Int, private val myP2: Int, public var p3: Int)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.ide.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.ide.kt
index 54787d2524d..0ed9ef3a505 100644
--- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.ide.kt
+++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.ide.kt
@@ -2,4 +2,4 @@ class C(private val field: Int) {
     {
         System.out.println(field)
     }
-}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.kt
index 901a2416b1f..3d3580b445e 100644
--- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.kt
+++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.kt
@@ -2,4 +2,4 @@ open class C(private val field: Int) {
     {
         System.out?.println(field)
     }
-}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.ide.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.ide.kt
index 5b8b202efec..3a28753de9b 100644
--- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.ide.kt
+++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.ide.kt
@@ -6,4 +6,4 @@ class C(p: Int) {
         System.out.println(p++)
         System.out.println(p)
     }
-}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.kt
index a00f267b501..70c8cc7f2df 100644
--- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.kt
+++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.kt
@@ -6,4 +6,4 @@ open class C(p: Int) {
         System.out?.println(p++)
         System.out?.println(p)
     }
-}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.ide.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.ide.kt
index c336b8fd060..fc1e3d24954 100644
--- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.ide.kt
+++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.ide.kt
@@ -4,4 +4,4 @@ class C(p: Int, c: C) {
     {
         c.p = p
     }
-}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.kt
index 10d99447c01..4bfddc6e65a 100644
--- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.kt
+++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.kt
@@ -4,4 +4,4 @@ open class C(p: Int, c: C?) {
     {
         c?.p = p
     }
-}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.ide.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.ide.kt
index 072f16f3bf5..d95fe990af6 100644
--- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.ide.kt
+++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.ide.kt
@@ -7,4 +7,4 @@ class C(p: Int) {
             this.p = p
         }
     }
-}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.kt
index 92b3c24279b..bb6b3d9ac26 100644
--- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.kt
+++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.kt
@@ -7,4 +7,4 @@ open class C(p: Int) {
             this.p = p
         }
     }
-}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.ide.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.ide.kt
index 2e85a74b122..a508dab0751 100644
--- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.ide.kt
+++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.ide.kt
@@ -4,4 +4,4 @@ class C(x: String) {
     {
         this.x = x
     }
-}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.kt
index bbb7b9e039e..f400b912f5d 100644
--- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.kt
+++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.kt
@@ -4,4 +4,4 @@ open class C(x: String?) {
     {
         this.x = x
     }
-}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.ide.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.ide.kt
index 1da370ef9b5..325673da894 100644
--- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.ide.kt
+++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.ide.kt
@@ -6,4 +6,4 @@ class C(x: Any, b: Boolean) {
             this.x = x
         }
     }
-}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.kt b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.kt
index ba5c0dfd872..cc8e94fc168 100644
--- a/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.kt
+++ b/j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.kt
@@ -6,4 +6,4 @@ open class C(x: Any?, b: Boolean) {
             this.x = x
         }
     }
-}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/privateField.ide.kt b/j2k/tests/testData/ast/field/privateField.ide.kt
index 35667ea9ae5..f321996b3fe 100644
--- a/j2k/tests/testData/ast/field/privateField.ide.kt
+++ b/j2k/tests/testData/ast/field/privateField.ide.kt
@@ -1,3 +1,3 @@
 class C() {
     private var f: Foo = 0
-}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/field/privateField.kt b/j2k/tests/testData/ast/field/privateField.kt
index dfd3a293f6b..e6b40a96bad 100644
--- a/j2k/tests/testData/ast/field/privateField.kt
+++ b/j2k/tests/testData/ast/field/privateField.kt
@@ -1,3 +1,3 @@
 open class C() {
     private var f: Foo? = null
-}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt b/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt
index 75f6cfc49a4..678e5b332e2 100644
--- a/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt
+++ b/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt
@@ -1,6 +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 4bb37c24e2f..67cc624a5c8 100644
--- a/j2k/tests/testData/ast/identifier/finalFieldReference.kt
+++ b/j2k/tests/testData/ast/identifier/finalFieldReference.kt
@@ -1,6 +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 c69b1188e32..c9959e925fd 100644
--- a/j2k/tests/testData/ast/importStatement/importWithKeywords.ide.kt
+++ b/j2k/tests/testData/ast/importStatement/importWithKeywords.ide.kt
@@ -2,4 +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 0562bc1f70c..17cba8bd680 100644
--- a/j2k/tests/testData/ast/importStatement/importWithKeywords.kt
+++ b/j2k/tests/testData/ast/importStatement/importWithKeywords.kt
@@ -2,4 +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 53ed53b22ef..21965cae265 100644
--- a/j2k/tests/testData/ast/importStatement/importWithStar.ide.kt
+++ b/j2k/tests/testData/ast/importStatement/importWithStar.ide.kt
@@ -2,4 +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 8032c26418c..d8a8c44eff6 100644
--- a/j2k/tests/testData/ast/importStatement/importWithStar.kt
+++ b/j2k/tests/testData/ast/importStatement/importWithStar.kt
@@ -2,4 +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 dee31ac86e3..884fd619677 100644
--- a/j2k/tests/testData/ast/importStatement/simpleImport.ide.kt
+++ b/j2k/tests/testData/ast/importStatement/simpleImport.ide.kt
@@ -1,3 +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 9319e848f16..fce74776e95 100644
--- a/j2k/tests/testData/ast/importStatement/simpleImport.kt
+++ b/j2k/tests/testData/ast/importStatement/simpleImport.kt
@@ -1,3 +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 8bb90366868..3013c8a3582 100644
--- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt
@@ -1,3 +1,3 @@
-class Base<T>(name: T) {}
+class Base<T>(name: T)
 
-class One<T, K>(name: T, private var mySecond: K) : Base<T>(name) {}
\ No newline at end of file
+class One<T, K>(name: T, private var mySecond: K) : Base<T>(name)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt
index 78cd3648e21..d044b70864a 100644
--- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt
@@ -1,3 +1,3 @@
-open class Base<T>(name: T?) {}
+open class Base<T>(name: T?)
 
-open class One<T, K>(name: T?, private var mySecond: K?) : Base<T?>(name) {}
\ No newline at end of file
+open class One<T, K>(name: T?, private var mySecond: K?) : Base<T?>(name)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt
index c282d40f6f5..ebef8b114af 100644
--- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt
@@ -1,3 +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 758d1e52700..1428e1c3248 100644
--- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.kt
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.kt
@@ -1,3 +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 18f8b49e5a3..b0bed1c0f9f 100644
--- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.ide.kt
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.ide.kt
@@ -1,3 +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 9a9cdbd6aeb..ebc4ca2c396 100644
--- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt
@@ -1,3 +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 448ce96a267..800d1f056c8 100644
--- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt
@@ -1,3 +1,3 @@
-class Base(name: String) {}
+class Base(name: String)
 
-class One(name: String, private var mySecond: String) : Base(name) {}
\ No newline at end of file
+class One(name: String, private var mySecond: String) : Base(name)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt
index b6feea16b48..a835d91f8f9 100644
--- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt
+++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt
@@ -1,3 +1,3 @@
-open class Base(name: String?) {}
+open class Base(name: String?)
 
-open class One(name: String?, private var mySecond: String?) : Base(name) {}
\ No newline at end of file
+open class One(name: String?, private var mySecond: String?) : Base(name)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/comments.ide.kt b/j2k/tests/testData/ast/issues/comments.ide.kt
index 503bb1b50e6..fc29fd34d76 100644
--- a/j2k/tests/testData/ast/issues/comments.ide.kt
+++ b/j2k/tests/testData/ast/issues/comments.ide.kt
@@ -63,4 +63,4 @@ class C() {
 
     /*two*/ /*comments*//*line*/
     var z: Int = 0
-}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/comments.kt b/j2k/tests/testData/ast/issues/comments.kt
index c2a12e8e943..6e97ab0dbe1 100644
--- a/j2k/tests/testData/ast/issues/comments.kt
+++ b/j2k/tests/testData/ast/issues/comments.kt
@@ -63,4 +63,4 @@ open class C() {
 
     /*two*/ /*comments*//*line*/
     var z: Int = 0
-}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/kt-1016.ide.kt b/j2k/tests/testData/ast/issues/kt-1016.ide.kt
index e4f0cd5ae63..1c05eab009f 100644
--- a/j2k/tests/testData/ast/issues/kt-1016.ide.kt
+++ b/j2k/tests/testData/ast/issues/kt-1016.ide.kt
@@ -1,3 +1,3 @@
 package demo
 
-class C(private val i: Int) {}
\ No newline at end of file
+class C(private val i: Int)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/kt-1016.kt b/j2k/tests/testData/ast/issues/kt-1016.kt
index 72ccceee641..b02a7642617 100644
--- a/j2k/tests/testData/ast/issues/kt-1016.kt
+++ b/j2k/tests/testData/ast/issues/kt-1016.kt
@@ -1,3 +1,3 @@
 package demo
 
-open class C(private val i: Int) {}
\ No newline at end of file
+open class C(private val i: Int)
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/kt-1048.ide.kt b/j2k/tests/testData/ast/issues/kt-1048.ide.kt
index d7ae21c13de..27bd795083c 100644
--- a/j2k/tests/testData/ast/issues/kt-1048.ide.kt
+++ b/j2k/tests/testData/ast/issues/kt-1048.ide.kt
@@ -1,6 +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 77efd5317a1..271f903cf7d 100644
--- a/j2k/tests/testData/ast/issues/kt-1048.kt
+++ b/j2k/tests/testData/ast/issues/kt-1048.kt
@@ -1,6 +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 30789cd9625..5a4bed58e1f 100644
--- a/j2k/tests/testData/ast/issues/kt-809-string.ide.kt
+++ b/j2k/tests/testData/ast/issues/kt-809-string.ide.kt
@@ -10,7 +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 7337d66de95..7de1285696e 100644
--- a/j2k/tests/testData/ast/issues/kt-809-string.kt
+++ b/j2k/tests/testData/ast/issues/kt-809-string.kt
@@ -10,7 +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 acdc96a31ae..07d1c14aad1 100644
--- a/j2k/tests/testData/ast/issues/kt-809.ide.kt
+++ b/j2k/tests/testData/ast/issues/kt-809.ide.kt
@@ -10,7 +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 bd7e1f9e347..6efe9ded725 100644
--- a/j2k/tests/testData/ast/issues/kt-809.kt
+++ b/j2k/tests/testData/ast/issues/kt-809.kt
@@ -10,7 +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/issues/kt-836.ide.kt b/j2k/tests/testData/ast/issues/kt-836.ide.kt
index c500ce38d60..f570a57bb23 100644
--- a/j2k/tests/testData/ast/issues/kt-836.ide.kt
+++ b/j2k/tests/testData/ast/issues/kt-836.ide.kt
@@ -24,4 +24,4 @@ class Child() : Base() {
     override fun toString(): String {
         return "Child"
     }
-}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/kt-836.kt b/j2k/tests/testData/ast/issues/kt-836.kt
index 07d5cc1539d..056904f1c1c 100644
--- a/j2k/tests/testData/ast/issues/kt-836.kt
+++ b/j2k/tests/testData/ast/issues/kt-836.kt
@@ -24,4 +24,4 @@ open class Child() : Base() {
     override fun toString(): String? {
         return "Child"
     }
-}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/qualifyStatic.ide.kt b/j2k/tests/testData/ast/issues/qualifyStatic.ide.kt
index 5ce49641e3f..78187e0669e 100644
--- a/j2k/tests/testData/ast/issues/qualifyStatic.ide.kt
+++ b/j2k/tests/testData/ast/issues/qualifyStatic.ide.kt
@@ -4,4 +4,4 @@ abstract class MyCalendar() : Calendar() {
     public fun foo() {
         val i = Calendar.ALL_STYLES
     }
-}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/issues/qualifyStatic.kt b/j2k/tests/testData/ast/issues/qualifyStatic.kt
index d1f9a79fe7d..4c50d0fe284 100644
--- a/j2k/tests/testData/ast/issues/qualifyStatic.kt
+++ b/j2k/tests/testData/ast/issues/qualifyStatic.kt
@@ -4,4 +4,4 @@ abstract class MyCalendar() : Calendar() {
     public open fun foo() {
         var i: Int = Calendar.ALL_STYLES
     }
-}
+}
\ No newline at end of file
diff --git a/j2k/tests/testData/ast/misc/packageWithClass.ide.kt b/j2k/tests/testData/ast/misc/packageWithClass.ide.kt
index 11944a90f72..7681b2952fa 100644
--- a/j2k/tests/testData/ast/misc/packageWithClass.ide.kt
+++ b/j2k/tests/testData/ast/misc/packageWithClass.ide.kt
@@ -1,3 +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 11944a90f72..7681b2952fa 100644
--- a/j2k/tests/testData/ast/misc/packageWithClass.kt
+++ b/j2k/tests/testData/ast/misc/packageWithClass.kt
@@ -1,3 +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 1542670b839..9e2da6b537c 100644
--- a/j2k/tests/testData/ast/misc/packageWithClasses.ide.kt
+++ b/j2k/tests/testData/ast/misc/packageWithClasses.ide.kt
@@ -1,2 +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 1542670b839..9e2da6b537c 100644
--- a/j2k/tests/testData/ast/misc/packageWithClasses.kt
+++ b/j2k/tests/testData/ast/misc/packageWithClasses.kt
@@ -1,2 +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 11944a90f72..7681b2952fa 100644
--- a/j2k/tests/testData/ast/misc/packageWithOpenClass.ide.kt
+++ b/j2k/tests/testData/ast/misc/packageWithOpenClass.ide.kt
@@ -1,3 +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 0101363d020..e7a8833ef47 100644
--- a/j2k/tests/testData/ast/misc/packageWithOpenClass.kt
+++ b/j2k/tests/testData/ast/misc/packageWithOpenClass.kt
@@ -1,3 +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 8e4ac2d6326..1546fb45464 100644
--- a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt
+++ b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt
@@ -1,6 +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 aca3a160eea..dd736087a09 100644
--- a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt
+++ b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt
@@ -1,6 +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 4ffa3d3b994..48064b3ce9f 100644
--- a/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt
+++ b/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt
@@ -1,7 +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 1193b063ddf..7c6d425e002 100644
--- a/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt
+++ b/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt
@@ -1,7 +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 0cb675176fd..031a5e051cd 100644
--- a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt
+++ b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt
@@ -2,7 +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 942681c8974..781ee9311f7 100644
--- a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt
+++ b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt
@@ -2,7 +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 9b4634494f8..5dea1cbe8f3 100644
--- a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt
+++ b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt
@@ -2,7 +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 b1e4bbfbd7c..34f9bfcaf2a 100644
--- a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt
+++ b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt
@@ -2,7 +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 10f448e1b22..31190c76a54 100644
--- a/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.ide.kt
+++ b/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.ide.kt
@@ -2,4 +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 acc944d728b..01b546d1268 100644
--- a/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt
+++ b/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt
@@ -2,4 +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 8a7f1df514c..988db5e9373 100644
--- a/j2k/tests/testData/ast/trait/abstactInterface.ide.kt
+++ b/j2k/tests/testData/ast/trait/abstactInterface.ide.kt
@@ -1 +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 8a7f1df514c..988db5e9373 100644
--- a/j2k/tests/testData/ast/trait/abstactInterface.kt
+++ b/j2k/tests/testData/ast/trait/abstactInterface.kt
@@ -1 +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 aef0f68ed7c..16c5ea4846e 100644
--- a/j2k/tests/testData/ast/trait/emptyInterface.ide.kt
+++ b/j2k/tests/testData/ast/trait/emptyInterface.ide.kt
@@ -1 +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 aef0f68ed7c..16c5ea4846e 100644
--- a/j2k/tests/testData/ast/trait/emptyInterface.kt
+++ b/j2k/tests/testData/ast/trait/emptyInterface.kt
@@ -1 +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 625e613041a..ce36fca2a9d 100644
--- a/j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.ide.kt
+++ b/j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.ide.kt
@@ -1 +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 625e613041a..ce36fca2a9d 100644
--- a/j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.kt
+++ b/j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.kt
@@ -1 +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 8787a54a9c2..5ece953808c 100644
--- a/j2k/tests/testData/ast/trait/extendsOneInterface.ide.kt
+++ b/j2k/tests/testData/ast/trait/extendsOneInterface.ide.kt
@@ -1 +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 8787a54a9c2..5ece953808c 100644
--- a/j2k/tests/testData/ast/trait/extendsOneInterface.kt
+++ b/j2k/tests/testData/ast/trait/extendsOneInterface.kt
@@ -1 +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 ef207ebb1a3..03eed70d1fb 100644
--- a/j2k/tests/testData/ast/trait/internalInterface.ide.kt
+++ b/j2k/tests/testData/ast/trait/internalInterface.ide.kt
@@ -1 +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 ef207ebb1a3..03eed70d1fb 100644
--- a/j2k/tests/testData/ast/trait/internalInterface.kt
+++ b/j2k/tests/testData/ast/trait/internalInterface.kt
@@ -1 +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 7990648ae71..01664e81afe 100644
--- a/j2k/tests/testData/ast/trait/privateInterface.ide.kt
+++ b/j2k/tests/testData/ast/trait/privateInterface.ide.kt
@@ -1 +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 7990648ae71..01664e81afe 100644
--- a/j2k/tests/testData/ast/trait/privateInterface.kt
+++ b/j2k/tests/testData/ast/trait/privateInterface.kt
@@ -1 +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 b466c384c1d..40e6bbe6a82 100644
--- a/j2k/tests/testData/ast/trait/protectedInterface.ide.kt
+++ b/j2k/tests/testData/ast/trait/protectedInterface.ide.kt
@@ -1 +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 b466c384c1d..40e6bbe6a82 100644
--- a/j2k/tests/testData/ast/trait/protectedInterface.kt
+++ b/j2k/tests/testData/ast/trait/protectedInterface.kt
@@ -1 +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 3c9ae6450a3..17b72fe1674 100644
--- a/j2k/tests/testData/ast/trait/publicInterface.ide.kt
+++ b/j2k/tests/testData/ast/trait/publicInterface.ide.kt
@@ -1 +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 3c9ae6450a3..17b72fe1674 100644
--- a/j2k/tests/testData/ast/trait/publicInterface.kt
+++ b/j2k/tests/testData/ast/trait/publicInterface.kt
@@ -1 +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 ceafb598ec8..abc1138c735 100644
--- a/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.ide.kt
+++ b/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.ide.kt
@@ -1 +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 74b5967e824..3f639d4b160 100644
--- a/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt
+++ b/j2k/tests/testData/ast/typeParameters/classDoubleParametrizationWithTwoBoundsWithExtending.kt
@@ -1 +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 f610f325f60..3e52cd0539d 100644
--- a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.ide.kt
+++ b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.ide.kt
@@ -1 +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 5feac799804..b178801cdf0 100644
--- a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.kt
+++ b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.kt
@@ -1 +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 63960b9a264..43cd7f4fc3a 100644
--- a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.ide.kt
+++ b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.ide.kt
@@ -1 +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 d070a257782..ed5af9296d3 100644
--- a/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt
+++ b/j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBoundsWithExtending.kt
@@ -1 +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 793144a6ce1..b85297cbc4f 100644
--- a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.ide.kt
+++ b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.ide.kt
@@ -1 +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 dbb560bee58..fc45262d371 100644
--- a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.kt
+++ b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassExtending.kt
@@ -1 +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 45b32095d0d..7fefeae3e8f 100644
--- a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.ide.kt
+++ b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.ide.kt
@@ -1 +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 2a2e1fa81d2..45b21508477 100644
--- a/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.kt
+++ b/j2k/tests/testData/ast/typeParameters/complexExampleWithClassMultiplyExtending.kt
@@ -1 +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 184ac2d58d3..e43deaba778 100644
--- a/j2k/tests/testData/ast/typeParameters/genericClass.ide.kt
+++ b/j2k/tests/testData/ast/typeParameters/genericClass.ide.kt
@@ -1 +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 184ac2d58d3..e43deaba778 100644
--- a/j2k/tests/testData/ast/typeParameters/genericClass.kt
+++ b/j2k/tests/testData/ast/typeParameters/genericClass.kt
@@ -1 +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 dc0a7c09ee6..c7a4593dd43 100644
--- a/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.ide.kt
+++ b/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.ide.kt
@@ -1 +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 60497edf604..dab444cb5ed 100644
--- a/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt
+++ b/j2k/tests/testData/ast/typeParameters/traitDoubleParametrizationWithTwoBoundsWithExtending.kt
@@ -1 +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