Converter:

Use formatter in converter tests
Reformat test data

compiler/tests/org/jetbrains/jet/JetTestUtils.java

@@ -313,7 +313,8 @@ public class JetTestUtils {
         }
     }
 
-    public static JetFile createFile(@NonNls String name, String text, @NotNull Project project) {
+    @NotNull
+    public static JetFile createFile(@NotNull @NonNls String name, @NotNull String text, @NotNull Project project) {
         LightVirtualFile virtualFile = new LightVirtualFile(name, JetLanguage.INSTANCE, text);
         virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET);
         return (JetFile) ((PsiFileFactoryImpl) PsiFileFactory.getInstance(project)).trySetupPsiForFile(virtualFile, JetLanguage.INSTANCE, true, false);

j2k/tests/j2k-tests.iml

@@ -14,6 +14,7 @@
     <orderEntry type="module" module-name="frontend" scope="TEST" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
+    <orderEntry type="module" module-name="idea" scope="TEST" />
   </component>
 </module>
 

j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt

@@ -23,25 +23,30 @@ import com.intellij.psi.PsiJavaFile
 import com.intellij.psi.PsiFile
 import org.jetbrains.jet.j2k.Converter
 import org.jetbrains.jet.j2k.JavaToKotlinTranslator
-import org.jetbrains.jet.ConfigurationKind
-import org.jetbrains.jet.JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations
-import com.intellij.testFramework.UsefulTestCase
 import org.jetbrains.jet.j2k.ConverterSettings
 import org.jetbrains.jet.j2k.PluginSettings
 import org.jetbrains.jet.j2k.TestSettings
 import java.util.regex.Pattern
+import com.intellij.testFramework.LightPlatformTestCase
+import com.intellij.testFramework.LightIdeaTestCase
+import com.intellij.openapi.projectRoots.Sdk
+import org.jetbrains.jet.plugin.PluginTestCaseBase
+import com.intellij.psi.codeStyle.CodeStyleManager
+import org.jetbrains.jet.JetTestUtils
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.project.Project
 
 public abstract class AbstractJavaToKotlinConverterPluginTest() : AbstractJavaToKotlinConverterTest("ide.kt", PluginSettings)
 public abstract class AbstractJavaToKotlinConverterBasicTest() : AbstractJavaToKotlinConverterTest("kt", TestSettings)
 
 public abstract class AbstractJavaToKotlinConverterTest(val kotlinFileExtension: String,
-                                                        val settings: ConverterSettings) : UsefulTestCase() {
+                                                        val settings: ConverterSettings) : LightIdeaTestCase() {
 
     val testHeaderPattern = Pattern.compile("//(element|expression|statement|method|class|file|comp)\n")
 
     protected fun doTest(javaPath: String) {
-        val jetCoreEnvironment = createEnvironmentWithMockJdkAndIdeaAnnotations(getTestRootDisposable(), ConfigurationKind.JDK_ONLY)
-        val converter = Converter(jetCoreEnvironment.getProject(), settings)
+        val project = LightPlatformTestCase.getProject()!!
+        val converter = Converter(project, settings)
         val kotlinPath = javaPath.replace(".jav", ".$kotlinFileExtension")
         val kotlinFile = File(kotlinPath)
         if (!kotlinFile.exists()) {
@@ -55,18 +60,21 @@ public abstract class AbstractJavaToKotlinConverterTest(val kotlinFileExtension:
         matcher.find()
         val prefix = matcher.group().trim().substring(2)
         val javaCode = matcher.replaceFirst("")
-        val actual = when (prefix) {
+        val rawConverted = when (prefix) {
             "element" -> elementToKotlin(converter, javaCode)
             "expression" -> expressionToKotlin(converter, javaCode)
             "statement" -> statementToKotlin(converter, javaCode)
             "method" -> methodToKotlin(converter, javaCode)
             "class" -> fileToKotlin(converter, javaCode)
             "file" -> fileToKotlin(converter, javaCode)
-            else -> throw IllegalStateException("Specify what is it: file, class, method, statement or expression "+
+            else -> throw IllegalStateException("Specify what is it: file, class, method, statement or expression " +
                                                 "using the first line of test data file")
         }
 
-        val tmp = File(kotlinPath + ".tmp")
+        compare(expected, reformat(rawConverted, project), File(kotlinPath + ".tmp"))
+    }
+
+    private fun compare(expected: String, actual: String, tmp: File) {
         if (expected != actual) {
             FileUtil.writeToFile(tmp, actual)
         }
@@ -78,10 +86,18 @@ public abstract class AbstractJavaToKotlinConverterTest(val kotlinFileExtension:
         Assert.assertEquals(expected, actual)
     }
 
+    private fun reformat(text: String, project: Project): String {
+        val convertedFile = JetTestUtils.createFile("converted", text, project)
+        ApplicationManager.getApplication()!!.runWriteAction {
+            CodeStyleManager.getInstance(project)!!.reformat(convertedFile)
+        }
+        return convertedFile.getText()!!
+    }
+
     private fun elementToKotlin(converter: Converter, text: String): String {
         val fileWithText = JavaToKotlinTranslator.createFile(converter.project, text)!!
         val element = fileWithText.getFirstChild()!!
-        return prettify(converter.elementToKotlin(element))
+        return converter.elementToKotlin(element)
     }
 
     private fun fileToKotlin(converter: Converter, text: String): String {
@@ -90,37 +106,33 @@ public abstract class AbstractJavaToKotlinConverterTest(val kotlinFileExtension:
 
     private fun methodToKotlin(converter: Converter, text: String?): String {
         var result = fileToKotlin(converter, "final class C {" + text + "}").replaceAll("class C\\(\\) \\{", "")
-        result = result.substring(0, (result.lastIndexOf("}")))
-        return prettify(result)
+        result = result.substring(0, (result.lastIndexOf("}"))).trim()
+        return result
     }
 
     private fun statementToKotlin(converter: Converter, text: String?): String {
         var result = methodToKotlin(converter, "void main() {" + text + "}")
         val pos = result.lastIndexOf("}")
-        result = result.substring(0, pos).replaceFirst("fun main\\(\\) \\{", "")
-        return prettify(result)
+        result = result.substring(0, pos).replaceFirst("fun main\\(\\) \\{", "").trim()
+        return result
     }
 
     private fun expressionToKotlin(converter: Converter, code: String?): String {
         var result = statementToKotlin(converter, "final Object o =" + code + "}")
-        result = result.replaceFirst("val o : Any\\? =", "").replaceFirst("val o : Any = ", "").replaceFirst("val o = ", "")
-        return prettify(result)
+        result = result.replaceFirst("val o : Any\\? =", "").replaceFirst("val o : Any = ", "").replaceFirst("val o = ", "").trim()
+        return result
     }
 
     private fun generateKotlinCode(converter: Converter, file: PsiFile?): String {
         if (file is PsiJavaFile) {
             JavaToKotlinTranslator.setClassIdentifiers(converter, file)
-            return prettify(converter.elementToKotlin(file))
+            return converter.elementToKotlin(file)
         }
 
         return ""
     }
 
-    private fun prettify(code: String?): String {
-        if (code == null) {
-            return ""
-        }
-
-        return code.trim().replaceAll("\r\n", "\n").replaceAll(" \n", "\n").replaceAll("\n ", "\n").replaceAll("\n+", "\n").replaceAll(" +", " ").trim()
+    override fun getProjectJDK(): Sdk? {
+        return PluginTestCaseBase.jdkFromIdeaHome()
     }
 }

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

@@ -1,20 +1,21 @@
 package test
-public class Test(str : String) {
-var myStr : String = "String2"
-public fun sout(str : String) {
-System.out.println(str)
-}
-public fun dummy(str : String) : String {
-return str
-}
-public fun test() {
-sout("String")
-val test = "String2"
-sout(test)
-sout(dummy(test))
-Test(test)
-}
-{
-myStr = str
-}
+
+public class Test(str: String) {
+    var myStr: String = "String2"
+    public fun sout(str: String) {
+        System.out.println(str)
+    }
+    public fun dummy(str: String): String {
+        return str
+    }
+    public fun test() {
+        sout("String")
+        val test = "String2"
+        sout(test)
+        sout(dummy(test))
+        Test(test)
+    }
+    {
+        myStr = str
+    }
 }

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

@@ -1,20 +1,21 @@
 package test
-public open class Test(str : String) {
-var myStr : String = "String2"
-public open fun sout(str : String) {
-System.out?.println(str)
-}
-public open fun dummy(str : String) : String {
-return str
-}
-public open fun test() {
-sout("String")
-var test : String = "String2"
-sout(test)
-sout(dummy(test))
-Test(test)
-}
-{
-myStr = str
-}
+
+public open class Test(str: String) {
+    var myStr: String = "String2"
+    public open fun sout(str: String) {
+        System.out?.println(str)
+    }
+    public open fun dummy(str: String): String {
+        return str
+    }
+    public open fun test() {
+        sout("String")
+        var test: String = "String2"
+        sout(test)
+        sout(dummy(test))
+        Test(test)
+    }
+    {
+        myStr = str
+    }
 }

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

@@ -1,17 +1,18 @@
 package test
+
 class Foo() {
-fun execute() {
-}
+    fun execute() {
+    }
 }
 class Bar() {
-var fooNotNull : Foo = Foo()
-var fooNullable : Foo = null
+    var fooNotNull: Foo = Foo()
+    var fooNullable: Foo = null
 }
 class Test() {
-public fun test(barNotNull : Bar, barNullable : Bar) {
-barNotNull.fooNotNull.execute()
-barNotNull.fooNullable.execute()
-barNullable.fooNotNull.execute()
-barNullable.fooNullable.execute()
-}
+    public fun test(barNotNull: Bar, barNullable: Bar) {
+        barNotNull.fooNotNull.execute()
+        barNotNull.fooNullable.execute()
+        barNullable.fooNotNull.execute()
+        barNullable.fooNullable.execute()
+    }
 }

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

@@ -1,17 +1,18 @@
 package test
+
 open class Foo() {
-open fun execute() {
-}
+    open fun execute() {
+    }
 }
 open class Bar() {
-var fooNotNull : Foo = Foo()
-var fooNullable : Foo? = null
+    var fooNotNull: Foo = Foo()
+    var fooNullable: Foo? = null
 }
 open class Test() {
-public open fun test(barNotNull : Bar, barNullable : Bar?) {
-barNotNull.fooNotNull.execute()
-barNotNull.fooNullable?.execute()
-barNullable?.fooNotNull?.execute()
-barNullable?.fooNullable?.execute()
-}
+    public open fun test(barNotNull: Bar, barNullable: Bar?) {
+        barNotNull.fooNotNull.execute()
+        barNotNull.fooNullable?.execute()
+        barNullable?.fooNotNull?.execute()
+        barNullable?.fooNullable?.execute()
+    }
 }

j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.ide.kt

@@ -1,6 +1,6 @@
 class Test() {
-var str : String = 0
-{
-str = "Ola"
-}
+    var str: String = 0
+    {
+        str = "Ola"
+    }
 }

j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.kt

@@ -1,6 +1,6 @@
 open class Test() {
-var str : String? = null
-{
-str = "Ola"
-}
+    var str: String? = null
+    {
+        str = "Ola"
+    }
 }

j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.ide.kt

@@ -1,8 +1,8 @@
 class Test() {
-var str : String = 0
-class object {
-{
-str = "Ola"
-}
-}
+    var str: String = 0
+    class object {
+        {
+            str = "Ola"
+        }
+    }
 }

j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.kt

@@ -1,8 +1,8 @@
 open class Test() {
-var str : String? = null
-class object {
-{
-str = "Ola"
-}
-}
+    var str: String? = null
+    class object {
+        {
+            str = "Ola"
+        }
+    }
 }

j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.kt

@@ -1 +1 @@
-var a : DoubleArray? = doubleArray(1.0, 2.0, 3.0)
+var a: DoubleArray? = doubleArray(1.0, 2.0, 3.0)

j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.kt

@@ -1,4 +1,4 @@
-var a : Double = 0
-var b : Double = 0
-var c : Double = 0
-var ds : DoubleArray? = doubleArray((a).toDouble(), (b).toDouble(), (c).toDouble())
+var a: Double = 0
+var b: Double = 0
+var c: Double = 0
+var ds: DoubleArray? = doubleArray((a).toDouble(), (b).toDouble(), (c).toDouble())

j2k/tests/testData/ast/arrayInitializerExpression/floatArray.kt

@@ -1 +1 @@
-var a : FloatArray? = floatArray(1.0, 2.0, 3.0)
+var a: FloatArray? = floatArray(1.0, 2.0, 3.0)

j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.kt

@@ -1 +1 @@
-var a : IntArray? = IntArray(10)
+var a: IntArray? = IntArray(10)

j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.kt

@@ -1 +1 @@
-var a : Array<java.lang.Double?>? = array<java.lang.Double?>(1.0, 2.0, 3.0)
+var a: Array<java.lang.Double?>? = array<java.lang.Double?>(1.0, 2.0, 3.0)

j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.kt

@@ -1 +1 @@
-var a : Array<java.lang.Float?>? = array<java.lang.Float?>(1.0, 2.0, 3.0)
+var a: Array<java.lang.Float?>? = array<java.lang.Float?>(1.0, 2.0, 3.0)

j2k/tests/testData/ast/arrayInitializerExpression/newByte.kt

@@ -1 +1 @@
-var a : ByteArray? = byteArray(1, 2, 3)
+var a: ByteArray? = byteArray(1, 2, 3)

j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.kt

@@ -1 +1 @@
-var a : Array<Any?>? = arrayOfNulls<Any?>(10)
+var a: Array<Any?>? = arrayOfNulls<Any?>(10)

j2k/tests/testData/ast/arrayInitializerExpression/oneDim.kt

@@ -1 +1 @@
-var a : IntArray? = intArray(1, 2, 3)
+var a: IntArray? = intArray(1, 2, 3)

j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.kt

@@ -1,4 +1,4 @@
-var a : Int = 0
-var b : Int = 0
-var c : Int = 0
-var `is` : IntArray? = intArray(a, b, c)
+var a: Int = 0
+var b: Int = 0
+var c: Int = 0
+var `is`: IntArray? = intArray(a, b, c)

j2k/tests/testData/ast/arrayInitializerExpression/twoDim.kt

@@ -1 +1 @@
-var a : Array<IntArray?>? = array<IntArray?>(intArray(1, 2, 3), intArray(4, 5, 6), intArray(7, 8, 9))
+var a: Array<IntArray?>? = array<IntArray?>(intArray(1, 2, 3), intArray(4, 5, 6), intArray(7, 8, 9))

j2k/tests/testData/ast/arrayType/arrayInitializationStatement.kt

@@ -1 +1 @@
-var d2 : Array<IntArray?>? = array<IntArray?>()
+var d2: Array<IntArray?>? = array<IntArray?>()

j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.kt

@@ -1 +1 @@
-var d2 : Array<IntArray?>? = arrayOfNulls<IntArray?>(5)
+var d2: Array<IntArray?>? = arrayOfNulls<IntArray?>(5)

j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.ide.kt

@@ -1 +1 @@
-val d3 = Array<Array<IntArray>>(5, {arrayOfNulls<IntArray>(5)})
+val d3 = Array<Array<IntArray>>(5, { arrayOfNulls<IntArray>(5) })

j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.kt

@@ -1 +1 @@
-var d3 : Array<Array<IntArray?>?>? = Array<Array<IntArray?>?>(5, {arrayOfNulls<IntArray?>(5)})
+var d3: Array<Array<IntArray?>?>? = Array<Array<IntArray?>?>(5, { arrayOfNulls<IntArray?>(5) })

j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.ide.kt

@@ -1 +1 @@
-val d2 = Array<IntArray>(5, {IntArray(5)})
+val d2 = Array<IntArray>(5, { IntArray(5) })

j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.kt

@@ -1 +1 @@
-var d2 : Array<IntArray?>? = Array<IntArray?>(5, {IntArray(5)})
+var d2: Array<IntArray?>? = Array<IntArray?>(5, { IntArray(5) })

j2k/tests/testData/ast/arrayType/d2StringEmptyArray.ide.kt

@@ -1 +1 @@
-val ss = Array<Array<String>>(5, {arrayOfNulls<String>(5)})
+val ss = Array<Array<String>>(5, { arrayOfNulls<String>(5) })

j2k/tests/testData/ast/arrayType/d2StringEmptyArray.kt

@@ -1 +1 @@
-var ss : Array<Array<String?>?>? = Array<Array<String?>?>(5, {arrayOfNulls<String?>(5)})
+var ss: Array<Array<String?>?>? = Array<Array<String?>?>(5, { arrayOfNulls<String?>(5) })

j2k/tests/testData/ast/arrayType/d3StringEmptyArray.ide.kt

@@ -1 +1 @@
-val sss = Array<Array<Array<String>>>(5, {Array<Array<String>>(5, {arrayOfNulls<String>(5)})})
+val sss = Array<Array<Array<String>>>(5, { Array<Array<String>>(5, { arrayOfNulls<String>(5) }) })

j2k/tests/testData/ast/arrayType/d3StringEmptyArray.kt

@@ -1 +1 @@
-var sss : Array<Array<Array<String?>?>?>? = Array<Array<Array<String?>?>?>(5, {Array<Array<String?>?>(5, {arrayOfNulls<String?>(5)})})
+var sss: Array<Array<Array<String?>?>?>? = Array<Array<Array<String?>?>?>(5, { Array<Array<String?>?>(5, { arrayOfNulls<String?>(5) }) })

j2k/tests/testData/ast/arrayType/longArray.kt

@@ -1 +1 @@
-var a : LongArray? = longArray(1, 2, 3)
+var a: LongArray? = longArray(1, 2, 3)

j2k/tests/testData/ast/arrayType/methodArrayArgs.ide.kt

@@ -1,2 +1,2 @@
-fun fromArrayToCollection(a : Array<Foo>) {
+fun fromArrayToCollection(a: Array<Foo>) {
 }

j2k/tests/testData/ast/arrayType/methodArrayArgs.kt

@@ -1,2 +1,2 @@
-fun fromArrayToCollection(a : Array<Foo?>?) {
+fun fromArrayToCollection(a: Array<Foo?>?) {
 }

j2k/tests/testData/ast/arrayType/newIntArray.kt

@@ -1 +1 @@
-var a : IntArray? = intArray(1, 2, 3)
+var a: IntArray? = intArray(1, 2, 3)

j2k/tests/testData/ast/arrayType/newStringArray.kt

@@ -1 +1 @@
-var a : Array<String?>? = array<String?>("abc")
+var a: Array<String?>? = array<String?>("abc")

j2k/tests/testData/ast/assignmentExpression/nullability.ide.kt

@@ -1,8 +1,9 @@
 import java.util.BitSet
+
 class Foo() {
-fun foo(o : BitSet) {
-val o2 = o
-val foo = 0
-foo = o2.size()
-}
+    fun foo(o: BitSet) {
+        val o2 = o
+        val foo = 0
+        foo = o2.size()
+    }
 }

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

@@ -1,8 +1,9 @@
 import java.util.BitSet
+
 open class Foo() {
-open fun foo(o : BitSet?) {
-var o2 : BitSet? = o
-var foo : Int = 0
-foo = o2?.size()!!
-}
+    open fun foo(o: BitSet?) {
+        var o2: BitSet? = o
+        var foo: Int = 0
+        foo = o2?.size()!!
+    }
 }

j2k/tests/testData/ast/boxedType/Boxing.ide.kt

@@ -1,12 +1,13 @@
 import java.util.ArrayList
+
 class Boxing() {
-fun test() {
-val i = 0
-val n = 0.0.toFloat()
-i = 1
-val j = i!!
-val k = i!! + 2
-i = null
-j = i!!
-}
+    fun test() {
+        val i = 0
+        val n = 0.0.toFloat()
+        i = 1
+        val j = i!!
+        val k = i!! + 2
+        i = null
+        j = i!!
+    }
 }

j2k/tests/testData/ast/boxedType/Boxing.kt

@@ -1,12 +1,13 @@
 import java.util.ArrayList
+
 open class Boxing() {
-open fun test() {
-var i : Int? = 0
-var n : Number? = 0.0.toFloat()
-i = 1
-var j : Int = i!!
-var k : Int? = i!! + 2
-i = null
-j = i!!
-}
+    open fun test() {
+        var i: Int? = 0
+        var n: Number? = 0.0.toFloat()
+        i = 1
+        var j: Int = i!!
+        var k: Int? = i!! + 2
+        i = null
+        j = i!!
+    }
 }

j2k/tests/testData/ast/boxedType/boolean.kt

@@ -1 +1 @@
-var i : Boolean? = 10
+var i: Boolean? = 10

j2k/tests/testData/ast/boxedType/byte.kt

@@ -1 +1 @@
-var i : Byte? = 10
+var i: Byte? = 10

j2k/tests/testData/ast/boxedType/character.kt

@@ -1 +1 @@
-var i : Char? = 10
+var i: Char? = 10

j2k/tests/testData/ast/boxedType/double.kt

@@ -1 +1 @@
-var i : Double? = 10
+var i: Double? = 10

j2k/tests/testData/ast/boxedType/float.kt

@@ -1 +1 @@
-var i : Float? = 10
+var i: Float? = 10

j2k/tests/testData/ast/boxedType/integer.kt

@@ -1 +1 @@
-var i : Int? = 10
+var i: Int? = 10

j2k/tests/testData/ast/boxedType/kt-671.ide.kt

@@ -1,8 +1,9 @@
 package demo
+
 class Test() {
-fun test() {
-val i = Integer.valueOf(100)
-val s = 3
-val ss = java.lang.Short.valueOf(s)
-}
+    fun test() {
+        val i = Integer.valueOf(100)
+        val s = 3
+        val ss = java.lang.Short.valueOf(s)
+    }
 }

j2k/tests/testData/ast/boxedType/kt-671.kt

@@ -1,8 +1,9 @@
 package demo
+
 open class Test() {
-open fun test() {
-var i : Int? = Integer.valueOf(100)
-var s : Short = 3
-var ss : Short? = java.lang.Short.valueOf(s)
-}
+    open fun test() {
+        var i: Int? = Integer.valueOf(100)
+        var s: Short = 3
+        var ss: Short? = java.lang.Short.valueOf(s)
+    }
 }

j2k/tests/testData/ast/boxedType/long.kt

@@ -1 +1 @@
-var i : Long? = 10
+var i: Long? = 10

j2k/tests/testData/ast/boxedType/object.kt

@@ -1 +1 @@
-var i : Any? = 10
+var i: Any? = 10

j2k/tests/testData/ast/boxedType/short.kt

@@ -1 +1 @@
-var i : Short? = 10
+var i: Short? = 10

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

@@ -1,10 +1,10 @@
 class Library() {
-class object {
-val ourOut : java.io.PrintStream = 0
-}
+    class object {
+        val ourOut: java.io.PrintStream = 0
+    }
 }
 class User() {
-fun main() {
-Library.ourOut.print()
-}
+    fun main() {
+        Library.ourOut.print()
+    }
 }

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

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

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

@@ -1,15 +1,15 @@
 class Library() {
-class object {
-fun call() {
-}
-fun getString() : String {
-return ""
-}
-}
+    class object {
+        fun call() {
+        }
+        fun getString(): String {
+            return ""
+        }
+    }
 }
 class User() {
-fun main() {
-Library.call()
-Library.getString().isEmpty()
-}
+    fun main() {
+        Library.call()
+        Library.getString().isEmpty()
+    }
 }

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

@@ -1,15 +1,15 @@
 open class Library() {
-class object {
-open fun call() {
-}
-open fun getString() : String? {
-return ""
-}
-}
+    class object {
+        open fun call() {
+        }
+        open fun getString(): String? {
+            return ""
+        }
+    }
 }
 open class User() {
-open fun main() {
-Library.call()
-Library.getString()?.isEmpty()
-}
+    open fun main() {
+        Library.call()
+        Library.getString()?.isEmpty()
+    }
 }

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

@@ -1,16 +1,16 @@
 class Library() {
-fun call() {
-}
-fun getString() : String {
-return ""
-}
+    fun call() {
+    }
+    fun getString(): String {
+        return ""
+    }
 }
 class User() {
-fun main() {
-val lib = Library()
-lib.call()
-lib.getString().isEmpty()
-Library().call()
-Library().getString().isEmpty()
-}
+    fun main() {
+        val lib = Library()
+        lib.call()
+        lib.getString().isEmpty()
+        Library().call()
+        Library().getString().isEmpty()
+    }
 }

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

@@ -1,16 +1,16 @@
 open class Library() {
-open fun call() {
-}
-open fun getString() : String? {
-return ""
-}
+    open fun call() {
+    }
+    open fun getString(): String? {
+        return ""
+    }
 }
 open class User() {
-open fun main() {
-var lib : Library? = Library()
-lib?.call()
-lib?.getString()?.isEmpty()
-Library().call()
-Library().getString()?.isEmpty()
-}
+    open fun main() {
+        var lib: Library? = Library()
+        lib?.call()
+        lib?.getString()?.isEmpty()
+        Library().call()
+        Library().getString()?.isEmpty()
+    }
 }

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

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

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

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

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

@@ -1,17 +1,18 @@
 package test
+
 public class Short() {
-class object {
-public fun valueOf(value : String) : Short {
-return Short()
-}
-}
+    class object {
+        public fun valueOf(value: String): Short {
+            return Short()
+        }
+    }
 }
 class Test() {
-class object {
-public fun test() {
-test.Short.valueOf("1")
-test.Short.valueOf("1")
-java.lang.Short.valueOf("1")
-}
-}
+    class object {
+        public fun test() {
+            test.Short.valueOf("1")
+            test.Short.valueOf("1")
+            java.lang.Short.valueOf("1")
+        }
+    }
 }

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

@@ -1,17 +1,18 @@
 package test
+
 public open class Short() {
-class object {
-public open fun valueOf(value : String?) : Short? {
-return Short()
-}
-}
+    class object {
+        public open fun valueOf(value: String?): Short? {
+            return Short()
+        }
+    }
 }
 open class Test() {
-class object {
-public open fun test() {
-test.Short.valueOf("1")
-test.Short.valueOf("1")
-java.lang.Short.valueOf("1")
-}
-}
+    class object {
+        public open fun test() {
+            test.Short.valueOf("1")
+            test.Short.valueOf("1")
+            java.lang.Short.valueOf("1")
+        }
+    }
 }

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

@@ -1,6 +1,6 @@
 abstract class A() {
-abstract fun callme()
-fun callmetoo() {
-print("This is a concrete method.")
-}
+    abstract fun callme()
+    fun callmetoo() {
+        print("This is a concrete method.")
+    }
 }

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

@@ -1,6 +1,6 @@
 abstract class A() {
-abstract fun callme()
-open fun callmetoo() {
-print("This is a concrete method.")
-}
+    abstract fun callme()
+    open fun callmetoo() {
+        print("This is a concrete method.")
+    }
 }

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

@@ -1,10 +1,10 @@
 abstract class Shape() {
-public var color : String = 0
-public fun setColor(c : String) {
-color = c
-}
-public fun getColor() : String {
-return color
-}
-public abstract fun area() : Double
+    public var color: String = 0
+    public fun setColor(c: String) {
+        color = c
+    }
+    public fun getColor(): String {
+        return color
+    }
+    public abstract fun area(): Double
 }

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

@@ -1,10 +1,10 @@
 abstract class Shape() {
-public var color : String? = null
-public open fun setColor(c : String?) {
-color = c
-}
-public open fun getColor() : String? {
-return color
-}
-public abstract fun area() : Double
+    public var color: String? = null
+    public open fun setColor(c: String?) {
+        color = c
+    }
+    public open fun getColor(): String? {
+        return color
+    }
+    public abstract fun area(): Double
 }

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

@@ -1,8 +1,8 @@
 class T() {
-fun main() {
-}
-fun i() : Int {
-}
-fun s() : String {
-}
+    fun main() {
+    }
+    fun i(): Int {
+    }
+    fun s(): String {
+    }
 }

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

@@ -1,8 +1,8 @@
 class T() {
-fun main() {
-}
-fun i() : Int {
-}
-fun s() : String? {
-}
+    fun main() {
+    }
+    fun i(): Int {
+    }
+    fun s(): String? {
+    }
 }

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

@@ -1,4 +1,4 @@
 class T() {
-var a : String = "abc"
-var b : Int = 10
+    var a: String = "abc"
+    var b: Int = 10
 }

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

@@ -1,4 +1,4 @@
 class T() {
-var a : String? = "abc"
-var b : Int = 10
+    var a: String? = "abc"
+    var b: Int = 10
 }

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

@@ -1,5 +1,5 @@
 class T() {
-var a : String = 0
-var b : String = 0
-var c : String = "abc"
+    var a: String = 0
+    var b: String = 0
+    var c: String = "abc"
 }

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

@@ -1,5 +1,5 @@
 class T() {
-var a : String? = null
-var b : String? = null
-var c : String? = "abc"
+    var a: String? = null
+    var b: String? = null
+    var c: String? = "abc"
 }

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

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

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

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

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

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

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

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

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

@@ -1,22 +1,24 @@
 package demo
+
 import java.util.HashMap
+
 class Test() {
-class object {
-fun init() : Test {
-val __ = Test()
-return __
-}
-fun init(s : String) : Test {
-val __ = Test()
-return __
-}
-}
+    class object {
+        fun init(): Test {
+            val __ = Test()
+            return __
+        }
+        fun init(s: String): Test {
+            val __ = Test()
+            return __
+        }
+    }
 }
 class User() {
-fun main() {
-val m = HashMap(1)
-val m2 = HashMap(10)
-val t1 = Test.init()
-val t2 = Test.init("")
-}
+    fun main() {
+        val m = HashMap(1)
+        val m2 = HashMap(10)
+        val t1 = Test.init()
+        val t2 = Test.init("")
+    }
 }

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

@@ -1,22 +1,24 @@
 package demo
+
 import java.util.HashMap
+
 open class Test() {
-class object {
-open fun init() : Test {
-val __ = Test()
-return __
-}
-open fun init(s : String?) : Test {
-val __ = Test()
-return __
-}
-}
+    class object {
+        open fun init(): Test {
+            val __ = Test()
+            return __
+        }
+        open fun init(s: String?): Test {
+            val __ = Test()
+            return __
+        }
+    }
 }
 open class User() {
-open fun main() {
-var m : HashMap<Any?, Any?>? = HashMap(1)
-var m2 : HashMap<Any?, Any?>? = HashMap(10)
-var t1 : Test? = Test.init()
-var t2 : Test? = Test.init("")
-}
+    open fun main() {
+        var m: HashMap<Any?, Any?>? = HashMap(1)
+        var m2: HashMap<Any?, Any?>? = HashMap(10)
+        var t1: Test? = Test.init()
+        var t2: Test? = Test.init("")
+    }
 }

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

@@ -1,8 +1,8 @@
 class S() {
-fun sB() : Boolean {
-return true
-}
-class object {
-var myI : Int = 10
-}
+    fun sB(): Boolean {
+        return true
+    }
+    class object {
+        var myI: Int = 10
+    }
 }

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

@@ -1,8 +1,8 @@
 class S() {
-fun sB() : Boolean {
-return true
-}
-class object {
-var myI : Int = 10
-}
+    fun sB(): Boolean {
+        return true
+    }
+    class object {
+        var myI: Int = 10
+    }
 }

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

@@ -1,7 +1,7 @@
 class S() {
-class object {
-fun staticF() : Boolean {
-return true
-}
-}
+    class object {
+        fun staticF(): Boolean {
+            return true
+        }
+    }
 }

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

@@ -1,7 +1,7 @@
 class S() {
-class object {
-fun staticF() : Boolean {
-return true
-}
-}
+    class object {
+        fun staticF(): Boolean {
+            return true
+        }
+    }
 }

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

@@ -1,10 +1,10 @@
 class S() {
-fun sB() : Boolean {
-return true
-}
-class object {
-fun sI() : Int {
-return 1
-}
-}
+    fun sB(): Boolean {
+        return true
+    }
+    class object {
+        fun sI(): Int {
+            return 1
+        }
+    }
 }

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

@@ -1,10 +1,10 @@
 class S() {
-fun sB() : Boolean {
-return true
-}
-class object {
-fun sI() : Int {
-return 1
-}
-}
+    fun sB(): Boolean {
+        return true
+    }
+    class object {
+        fun sI(): Int {
+            return 1
+        }
+    }
 }

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

@@ -1,4 +1,4 @@
 public class MyClass() {
-private fun init(arg1 : Int, arg2 : Int, arg3 : Int) {
-}
+    private fun init(arg1: Int, arg2: Int, arg3: Int) {
+    }
 }

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

@@ -1,4 +1,4 @@
 public open class MyClass() {
-private fun init(arg1 : Int, arg2 : Int, arg3 : Int) {
-}
+    private fun init(arg1: Int, arg2: Int, arg3: Int) {
+    }
 }

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

@@ -1,10 +1,10 @@
 class S() {
-class object {
-fun sB() : Boolean {
-return true
-}
-fun sI() : Int {
-return 1
-}
-}
+    class object {
+        fun sB(): Boolean {
+            return true
+        }
+        fun sI(): Int {
+            return 1
+        }
+    }
 }

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

@@ -1,10 +1,10 @@
 class S() {
-class object {
-fun sB() : Boolean {
-return true
-}
-fun sI() : Int {
-return 1
-}
-}
+    class object {
+        fun sB(): Boolean {
+            return true
+        }
+        fun sI(): Int {
+            return 1
+        }
+    }
 }

j2k/tests/testData/ast/classExpression/complexExample.kt

@@ -1 +1 @@
-var constrArgTypes : Array<Class<*>?>? = array<Class<*>?>(javaClass<Array<String?>>(), javaClass<String>())
+var constrArgTypes: Array<Class<*>?>? = array<Class<*>?>(javaClass<Array<String?>>(), javaClass<String>())

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

@@ -1,21 +1,21 @@
-class C(arg1 : Int, arg2 : Int, arg3 : Int) {
-class object {
-fun init(arg1 : Int, arg2 : Int) : C {
-val __ = C(arg1, arg2, 0)
-return __
-}
-fun init(arg1 : Int) : C {
-val __ = C(arg1, 0, 0)
-return __
-}
-}
+class C(arg1: Int, arg2: Int, arg3: Int) {
+    class object {
+        fun init(arg1: Int, arg2: Int): C {
+            val __ = C(arg1, arg2, 0)
+            return __
+        }
+        fun init(arg1: Int): C {
+            val __ = C(arg1, 0, 0)
+            return __
+        }
+    }
 }
 public class User() {
-class object {
-public fun main() {
-val c1 = C(100, 100, 100)
-val c2 = C.init(100, 100)
-val c3 = C.init(100)
-}
-}
+    class object {
+        public fun main() {
+            val c1 = C(100, 100, 100)
+            val c2 = C.init(100, 100)
+            val c3 = C.init(100)
+        }
+    }
 }

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

@@ -1,21 +1,21 @@
-open class C(arg1 : Int, arg2 : Int, arg3 : Int) {
-class object {
-open fun init(arg1 : Int, arg2 : Int) : C {
-val __ = C(arg1, arg2, 0)
-return __
-}
-open fun init(arg1 : Int) : C {
-val __ = C(arg1, 0, 0)
-return __
-}
-}
+open class C(arg1: Int, arg2: Int, arg3: Int) {
+    class object {
+        open fun init(arg1: Int, arg2: Int): C {
+            val __ = C(arg1, arg2, 0)
+            return __
+        }
+        open fun init(arg1: Int): C {
+            val __ = C(arg1, 0, 0)
+            return __
+        }
+    }
 }
 public open class User() {
-class object {
-public open fun main() {
-var c1 : C? = C(100, 100, 100)
-var c2 : C? = C.init(100, 100)
-var c3 : C? = C.init(100)
-}
-}
+    class object {
+        public open fun main() {
+            var c1: C? = C(100, 100, 100)
+            var c2: C? = C.init(100, 100)
+            var c3: C? = C.init(100)
+        }
+    }
 }

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

@@ -1,33 +1,33 @@
-class C(arg1 : Int) {
-val myArg1 : Int
-var myArg2 : Int = 0
-var myArg3 : Int = 0
-{
-myArg1 = arg1
-myArg2 = 0
-myArg3 = 0
-}
-class object {
-fun init(arg1 : Int, arg2 : Int, arg3 : Int) : C {
-val __ = C(arg1)
-__.myArg2 = arg2
-__.myArg3 = arg3
-return __
-}
-fun init(arg1 : Int, arg2 : Int) : C {
-val __ = C(arg1)
-__.myArg2 = arg2
-__.myArg3 = 0
-return __
-}
-}
+class C(arg1: Int) {
+    val myArg1: Int
+    var myArg2: Int = 0
+    var myArg3: Int = 0
+    {
+        myArg1 = arg1
+        myArg2 = 0
+        myArg3 = 0
+    }
+    class object {
+        fun init(arg1: Int, arg2: Int, arg3: Int): C {
+            val __ = C(arg1)
+            __.myArg2 = arg2
+            __.myArg3 = arg3
+            return __
+        }
+        fun init(arg1: Int, arg2: Int): C {
+            val __ = C(arg1)
+            __.myArg2 = arg2
+            __.myArg3 = 0
+            return __
+        }
+    }
 }
 public class User() {
-class object {
-public fun main() {
-val c1 = C.init(100, 100, 100)
-val c2 = C.init(100, 100)
-val c3 = C(100)
-}
-}
+    class object {
+        public fun main() {
+            val c1 = C.init(100, 100, 100)
+            val c2 = C.init(100, 100)
+            val c3 = C(100)
+        }
+    }
 }

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

@@ -1,33 +1,33 @@
-open class C(arg1 : Int) {
-val myArg1 : Int
-var myArg2 : Int = 0
-var myArg3 : Int = 0
-{
-myArg1 = arg1
-myArg2 = 0
-myArg3 = 0
-}
-class object {
-open fun init(arg1 : Int, arg2 : Int, arg3 : Int) : C {
-val __ = C(arg1)
-__.myArg2 = arg2
-__.myArg3 = arg3
-return __
-}
-open fun init(arg1 : Int, arg2 : Int) : C {
-val __ = C(arg1)
-__.myArg2 = arg2
-__.myArg3 = 0
-return __
-}
-}
+open class C(arg1: Int) {
+    val myArg1: Int
+    var myArg2: Int = 0
+    var myArg3: Int = 0
+    {
+        myArg1 = arg1
+        myArg2 = 0
+        myArg3 = 0
+    }
+    class object {
+        open fun init(arg1: Int, arg2: Int, arg3: Int): C {
+            val __ = C(arg1)
+            __.myArg2 = arg2
+            __.myArg3 = arg3
+            return __
+        }
+        open fun init(arg1: Int, arg2: Int): C {
+            val __ = C(arg1)
+            __.myArg2 = arg2
+            __.myArg3 = 0
+            return __
+        }
+    }
 }
 public open class User() {
-class object {
-public open fun main() {
-var c1 : C? = C.init(100, 100, 100)
-var c2 : C? = C.init(100, 100)
-var c3 : C? = C(100)
-}
-}
+    class object {
+        public open fun main() {
+            var c1: C? = C.init(100, 100, 100)
+            var c2: C? = C.init(100, 100)
+            var c3: C? = C(100)
+        }
+    }
 }

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

@@ -1,45 +1,46 @@
 package org.test.customer
-class Customer(first : String, last : String) {
-public val _firstName : String
-public val _lastName : String
-public fun getFirstName() : String {
-return _firstName
-}
-public fun getLastName() : String {
-return _lastName
-}
-private fun doSmthBefore() {
-}
-private fun doSmthAfter() {
-}
-{
-doSmthBefore()
-_firstName = first
-_lastName = last
-doSmthAfter()
-}
+
+class Customer(first: String, last: String) {
+    public val _firstName: String
+    public val _lastName: String
+    public fun getFirstName(): String {
+        return _firstName
+    }
+    public fun getLastName(): String {
+        return _lastName
+    }
+    private fun doSmthBefore() {
+    }
+    private fun doSmthAfter() {
+    }
+    {
+        doSmthBefore()
+        _firstName = first
+        _lastName = last
+        doSmthAfter()
+    }
 }
 class CustomerBuilder() {
-public var _firstName : String = "Homer"
-public var _lastName : String = "Simpson"
-public fun WithFirstName(firstName : String) : CustomerBuilder {
-_firstName = firstName
-return this
-}
-public fun WithLastName(lastName : String) : CustomerBuilder {
-_lastName = lastName
-return this
-}
-public fun Build() : Customer {
-return Customer(_firstName, _lastName)
-}
+    public var _firstName: String = "Homer"
+    public var _lastName: String = "Simpson"
+    public fun WithFirstName(firstName: String): CustomerBuilder {
+        _firstName = firstName
+        return this
+    }
+    public fun WithLastName(lastName: String): CustomerBuilder {
+        _lastName = lastName
+        return this
+    }
+    public fun Build(): Customer {
+        return Customer(_firstName, _lastName)
+    }
 }
 public class User() {
-class object {
-public fun main() {
-val customer = CustomerBuilder().WithFirstName("Homer").WithLastName("Simpson").Build()
-System.out.println(customer.getFirstName())
-System.out.println(customer.getLastName())
-}
-}
+    class object {
+        public fun main() {
+            val customer = CustomerBuilder().WithFirstName("Homer").WithLastName("Simpson").Build()
+            System.out.println(customer.getFirstName())
+            System.out.println(customer.getLastName())
+        }
+    }
 }

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

@@ -1,45 +1,46 @@
 package org.test.customer
-open class Customer(first : String?, last : String?) {
-public val _firstName : String?
-public val _lastName : String?
-public open fun getFirstName() : String? {
-return _firstName
-}
-public open fun getLastName() : String? {
-return _lastName
-}
-private fun doSmthBefore() {
-}
-private fun doSmthAfter() {
-}
-{
-doSmthBefore()
-_firstName = first
-_lastName = last
-doSmthAfter()
-}
+
+open class Customer(first: String?, last: String?) {
+    public val _firstName: String?
+    public val _lastName: String?
+    public open fun getFirstName(): String? {
+        return _firstName
+    }
+    public open fun getLastName(): String? {
+        return _lastName
+    }
+    private fun doSmthBefore() {
+    }
+    private fun doSmthAfter() {
+    }
+    {
+        doSmthBefore()
+        _firstName = first
+        _lastName = last
+        doSmthAfter()
+    }
 }
 open class CustomerBuilder() {
-public var _firstName : String? = "Homer"
-public var _lastName : String? = "Simpson"
-public open fun WithFirstName(firstName : String?) : CustomerBuilder? {
-_firstName = firstName
-return this
-}
-public open fun WithLastName(lastName : String?) : CustomerBuilder? {
-_lastName = lastName
-return this
-}
-public open fun Build() : Customer? {
-return Customer(_firstName, _lastName)
-}
+    public var _firstName: String? = "Homer"
+    public var _lastName: String? = "Simpson"
+    public open fun WithFirstName(firstName: String?): CustomerBuilder? {
+        _firstName = firstName
+        return this
+    }
+    public open fun WithLastName(lastName: String?): CustomerBuilder? {
+        _lastName = lastName
+        return this
+    }
+    public open fun Build(): Customer? {
+        return Customer(_firstName, _lastName)
+    }
 }
 public open class User() {
-class object {
-public open fun main() {
-var customer : Customer? = CustomerBuilder().WithFirstName("Homer")?.WithLastName("Simpson")?.Build()
-System.out?.println(customer?.getFirstName())
-System.out?.println(customer?.getLastName())
-}
-}
+    class object {
+        public open fun main() {
+            var customer: Customer? = CustomerBuilder().WithFirstName("Homer")?.WithLastName("Simpson")?.Build()
+            System.out?.println(customer?.getFirstName())
+            System.out?.println(customer?.getLastName())
+        }
+    }
 }

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

@@ -1,37 +1,37 @@
-public class Identifier<T>(_myName : T, _myHasDollar : Boolean) {
-private val myName : T
-private var myHasDollar : Boolean = false
-private var myNullable : Boolean = true
-public fun getName() : T {
-return myName
-}
-{
-myName = _myName
-myHasDollar = _myHasDollar
-}
-class object {
-public fun <T> init(name : T) : Identifier<T> {
-val __ = Identifier(name, false)
-return __
-}
-public fun <T> init(name : T, isNullable : Boolean) : Identifier<T> {
-val __ = Identifier(name, false)
-__.myNullable = isNullable
-return __
-}
-public fun <T> init(name : T, hasDollar : Boolean, isNullable : Boolean) : Identifier<T> {
-val __ = Identifier(name, hasDollar)
-__.myNullable = isNullable
-return __
-}
-}
+public class Identifier<T>(_myName: T, _myHasDollar: Boolean) {
+    private val myName: T
+    private var myHasDollar: Boolean = false
+    private var myNullable: Boolean = true
+    public fun getName(): T {
+        return myName
+    }
+    {
+        myName = _myName
+        myHasDollar = _myHasDollar
+    }
+    class object {
+        public fun <T> init(name: T): Identifier<T> {
+            val __ = Identifier(name, false)
+            return __
+        }
+        public fun <T> init(name: T, isNullable: Boolean): Identifier<T> {
+            val __ = Identifier(name, false)
+            __.myNullable = isNullable
+            return __
+        }
+        public fun <T> init(name: T, hasDollar: Boolean, isNullable: Boolean): Identifier<T> {
+            val __ = Identifier(name, hasDollar)
+            __.myNullable = isNullable
+            return __
+        }
+    }
 }
 public class User() {
-class object {
-public fun main() {
-val i1 = Identifier.init<String>("name", false, true)
-val i2 = Identifier.init<String>("name", false)
-val i3 = Identifier.init<String>("name")
-}
-}
+    class object {
+        public fun main() {
+            val i1 = Identifier.init<String>("name", false, true)
+            val i2 = Identifier.init<String>("name", false)
+            val i3 = Identifier.init<String>("name")
+        }
+    }
 }

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

@@ -1,37 +1,37 @@
-public open class Identifier<T>(_myName : T?, _myHasDollar : Boolean) {
-private val myName : T?
-private var myHasDollar : Boolean = false
-private var myNullable : Boolean = true
-public open fun getName() : T? {
-return myName
-}
-{
-myName = _myName
-myHasDollar = _myHasDollar
-}
-class object {
-public open fun <T> init(name : T?) : Identifier<T> {
-val __ = Identifier(name, false)
-return __
-}
-public open fun <T> init(name : T?, isNullable : Boolean) : Identifier<T> {
-val __ = Identifier(name, false)
-__.myNullable = isNullable
-return __
-}
-public open fun <T> init(name : T?, hasDollar : Boolean, isNullable : Boolean) : Identifier<T> {
-val __ = Identifier(name, hasDollar)
-__.myNullable = isNullable
-return __
-}
-}
+public open class Identifier<T>(_myName: T?, _myHasDollar: Boolean) {
+    private val myName: T?
+    private var myHasDollar: Boolean = false
+    private var myNullable: Boolean = true
+    public open fun getName(): T? {
+        return myName
+    }
+    {
+        myName = _myName
+        myHasDollar = _myHasDollar
+    }
+    class object {
+        public open fun <T> init(name: T?): Identifier<T> {
+            val __ = Identifier(name, false)
+            return __
+        }
+        public open fun <T> init(name: T?, isNullable: Boolean): Identifier<T> {
+            val __ = Identifier(name, false)
+            __.myNullable = isNullable
+            return __
+        }
+        public open fun <T> init(name: T?, hasDollar: Boolean, isNullable: Boolean): Identifier<T> {
+            val __ = Identifier(name, hasDollar)
+            __.myNullable = isNullable
+            return __
+        }
+    }
 }
 public open class User() {
-class object {
-public open fun main() {
-var i1 : Identifier<*>? = Identifier.init<String?>("name", false, true)
-var i2 : Identifier<*>? = Identifier.init<String?>("name", false)
-var i3 : Identifier<*>? = Identifier.init<String?>("name")
-}
-}
+    class object {
+        public open fun main() {
+            var i1: Identifier<*>? = Identifier.init<String?>("name", false, true)
+            var i2: Identifier<*>? = Identifier.init<String?>("name", false)
+            var i3: Identifier<*>? = Identifier.init<String?>("name")
+        }
+    }
 }

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

@@ -1,37 +1,37 @@
-public class Identifier(_myName : String, _myHasDollar : Boolean) {
-private val myName : String
-private var myHasDollar : Boolean = false
-private var myNullable : Boolean = true
-public fun getName() : String {
-return myName
-}
-{
-myName = _myName
-myHasDollar = _myHasDollar
-}
-class object {
-public fun init(name : String) : Identifier {
-val __ = Identifier(name, false)
-return __
-}
-public fun init(name : String, isNullable : Boolean) : Identifier {
-val __ = Identifier(name, false)
-__.myNullable = isNullable
-return __
-}
-public fun init(name : String, hasDollar : Boolean, isNullable : Boolean) : Identifier {
-val __ = Identifier(name, hasDollar)
-__.myNullable = isNullable
-return __
-}
-}
+public class Identifier(_myName: String, _myHasDollar: Boolean) {
+    private val myName: String
+    private var myHasDollar: Boolean = false
+    private var myNullable: Boolean = true
+    public fun getName(): String {
+        return myName
+    }
+    {
+        myName = _myName
+        myHasDollar = _myHasDollar
+    }
+    class object {
+        public fun init(name: String): Identifier {
+            val __ = Identifier(name, false)
+            return __
+        }
+        public fun init(name: String, isNullable: Boolean): Identifier {
+            val __ = Identifier(name, false)
+            __.myNullable = isNullable
+            return __
+        }
+        public fun init(name: String, hasDollar: Boolean, isNullable: Boolean): Identifier {
+            val __ = Identifier(name, hasDollar)
+            __.myNullable = isNullable
+            return __
+        }
+    }
 }
 public class User() {
-class object {
-public fun main() {
-val i1 = Identifier.init("name", false, true)
-val i2 = Identifier.init("name", false)
-val i3 = Identifier.init("name")
-}
-}
+    class object {
+        public fun main() {
+            val i1 = Identifier.init("name", false, true)
+            val i2 = Identifier.init("name", false)
+            val i3 = Identifier.init("name")
+        }
+    }
 }

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

@@ -1,37 +1,37 @@
-public open class Identifier(_myName : String?, _myHasDollar : Boolean) {
-private val myName : String?
-private var myHasDollar : Boolean = false
-private var myNullable : Boolean = true
-public open fun getName() : String? {
-return myName
-}
-{
-myName = _myName
-myHasDollar = _myHasDollar
-}
-class object {
-public open fun init(name : String?) : Identifier {
-val __ = Identifier(name, false)
-return __
-}
-public open fun init(name : String?, isNullable : Boolean) : Identifier {
-val __ = Identifier(name, false)
-__.myNullable = isNullable
-return __
-}
-public open fun init(name : String?, hasDollar : Boolean, isNullable : Boolean) : Identifier {
-val __ = Identifier(name, hasDollar)
-__.myNullable = isNullable
-return __
-}
-}
+public open class Identifier(_myName: String?, _myHasDollar: Boolean) {
+    private val myName: String?
+    private var myHasDollar: Boolean = false
+    private var myNullable: Boolean = true
+    public open fun getName(): String? {
+        return myName
+    }
+    {
+        myName = _myName
+        myHasDollar = _myHasDollar
+    }
+    class object {
+        public open fun init(name: String?): Identifier {
+            val __ = Identifier(name, false)
+            return __
+        }
+        public open fun init(name: String?, isNullable: Boolean): Identifier {
+            val __ = Identifier(name, false)
+            __.myNullable = isNullable
+            return __
+        }
+        public open fun init(name: String?, hasDollar: Boolean, isNullable: Boolean): Identifier {
+            val __ = Identifier(name, hasDollar)
+            __.myNullable = isNullable
+            return __
+        }
+    }
 }
 public open class User() {
-class object {
-public open fun main() {
-var i1 : Identifier? = Identifier.init("name", false, true)
-var i2 : Identifier? = Identifier.init("name", false)
-var i3 : Identifier? = Identifier.init("name")
-}
-}
+    class object {
+        public open fun main() {
+            var i1: Identifier? = Identifier.init("name", false, true)
+            var i2: Identifier? = Identifier.init("name", false)
+            var i3: Identifier? = Identifier.init("name")
+        }
+    }
 }

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

@@ -1,40 +1,40 @@
-public class Test(_myName : String, _a : Boolean, _b : Double, _c : Float, _d : Long, _e : Int, _f : Short, _g : Char) {
-private val myName : String
-private var a : Boolean = false
-private var b : Double = 0.toDouble()
-private var c : Float = 0.toFloat()
-private var d : Long = 0
-private var e : Int = 0
-private var f : Short = 0
-private var g : Char = ' '
-{
-myName = _myName
-a = _a
-b = _b
-c = _c
-d = _d
-e = _e
-f = _f
-g = _g
-}
-class object {
-public fun init() : Test {
-val __ = Test(0, false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ')
-return __
-}
-public fun init(name : String) : Test {
-val __ = Test(foo(name), false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ')
-return __
-}
-fun foo(n : String) : String {
-return ""
-}
-}
+public class Test(_myName: String, _a: Boolean, _b: Double, _c: Float, _d: Long, _e: Int, _f: Short, _g: Char) {
+    private val myName: String
+    private var a: Boolean = false
+    private var b: Double = 0.toDouble()
+    private var c: Float = 0.toFloat()
+    private var d: Long = 0
+    private var e: Int = 0
+    private var f: Short = 0
+    private var g: Char = ' '
+    {
+        myName = _myName
+        a = _a
+        b = _b
+        c = _c
+        d = _d
+        e = _e
+        f = _f
+        g = _g
+    }
+    class object {
+        public fun init(): Test {
+            val __ = Test(0, false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ')
+            return __
+        }
+        public fun init(name: String): Test {
+            val __ = Test(foo(name), false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ')
+            return __
+        }
+        fun foo(n: String): String {
+            return ""
+        }
+    }
 }
 public class User() {
-class object {
-public fun main() {
-val t = Test.init("name")
-}
-}
+    class object {
+        public fun main() {
+            val t = Test.init("name")
+        }
+    }
 }