Allow empty blocks for classes and function literals

j2k/tests/testData/ast/class/class.ide.kt

@@ -1,2 +1 @@
-class Test() {
-}
+class Test() {}

j2k/tests/testData/ast/class/class.kt

@@ -1,2 +1 @@
-open class Test() {
-}
+open class Test() {}

j2k/tests/testData/ast/class/emptyClass.ide.kt

@@ -1,2 +1 @@
-class A() {
-}
+class A() {}

j2k/tests/testData/ast/class/emptyClass.kt

@@ -1,2 +1 @@
-class A() {
-}
+class A() {}

j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.ide.kt

@@ -1,2 +1 @@
-class A() : Base(), I {
-}
+class A() : Base(), I {}

j2k/tests/testData/ast/class/extendsOneClassAndImplementsOneInterface.kt

@@ -1,2 +1 @@
-class A() : Base(), I {
-}
+class A() : Base(), I {}

j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.ide.kt

@@ -1,2 +1 @@
-class A() : Base(), I0, I1, I2 {
-}
+class A() : Base(), I0, I1, I2 {}

j2k/tests/testData/ast/class/extendsOneClassAndImplementsSeveralInterfaces.kt

@@ -1,2 +1 @@
-class A() : Base(), I0, I1, I2 {
-}
+class A() : Base(), I0, I1, I2 {}

j2k/tests/testData/ast/class/finalClass.ide.kt

@@ -1,2 +1 @@
-class Test() {
-}
+class Test() {}

j2k/tests/testData/ast/class/finalClass.kt

@@ -1,2 +1 @@
-class Test() {
-}
+class Test() {}

j2k/tests/testData/ast/class/genericClass.ide.kt

@@ -1,2 +1 @@
-class Entry<K, V>() {
-}
+class Entry<K, V>() {}

j2k/tests/testData/ast/class/genericClass.kt

@@ -1,2 +1 @@
-class Entry<K, V>() {
-}
+class Entry<K, V>() {}

j2k/tests/testData/ast/class/innerEmptyClass.ide.kt

@@ -1,4 +1,3 @@
 class A() {
-    class B() {
-    }
+    class B() {}
 }

j2k/tests/testData/ast/class/innerEmptyClass.kt

@@ -1,4 +1,3 @@
 class A() {
-    class B() {
-    }
+    class B() {}
 }

j2k/tests/testData/ast/class/innerStaticClass.ide.kt

@@ -1,6 +1,5 @@
 class S() {
     class object {
-        class Inner() {
-        }
+        class Inner() {}
     }
 }

j2k/tests/testData/ast/class/innerStaticClass.kt

@@ -1,6 +1,5 @@
 class S() {
     class object {
-        open class Inner() {
-        }
+        open class Inner() {}
     }
 }

j2k/tests/testData/ast/class/internalClass.ide.kt

@@ -1,2 +1 @@
-class Test() {
-}
+class Test() {}

j2k/tests/testData/ast/class/internalClass.kt

@@ -1,2 +1 @@
-open class Test() {
-}
+open class Test() {}

j2k/tests/testData/ast/class/pivateClass.ide.kt

@@ -1,2 +1 @@
-private class Test() {
-}
+private class Test() {}

j2k/tests/testData/ast/class/pivateClass.kt

@@ -1,2 +1 @@
-private open class Test() {
-}
+private open class Test() {}

j2k/tests/testData/ast/class/protectedClass.ide.kt

@@ -1,2 +1 @@
-protected class Test() {
-}
+protected class Test() {}

j2k/tests/testData/ast/class/protectedClass.kt

@@ -1,2 +1 @@
-protected open class Test() {
-}
+protected open class Test() {}

j2k/tests/testData/ast/class/publicClass.ide.kt

@@ -1,2 +1 @@
-public class Test() {
-}
+public class Test() {}

j2k/tests/testData/ast/class/publicClass.kt

@@ -1,2 +1 @@
-public open class Test() {
-}
+public open class Test() {}

j2k/tests/testData/ast/class/simpleInheritance.ide.kt

@@ -1,2 +1 @@
-class A() : Base() {
-}
+class A() : Base() {}

j2k/tests/testData/ast/class/simpleInheritance.kt

@@ -1,2 +1 @@
-class A() : Base() {
-}
+class A() : Base() {}

j2k/tests/testData/ast/enum/emptyEnum.ide.kt

@@ -1,2 +1 @@
-enum class A {
-}
+enum class A {}

j2k/tests/testData/ast/enum/emptyEnum.kt

@@ -1,2 +1 @@
-enum class A {
-}
+enum class A {}

j2k/tests/testData/ast/enum/enumImplementsOneInterface.ide.kt

@@ -1,2 +1 @@
-enum class A : I {
-}
+enum class A : I {}

