Java to Kotlin convertor: no empty class body

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 {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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)

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)

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.ide.kt

@@ -2,4 +2,4 @@ class C(private val field: Int) {
     {
         System.out.println(field)
     }
-}
+}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams2.kt

@@ -2,4 +2,4 @@ open class C(private val field: Int) {
     {
         System.out?.println(field)
     }
-}
+}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.ide.kt

@@ -6,4 +6,4 @@ class C(p: Int) {
         System.out.println(p++)
         System.out.println(p)
     }
-}
+}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams3.kt

@@ -6,4 +6,4 @@ open class C(p: Int) {
         System.out?.println(p++)
         System.out?.println(p)
     }
-}
+}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.ide.kt

@@ -4,4 +4,4 @@ class C(p: Int, c: C) {
     {
         c.p = p
     }
-}
+}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams4.kt

@@ -4,4 +4,4 @@ open class C(p: Int, c: C?) {
     {
         c?.p = p
     }
-}
+}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.ide.kt

@@ -7,4 +7,4 @@ class C(p: Int) {
             this.p = p
         }
     }
-}
+}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams5.kt

@@ -7,4 +7,4 @@ open class C(p: Int) {
             this.p = p
         }
     }
-}
+}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.ide.kt

@@ -4,4 +4,4 @@ class C(x: String) {
     {
         this.x = x
     }
-}
+}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams6.kt

@@ -4,4 +4,4 @@ open class C(x: String?) {
     {
         this.x = x
     }
-}
+}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.ide.kt

@@ -6,4 +6,4 @@ class C(x: Any, b: Boolean) {
             this.x = x
         }
     }
-}
+}

j2k/tests/testData/ast/constructors/fieldsInitializedFromParams7.kt

@@ -6,4 +6,4 @@ open class C(x: Any?, b: Boolean) {
             this.x = x
         }
     }
-}
+}

j2k/tests/testData/ast/field/privateField.ide.kt

@@ -1,3 +1,3 @@
 class C() {
     private var f: Foo = 0
-}
+}

j2k/tests/testData/ast/field/privateField.kt

@@ -1,3 +1,3 @@
 open class C() {
     private var f: Foo? = null
-}
+}

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

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

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

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

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

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

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

@@ -2,4 +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,4 +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,3 +1,3 @@
 package org.jetbrains.jet.j2k
 
-public class Converter() {}
+public class Converter()

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

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

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) {}
+class One<T, K>(name: T, private var mySecond: K) : Base<T>(name)

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) {}
+open class One<T, K>(name: T?, private var mySecond: K?) : Base<T?>(name)

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

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

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

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

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

@@ -1,3 +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,3 +1,3 @@
-class Base(name: String) {}
+class Base(name: String)
 
-class One(name: String, private var mySecond: String) : Base(name) {}
+class One(name: String, private var mySecond: String) : Base(name)

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

j2k/tests/testData/ast/issues/comments.ide.kt

@@ -63,4 +63,4 @@ class C() {
 
     /*two*/ /*comments*//*line*/
     var z: Int = 0
-}
+}

j2k/tests/testData/ast/issues/comments.kt

@@ -63,4 +63,4 @@ open class C() {
 
     /*two*/ /*comments*//*line*/
     var z: Int = 0
-}
+}

j2k/tests/testData/ast/issues/kt-1016.ide.kt

@@ -1,3 +1,3 @@
 package demo
 
-class C(private val i: Int) {}
+class C(private val i: Int)

j2k/tests/testData/ast/issues/kt-1016.kt

@@ -1,3 +1,3 @@
 package demo
 
-open class C(private val i: Int) {}
+open class C(private val i: Int)

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

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

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

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

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

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

j2k/tests/testData/ast/issues/kt-836.ide.kt

@@ -24,4 +24,4 @@ class Child() : Base() {
     override fun toString(): String {
         return "Child"
     }
-}
+}

j2k/tests/testData/ast/issues/kt-836.kt

@@ -24,4 +24,4 @@ open class Child() : Base() {
     override fun toString(): String? {
         return "Child"
     }
-}
+}

j2k/tests/testData/ast/issues/qualifyStatic.ide.kt

@@ -4,4 +4,4 @@ abstract class MyCalendar() : Calendar() {
     public fun foo() {
         val i = Calendar.ALL_STYLES
     }
-}
+}

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
     }
-}
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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