Converter:

Preserve white spaces for top members (classes, package statements, comments)

j2k/src/org/jetbrains/jet/j2k/Converter.kt

@@ -58,7 +58,7 @@ public class Converter(val project: Project, val settings: ConverterSettings) {
         return kElement?.toKotlin() ?: ""
     }
 
-    public fun convertTopElement(element: PsiElement?): Node? = when(element) {
+    public fun convertTopElement(element: PsiElement?): Element? = when(element) {
         is PsiJavaFile -> convertFile(element)
         is PsiClass -> convertClass(element)
         is PsiMethod -> convertMethod(element)
@@ -68,18 +68,14 @@ public class Converter(val project: Project, val settings: ConverterSettings) {
         is PsiComment -> Comment(element.getText()!!)
         is PsiImportList -> convertImportList(element)
         is PsiImportStatementBase -> convertImport(element)
+        is PsiPackageStatement -> PackageStatement(quoteKeywords(element.getPackageName() ?: ""))
+        is PsiWhiteSpace -> WhiteSpace(element.getText()!!)
         else -> null
     }
 
     public fun convertFile(javaFile: PsiJavaFile): File {
-        val body = ArrayList<Node>()
-        for (element in javaFile.getChildren()) {
-            val node = convertTopElement(element)
-            if (node != null) {
-                body.add(node)
-            }
-        }
-        return File(quoteKeywords(javaFile.getPackageName()), body, createMainFunction(javaFile))
+        val fileMembers = FileMemberList(javaFile.getChildren() .map { convertTopElement(it) } .filterNotNull())
+        return File(fileMembers, createMainFunction(javaFile))
     }
 
     public fun convertAnonymousClass(anonymousClass: PsiAnonymousClass): AnonymousClass {

j2k/src/org/jetbrains/jet/j2k/ast/File.kt

@@ -16,16 +16,16 @@
 
 package org.jetbrains.jet.j2k.ast
 
-public class File(val packageName: String,
-                  val body: List<Node>,
-                  val mainFunction: String) : Node {
+class FileMemberList(elements: List<Element>): WhiteSpaceSeparatedElementList(elements, WhiteSpace.NewLine, false)
+
+class PackageStatement(val packageName: String): Element {
+    override fun toKotlin(): String = "package " + packageName
+}
+
+public class File(val body: FileMemberList,
+                  val mainFunction: String) : Element {
 
     override fun toKotlin(): String {
-        val common = body.filterNot { it is Element && it.isEmpty() }.toKotlin("\n") + mainFunction
-        if (packageName.isEmpty()) {
-            return common
-        }
-
-        return "package " + packageName + "\n" + common
+        return body.toKotlin() + mainFunction
     }
 }

j2k/src/org/jetbrains/jet/j2k/ast/Imports.kt

@@ -24,7 +24,7 @@ import org.jetbrains.jet.util.QualifiedNamesUtil
 import org.jetbrains.jet.lang.resolve.java.mapping.JavaToKotlinClassMap
 
 
-public class Import(val name: String) : Node {
+public class Import(val name: String) : Element {
     public override fun toKotlin() = "import " + name
 }
 

j2k/src/org/jetbrains/jet/j2k/ast/Util.kt

@@ -48,7 +48,8 @@ public fun Expression.withPrefix(prefix: String): String = if (isEmpty()) "" els
 
 open class WhiteSpaceSeparatedElementList(
         val elements: List<Element>,
-        val minimalWhiteSpace: WhiteSpace
+        val minimalWhiteSpace: WhiteSpace,
+        val ensureSurroundedByWhiteSpace: Boolean = true
 ) {
     val nonEmptyElements = elements.filterNot { it.isEmpty() }
 
@@ -62,6 +63,9 @@ open class WhiteSpaceSeparatedElementList(
     }
 
     private fun List<Element>.surroundWithWhiteSpaces(): List<Element> {
+        if (!ensureSurroundedByWhiteSpace) {
+            return this
+        }
         val result = ArrayList<Element>()
         result.add(minimalWhiteSpace)
         result.addAll(this)

j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt

@@ -4,10 +4,12 @@ class Foo() {
     fun execute() {
     }
 }
+
 class Bar() {
     var fooNotNull: Foo = Foo()
     var fooNullable: Foo = null
 }
+
 class Test() {
     public fun test(barNotNull: Bar, barNullable: Bar) {
         barNotNull.fooNotNull.execute()

j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.jav

@@ -20,4 +20,4 @@ class Test {
     barNullable.fooNotNull.execute();
     barNullable.fooNullable.execute();
   }
-}
+}

j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt

@@ -4,10 +4,12 @@ open class Foo() {
     open fun execute() {
     }
 }
+
 open class Bar() {
     var fooNotNull: Foo = Foo()
     var fooNullable: Foo? = null
 }
+
 open class Test() {
     public open fun test(barNotNull: Bar, barNullable: Bar?) {
         barNotNull.fooNotNull.execute()

j2k/tests/testData/ast/assignmentExpression/nullability.jav

@@ -7,4 +7,4 @@ class Foo {
     int foo = 0;
     foo = o2.size();
   }
-}
+}

j2k/tests/testData/ast/callChainExpression/libraryFieldCall.ide.kt

@@ -3,6 +3,7 @@ class Library() {
         val ourOut: java.io.PrintStream = 0
     }
 }
+
 class User() {
     fun main() {
         Library.ourOut.print()

j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt

@@ -3,6 +3,7 @@ open class Library() {
         val ourOut: java.io.PrintStream? = null
     }
 }
+
 open class User() {
     open fun main() {
         Library.ourOut?.print()

j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt

@@ -8,6 +8,7 @@ class Library() {
         }
     }
 }
+
 class User() {
     fun main() {
         Library.call()

j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt

@@ -8,6 +8,7 @@ open class Library() {
         }
     }
 }
+
 open class User() {
     open fun main() {
         Library.call()

j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt

@@ -6,6 +6,7 @@ class Library() {
         return ""
     }
 }
+
 class User() {
     fun main() {
         val lib = Library()

j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt

@@ -6,6 +6,7 @@ open class Library() {
         return ""
     }
 }
+
 open class User() {
     open fun main() {
         var lib: Library? = Library()

j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt

@@ -1,6 +1,7 @@
 class Library() {
     public val myString: String = 0
 }
+
 class User() {
     fun main() {
         Library.myString.isEmpty()

j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt

@@ -1,6 +1,7 @@
 open class Library() {
     public val myString: String? = null
 }
+
 open class User() {
     open fun main() {
         Library.myString?.isEmpty()

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

@@ -7,6 +7,7 @@ public class Short() {
         }
     }
 }
+
 class Test() {
     class object {
         public fun test() {

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

@@ -7,6 +7,7 @@ public open class Short() {
         }
     }
 }
+
 open class Test() {
     class object {
         public open fun test() {

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

@@ -14,6 +14,7 @@ class Test() {
         }
     }
 }
+
 class User() {
     fun main() {
         val m = HashMap(1)

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

@@ -14,6 +14,7 @@ open class Test() {
         }
     }
 }
+
 open class User() {
     open fun main() {
         var m: HashMap<Any?, Any?>? = HashMap(1)

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

@@ -12,6 +12,7 @@ class C(arg1: Int, arg2: Int, arg3: Int) {
         }
     }
 }
+
 public class User() {
     class object {
         public fun main() {

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

@@ -12,6 +12,7 @@ open class C(arg1: Int, arg2: Int, arg3: Int) {
         }
     }
 }
+
 public open class User() {
     class object {
         public open fun main() {

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

@@ -26,6 +26,7 @@ class C(arg1: Int) {
         }
     }
 }
+
 public class User() {
     class object {
         public fun main() {

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

@@ -26,6 +26,7 @@ open class C(arg1: Int) {
         }
     }
 }
+
 public open class User() {
     class object {
         public open fun main() {

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

@@ -24,6 +24,7 @@ class Customer(first: String, last: String) {
         doSmthAfter()
     }
 }
+
 class CustomerBuilder() {
     public var _firstName: String = "Homer"
     public var _lastName: String = "Simpson"
@@ -42,6 +43,7 @@ class CustomerBuilder() {
         return Customer(_firstName, _lastName)
     }
 }
+
 public class User() {
     class object {
         public fun main() {

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

@@ -24,6 +24,7 @@ open class Customer(first: String?, last: String?) {
         doSmthAfter()
     }
 }
+
 open class CustomerBuilder() {
     public var _firstName: String? = "Homer"
     public var _lastName: String? = "Simpson"
@@ -42,6 +43,7 @@ open class CustomerBuilder() {
         return Customer(_firstName, _lastName)
     }
 }
+
 public open class User() {
     class object {
         public open fun main() {

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

@@ -32,6 +32,7 @@ public class Identifier<T>(_myName: T, _myHasDollar: Boolean) {
         }
     }
 }
+
 public class User() {
     class object {
         public fun main() {

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

@@ -32,6 +32,7 @@ public open class Identifier<T>(_myName: T?, _myHasDollar: Boolean) {
         }
     }
 }
+
 public open class User() {
     class object {
         public open fun main() {

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

@@ -32,6 +32,7 @@ public class Identifier(_myName: String, _myHasDollar: Boolean) {
         }
     }
 }
+
 public class User() {
     class object {
         public fun main() {

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

@@ -32,6 +32,7 @@ public open class Identifier(_myName: String?, _myHasDollar: Boolean) {
         }
     }
 }
+
 public open class User() {
     class object {
         public open fun main() {

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

@@ -37,6 +37,7 @@ public class Test(_myName: String, _a: Boolean, _b: Double, _c: Float, _d: Long,
         }
     }
 }
+
 public class User() {
     class object {
         public fun main() {

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

@@ -37,6 +37,7 @@ public open class Test(_myName: String?, _a: Boolean, _b: Double, _c: Float, _d:
         }
     }
 }
+
 public open class User() {
     class object {
         public open fun main() {

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

@@ -1,6 +1,7 @@
 class Base() {
     private var myFirst: String = 0
 }
+
 class Child() : Base() {
     private var mySecond: String = 0
 }

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

@@ -1,6 +1,7 @@
 open class Base() {
     private var myFirst: String? = null
 }
+
 open class Child() : Base() {
     private var mySecond: String? = null
 }

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/function/extendsBaseWhichExtendsObject.ide.kt

@@ -21,6 +21,7 @@ class Test() : Base() {
         super.finalize()
     }
 }
+
 class Base() {
     public fun hashCode(): Int {
         return System.identityHashCode(this)

j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt

@@ -21,6 +21,7 @@ open class Test() : Base() {
         super.finalize()
     }
 }
+
 open class Base() {
     public open fun hashCode(): Int {
         return System.identityHashCode(this)

j2k/tests/testData/ast/function/overrideAndOpen.ide.kt

@@ -2,10 +2,12 @@ class A() {
     fun foo() {
     }
 }
+
 class B() : A() {
     override fun foo() {
     }
 }
+
 class C() : B() {
     override fun foo() {
     }

j2k/tests/testData/ast/function/overrideAndOpen.kt

@@ -2,10 +2,12 @@ open class A() {
     open fun foo() {
     }
 }
+
 open class B() : A() {
     override fun foo() {
     }
 }
+
 open class C() : B() {
     override fun foo() {
     }

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

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

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

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

j2k/tests/testData/ast/importStatement/importWithKeywords.jav

@@ -3,4 +3,4 @@ package test;
 
 import as.type.val.var.fun.is.in.object.when.trait.This;
 
-class Test {}
+class Test {}

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

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

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

@@ -1,4 +1,5 @@
 open class Base(name: String?) {
 }
+
 open class One(name: String?, second: String?) : Base(name) {
 }

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

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

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

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

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

@@ -1,5 +1,6 @@
 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,6 @@
 open class Base(name: String?) {
 }
+
 open class One(name: String?, second: String?) : Base(name) {
     private var mySecond: String? = null
 

j2k/tests/testData/ast/issues/arrayLength.jav

@@ -3,4 +3,4 @@ class Test {
   public static int foo(String[] args) {
     return args.length;
   }
-}
+}

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

@@ -1,7 +1,14 @@
 // This is an end-of-line comment
+
 /*
 This is a block comment
 */
+
+
+/*doc comment of class*/
+//one line comment of class
+//another one
+/*another doc*/
 class C() {
     // This is a class comment
 
@@ -56,4 +63,4 @@ class C() {
 
     /*two*/ /*comments*//*line*/
     var z: Int = 0
-}
+}

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

@@ -6,6 +6,10 @@ This is a block comment
 */
 
 
+/*doc comment of class*/
+//one line comment of class
+//another one
+/*another doc*/
 class C {
     // This is a class comment
 

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

@@ -1,7 +1,14 @@
 // This is an end-of-line comment
+
 /*
 This is a block comment
 */
+
+
+/*doc comment of class*/
+//one line comment of class
+//another one
+/*another doc*/
 open class C() {
     // This is a class comment
 
@@ -56,4 +63,4 @@ open class C() {
 
     /*two*/ /*comments*//*line*/
     var z: Int = 0
-}
+}

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

@@ -2,6 +2,7 @@ import java.util.HashMap
 
 class G<T : String>(t: T) {
 }
+
 public class Java() {
     fun test() {
         val m = HashMap()

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

@@ -2,6 +2,7 @@ import java.util.HashMap
 
 open class G<T : String?>(t: T?) {
 }
+
 public open class Java() {
     open fun test() {
         var m: HashMap<Any?, Any?>? = HashMap()

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

@@ -32,6 +32,7 @@ public class Identifier<T>(_myName: T, _myHasDollar: Boolean) {
         }
     }
 }
+
 public class User() {
     class object {
         public fun main(args: Array<String>) {

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

@@ -32,6 +32,7 @@ public open class Identifier<T>(_myName: T?, _myHasDollar: Boolean) {
         }
     }
 }
+
 public open class User() {
     class object {
         public open fun main(args: Array<String?>?) {

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

@@ -13,6 +13,7 @@ class Base() {
         return getJavaClass<Base>.getName() + '@' + Integer.toHexString(hashCode())
     }
 }
+
 class Child() : Base() {
     override fun hashCode(): Int {
         return super.hashCode()

j2k/tests/testData/ast/issues/kt-696.jav

@@ -33,4 +33,4 @@ class Child extends Base {
   public String toString() {
     return super.toString();
   }
-}
+}

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

@@ -13,6 +13,7 @@ open class Base() {
         return getJavaClass<Base>.getName() + '@' + Integer.toHexString(hashCode())
     }
 }
+
 open class Child() : Base() {
     override fun hashCode(): Int {
         return super.hashCode()

j2k/tests/testData/ast/issues/kt-809-string.ide.kt

@@ -3,13 +3,16 @@ package demo
 class Container() {
     var myString: String = "1"
 }
+
 class One() {
     class object {
         var myContainer: Container = Container()
     }
 }
+
 class StringContainer(s: String) {
 }
+
 class Test() {
     fun putString(s: String) {
     }

j2k/tests/testData/ast/issues/kt-809-string.kt

@@ -3,13 +3,16 @@ package demo
 open class Container() {
     var myString: String? = "1"
 }
+
 open class One() {
     class object {
         var myContainer: Container? = Container()
     }
 }
+
 open class StringContainer(s: String?) {
 }
+
 open class Test() {
     open fun putString(s: String?) {
     }

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

@@ -3,13 +3,16 @@ package demo
 class Container() {
     var myInt: Int = 1
 }
+
 class One() {
     class object {
         var myContainer: Container = Container()
     }
 }
+
 class IntContainer(i: Int) {
 }
+
 class Test() {
     fun putInt(i: Int) {
     }

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

@@ -3,13 +3,16 @@ package demo
 open class Container() {
     var myInt: Int = 1
 }
+
 open class One() {
     class object {
         var myContainer: Container? = Container()
     }
 }
+
 open class IntContainer(i: Int) {
 }
+
 open class Test() {
     open fun putInt(i: Int) {
     }

j2k/tests/testData/ast/issues/kt-820-field.ide.kt

@@ -3,11 +3,13 @@ package demo
 class Container() {
     var myInt: Int = 1
 }
+
 class One() {
     class object {
         var myContainer: Container = Container()
     }
 }
+
 class Test() {
     var b: Byte = One.myContainer.myInt.toByte()
 }

j2k/tests/testData/ast/issues/kt-820-field.kt

@@ -3,11 +3,13 @@ package demo
 open class Container() {
     var myInt: Int = 1
 }
+
 open class One() {
     class object {
         var myContainer: Container? = Container()
     }
 }
+
 open class Test() {
     var b: Byte = One.myContainer?.myInt!!.toByte()
 }

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

@@ -3,11 +3,13 @@ package demo
 class Container() {
     var myInt: Int = 1
 }
+
 class One() {
     class object {
         var myContainer: Container = Container()
     }
 }
+
 class Test() {
     fun test() {
         val b = One.myContainer.myInt.toByte()

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

@@ -3,11 +3,13 @@ package demo
 open class Container() {
     var myInt: Int = 1
 }
+
 open class One() {
     class object {
         var myContainer: Container? = Container()
     }
 }
+
 open class Test() {
     open fun test() {
         var b: Byte = One.myContainer?.myInt!!.toByte()

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

@@ -3,11 +3,13 @@ package demo
 class Container() {
     var myBoolean: Boolean = true
 }
+
 class One() {
     class object {
         var myContainer: Container = Container()
     }
 }
+
 class Test() {
     fun test() {
         if (One.myContainer.myBoolean)

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

@@ -3,11 +3,13 @@ package demo
 open class Container() {
     var myBoolean: Boolean = true
 }
+
 open class One() {
     class object {
         var myContainer: Container? = Container()
     }
 }
+
 open class Test() {
     open fun test() {
         if (One.myContainer?.myBoolean!!)

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

@@ -13,6 +13,8 @@ public class Language(code: String) : Serializable {
         this.code = code
     }
 }
+
+
 class Base() {
     fun test() {
     }
@@ -20,10 +22,11 @@ class Base() {
         return "BASE"
     }
 }
+
 class Child() : Base() {
     override fun test() {
     }
     override fun toString(): String {
         return "Child"
     }
-}
+}

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

@@ -13,6 +13,8 @@ public open class Language(code: String?) : Serializable {
         this.code = code
     }
 }
+
+
 open class Base() {
     open fun test() {
     }
@@ -20,10 +22,11 @@ open class Base() {
         return "BASE"
     }
 }
+
 open class Child() : Base() {
     override fun test() {
     }
     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/kotlinExclusion/kt-656.ide.kt

@@ -10,6 +10,7 @@ class Test() : java.lang.Iterable<String> {
         return j
     }
 }
+
 class FullTest() : java.lang.Iterable<String> {
     override fun iterator(): java.util.Iterator<String> {
         return null

j2k/tests/testData/ast/kotlinExclusion/kt-656.kt

@@ -10,6 +10,7 @@ open class Test() : java.lang.Iterable<String?> {
         return j
     }
 }
+
 open class FullTest() : java.lang.Iterable<String?> {
     override fun iterator(): java.util.Iterator<String?>? {
         return null

j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt

@@ -4,6 +4,7 @@ class Map() {
     fun <K, V> put(k: K, v: V) {
     }
 }
+
 class U() {
     fun test() {
         val m = Map()

j2k/tests/testData/ast/methodCallExpression/genericMethod.kt

@@ -4,6 +4,7 @@ open class Map() {
     open fun <K, V> put(k: K?, v: V?) {
     }
 }
+
 open class U() {
     open fun test() {
         var m: Map? = Map()

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

@@ -2,6 +2,7 @@ package org.test
 
 class Library() {
 }
+
 class User() {
     fun main() {
         val lib = Library()

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

@@ -2,6 +2,7 @@ package org.test
 
 open class Library() {
 }
+
 open class User() {
     open fun main() {
         var lib: Library? = Library()

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

@@ -4,6 +4,7 @@ class OuterClass() {
     class InnerClass() {
     }
 }
+
 class User() {
     fun main() {
         val outerObject = OuterClass()

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

@@ -4,6 +4,7 @@ open class OuterClass() {
     open class InnerClass() {
     }
 }
+
 open class User() {
     open fun main() {
         var outerObject: OuterClass? = OuterClass()

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

@@ -4,6 +4,7 @@ import java.util.LinkedList
 
 class Member() {
 }
+
 class User() {
     fun main() {
         val members = LinkedList<Member>()

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

@@ -4,6 +4,7 @@ import java.util.LinkedList
 
 open class Member() {
 }
+
 open class User() {
     open fun main() {
         var members: MutableList<Member?>? = LinkedList<Member?>()

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

@@ -6,6 +6,7 @@ class Foo() {
         }
     }
 }
+
 class User() {
     fun main() {
         val boo = Foo.Bar()

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

@@ -6,6 +6,7 @@ open class Foo() {
         }
     }
 }
+
 open class User() {
     open fun main() {
         var boo: Foo.Bar? = Foo.Bar()

j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt

@@ -4,6 +4,7 @@ class WindowAdapter() {
     public fun windowClosing() {
     }
 }
+
 public class Client() : Frame() {
     {
         val a = object : WindowAdapter() {

j2k/tests/testData/ast/objectLiteral/MyFrame.kt

@@ -4,6 +4,7 @@ open class WindowAdapter() {
     public open fun windowClosing() {
     }
 }
+
 public class Client() : Frame() {
     {
         var a: WindowAdapter? = object : WindowAdapter() {

j2k/tests/testData/ast/rawGenerics/kt-540-map.jav

@@ -9,4 +9,4 @@ class Test {
     HashMap rawMap = new HashMap<String, Integer>();
     HashMap superRawMap = new HashMap();
   }
-}
+}

j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.ide.kt

@@ -5,6 +5,7 @@ class Collection<E>(e: E) {
         System.out.println(e)
     }
 }
+
 class Test() {
     fun main() {
         val raw1 = Collection(1)

j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt

@@ -5,6 +5,7 @@ open class Collection<E>(e: E?) {
         System.out?.println(e)
     }
 }
+
 open class Test() {
     open fun main() {
         var raw1: Collection<*>? = Collection(1)

j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt

@@ -4,6 +4,7 @@ class TestT() {
     fun <T> getT() {
     }
 }
+
 class U() {
     fun main() {
         val t = TestT()

j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt

@@ -4,6 +4,7 @@ open class TestT() {
     open fun <T> getT() {
     }
 }
+
 open class U() {
     open fun main() {
         var t: TestT? = TestT()

j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt

@@ -1,6 +1,7 @@
 class Base() {
     fun foo()
 }
+
 class A() : Base() {
     class C() {
         fun test() {

j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt

@@ -1,6 +1,7 @@
 open class Base() {
     open fun foo()
 }
+
 open class A() : Base() {
     open class C() {
         open fun test() {

j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt

@@ -3,6 +3,7 @@ class B(i: Int) {
         return 1
     }
 }
+
 class A() : B(10) {
 
     override fun call(): Int {

j2k/tests/testData/ast/superExpression/classAextendsB.kt

@@ -3,6 +3,7 @@ open class B(i: Int) {
         return 1
     }
 }
+
 open class A() : B(10) {
 
     override fun call(): Int {

j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt

@@ -2,6 +2,7 @@ class Base() {
     fun foo() {
     }
 }
+
 class A() : Base() {
     class C() {
         fun test() {