j2k/tests/testData/ast/enum/enumImplementsOneInterface.kt

@@ -1,2 +1 @@
-enum class A : I {
-}
+enum class A : I {}

j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.ide.kt

@@ -1,2 +1 @@
-enum class A : I0, I1, I2 {
-}
+enum class A : I0, I1, I2 {}

j2k/tests/testData/ast/enum/enumImplementsSeveralInterfaces.kt

@@ -1,2 +1 @@
-enum class A : I0, I1, I2 {
-}
+enum class A : I0, I1, I2 {}

j2k/tests/testData/ast/enum/internalEnum.ide.kt

@@ -1,2 +1 @@
-enum class Test {
-}
+enum class Test {}

j2k/tests/testData/ast/enum/internalEnum.kt

@@ -1,2 +1 @@
-enum class Test {
-}
+enum class Test {}

j2k/tests/testData/ast/enum/privateEnum.ide.kt

@@ -1,2 +1 @@
-private enum class Test {
-}
+private enum class Test {}

j2k/tests/testData/ast/enum/privateEnum.kt

@@ -1,2 +1 @@
-private enum class Test {
-}
+private enum class Test {}

j2k/tests/testData/ast/enum/protectedEnum.ide.kt

@@ -1,2 +1 @@
-protected enum class Test {
-}
+protected enum class Test {}

j2k/tests/testData/ast/enum/protectedEnum.kt

@@ -1,2 +1 @@
-protected enum class Test {
-}
+protected enum class Test {}

j2k/tests/testData/ast/enum/publicEnum.ide.kt

@@ -1,2 +1 @@
-public enum class Test {
-}
+public enum class Test {}

j2k/tests/testData/ast/enum/publicEnum.kt

@@ -1,2 +1 @@
-public enum class Test {
-}
+public enum class Test {}

j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt

@@ -1,7 +1,7 @@
 {
     val i = 0
     while (i < 0) {
-        { }
+        {}
         {
             j++
             i++

j2k/tests/testData/ast/for/forWithEmptyBlock.kt

@@ -1,7 +1,7 @@
 {
     var i: Int = 0
     while (i < 0) {
-        { }
+        {}
         {
             j++
             i++

j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt

@@ -1,8 +1,6 @@
-class `$$$$$`() {
-}
+class `$$$$$`() {}
 
-class `$`() {
-}
+class `$`() {}
 
 class `$$`(`$$$$`: `$$$$$`) : `$`() {
     val `$$$`: `$$$$$`

j2k/tests/testData/ast/identifier/finalFieldReference.kt

@@ -1,8 +1,6 @@
-open class `$$$$$`() {
-}
+open class `$$$$$`() {}
 
-open class `$`() {
-}
+open class `$`() {}
 
 open class `$$`(`$$$$`: `$$$$$`?) : `$`() {
     val `$$$`: `$$$$$`?

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() {
-}
+class Test() {}

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() {
-}
+open class Test() {}

j2k/tests/testData/ast/importStatement/importWithStar.ide.kt

@@ -2,5 +2,4 @@ package org.jetbrains.jet.j2k
 
 import org.jetbrains.annotations.*
 
-public class Converter() {
-}
+public class Converter() {}

j2k/tests/testData/ast/importStatement/importWithStar.kt

@@ -2,5 +2,4 @@ package org.jetbrains.jet.j2k
 
 import org.jetbrains.annotations.*
 
-public open class Converter() {
-}
+public open class Converter() {}

j2k/tests/testData/ast/importStatement/simpleImport.ide.kt

@@ -1,4 +1,3 @@
 package org.jetbrains.jet.j2k
 
-public class Converter() {
-}
+public class Converter() {}

j2k/tests/testData/ast/importStatement/simpleImport.kt

@@ -1,4 +1,3 @@
 package org.jetbrains.jet.j2k
 
-public open class Converter() {
-}
+public open class Converter() {}

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

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

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) {
-}
+class One(name: String, second: String) : Base(name) {}

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) {
-}
+open class One(name: String?, second: String?) : Base(name) {}

j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.ide.kt

@@ -1,5 +1,3 @@
-class Base() {
-}
+class Base() {}
 
-class One() : Base() {
-}
+class One() : Base() {}

j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParams.kt

@@ -1,5 +1,3 @@
-open class Base() {
-}
+open class Base() {}
 
-open class One() : Base() {
-}
+open class One() : Base() {}

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

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

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() {

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() {

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) {

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?) {

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) {

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) {

j2k/tests/testData/ast/misc/packageWithClass.ide.kt

@@ -1,4 +1,3 @@
 package test
 
-class C() {
-}
+class C() {}

j2k/tests/testData/ast/misc/packageWithClass.kt

@@ -1,4 +1,3 @@
 package test
 
-class C() {
-}
+class C() {}

j2k/tests/testData/ast/misc/packageWithClasses.ide.kt

@@ -1,4 +1,2 @@
-class A() {
-}
-class B() {
-}
+class A() {}
+class B() {}

j2k/tests/testData/ast/misc/packageWithClasses.kt

@@ -1,4 +1,2 @@
-class A() {
-}
-class B() {
-}
+class A() {}
+class B() {}

j2k/tests/testData/ast/misc/packageWithOpenClass.ide.kt

@@ -1,4 +1,3 @@
 package test
 
-class C() {
-}
+class C() {}

j2k/tests/testData/ast/misc/packageWithOpenClass.kt

@@ -1,4 +1,3 @@
 package test
 
-open class C() {
-}
+open class C() {}

j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt

@@ -1,7 +1,6 @@
 package org.test
 
-class Library() {
-}
+class Library() {}
 
 class User() {
     fun main() {

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() {

j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt

@@ -1,8 +1,7 @@
 package org.test
 
 class OuterClass() {
-    class InnerClass() {
-    }
+    class InnerClass() {}
 }
 
 class User() {

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() {

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() {

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() {

j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt

@@ -2,8 +2,7 @@ package demo
 
 class Foo() {
     class object {
-        class Bar() {
-        }
+        class Bar() {}
     }
 }
 

j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt

@@ -2,8 +2,7 @@ package demo
 
 open class Foo() {
     class object {
-        open class Bar() {
-        }
+        open class Bar() {}
     }
 }
 

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() {
-}
+public class Converter() {}

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() {
-}
+public open class Converter() {}

j2k/tests/testData/ast/trait/abstactInterface.ide.kt

@@ -1,2 +1 @@
-abstract trait I {
-}
+abstract trait I {}

j2k/tests/testData/ast/trait/abstactInterface.kt

@@ -1,2 +1 @@
-abstract trait I {
-}
+abstract trait I {}

j2k/tests/testData/ast/trait/emptyInterface.ide.kt

@@ -1,2 +1 @@
-trait A {
-}
+trait A {}

j2k/tests/testData/ast/trait/emptyInterface.kt

@@ -1,2 +1 @@
-trait A {
-}
+trait A {}

j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.ide.kt

@@ -1,2 +1 @@
-trait A : I0, I1, I2 {
-}
+trait A : I0, I1, I2 {}

j2k/tests/testData/ast/trait/extendsOneClassAndImplementsSeveralInterfaces.kt

@@ -1,2 +1 @@
-trait A : I0, I1, I2 {
-}
+trait A : I0, I1, I2 {}

j2k/tests/testData/ast/trait/extendsOneInterface.ide.kt

@@ -1,2 +1 @@
-trait A : I {
-}
+trait A : I {}

j2k/tests/testData/ast/trait/extendsOneInterface.kt

@@ -1,2 +1 @@
-trait A : I {
-}
+trait A : I {}

j2k/tests/testData/ast/trait/internalInterface.ide.kt

@@ -1,2 +1 @@
-trait Test {
-}
+trait Test {}

j2k/tests/testData/ast/trait/internalInterface.kt

@@ -1,2 +1 @@
-trait Test {
-}
+trait Test {}

j2k/tests/testData/ast/trait/privateInterface.ide.kt

@@ -1,2 +1 @@
-private trait Test {
-}
+private trait Test {}

j2k/tests/testData/ast/trait/privateInterface.kt

@@ -1,2 +1 @@
-private trait Test {
-}
+private trait Test {}

j2k/tests/testData/ast/trait/protectedInterface.ide.kt

@@ -1,2 +1 @@
-protected trait Test {
-}
+protected trait Test {}

j2k/tests/testData/ast/trait/protectedInterface.kt

@@ -1,2 +1 @@
-protected trait Test {
-}
+protected trait Test {}

j2k/tests/testData/ast/trait/publicInterface.ide.kt

@@ -1,2 +1 @@
-public trait Test {
-}
+public trait Test {}

j2k/tests/testData/ast/trait/publicInterface.kt

@@ -1,2 +1 @@
-public trait Test {
-}
+public trait Test {}

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> {
-}
+class CC<T : INode, K : Node>() : A() where T : Comparable<in T>, K : Collection<in K> {}

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?>? {
-}
+class CC<T : INode?, K : Node?>() : A() where T : Comparable<in T?>?, K : Collection<in K?>? {}

j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.ide.kt

@@ -1,2 +1 @@
-class C<T : INode>() where T : Comparable<in T> {
-}
+class C<T : INode>() where T : Comparable<in T> {}

j2k/tests/testData/ast/typeParameters/classParametrizationWithTwoBounds.kt

@@ -1,2 +1 @@
-class C<T : INode?>() where T : Comparable<in T?>? {
-}
+class C<T : INode?>() where T : Comparable<in T?>? {}