diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index f3e0c9e318e..04495fdb587 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/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); diff --git a/j2k/tests/j2k-tests.iml b/j2k/tests/j2k-tests.iml index bd44f2f04ce..d684b61ed71 100644 --- a/j2k/tests/j2k-tests.iml +++ b/j2k/tests/j2k-tests.iml @@ -14,6 +14,7 @@ + diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt b/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt index 29971e119cc..536a2c23b8c 100644 --- a/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt +++ b/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() } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt index c52688ffbc9..7fd9a479613 100644 --- a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.ide.kt +++ b/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 + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNull.kt index 95a3ab53310..72743d2556e 100644 --- a/j2k/tests/testData/ast/annotations/jetbrainsNotNull.kt +++ b/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 + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt index 19ae91be185..133f1efe193 100644 --- a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.ide.kt +++ b/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() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt b/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt index d0711dba0c2..94b554573f8 100644 --- a/j2k/tests/testData/ast/annotations/jetbrainsNotNullChainExpr.kt +++ b/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() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.ide.kt b/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.ide.kt index 22280a2ab6c..e1e6f1ed90f 100644 --- a/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.ide.kt +++ b/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" + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.kt b/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.kt index bf84ae34578..664c5538140 100644 --- a/j2k/tests/testData/ast/anonymousBlock/oneAnonBlock.kt +++ b/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" + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.ide.kt b/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.ide.kt index a60f634522f..71539ec1470 100644 --- a/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.ide.kt +++ b/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" + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.kt b/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.kt index 5c8649fbcf0..ccd6b065994 100644 --- a/j2k/tests/testData/ast/anonymousBlock/oneStaticAnonBlock.kt +++ b/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" + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.kt b/j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.kt index c2d0ab03352..cc1f3d31ab8 100644 --- a/j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.kt +++ b/j2k/tests/testData/ast/arrayInitializerExpression/doubleArray.kt @@ -1 +1 @@ -var a : DoubleArray? = doubleArray(1.0, 2.0, 3.0) \ No newline at end of file +var a: DoubleArray? = doubleArray(1.0, 2.0, 3.0) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.kt b/j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.kt index 2ccb8da60c1..4827c8d6a7a 100644 --- a/j2k/tests/testData/ast/arrayInitializerExpression/doubleArrayWithVariables.kt +++ b/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()) \ No newline at end of file +var a: Double = 0 +var b: Double = 0 +var c: Double = 0 +var ds: DoubleArray? = doubleArray((a).toDouble(), (b).toDouble(), (c).toDouble()) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/floatArray.kt b/j2k/tests/testData/ast/arrayInitializerExpression/floatArray.kt index b824bd21e48..cc5cf46981f 100644 --- a/j2k/tests/testData/ast/arrayInitializerExpression/floatArray.kt +++ b/j2k/tests/testData/ast/arrayInitializerExpression/floatArray.kt @@ -1 +1 @@ -var a : FloatArray? = floatArray(1.0, 2.0, 3.0) \ No newline at end of file +var a: FloatArray? = floatArray(1.0, 2.0, 3.0) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.kt b/j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.kt index f63facdd5a7..9b17a7578d2 100644 --- a/j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.kt +++ b/j2k/tests/testData/ast/arrayInitializerExpression/intArrayWithLength.kt @@ -1 +1 @@ -var a : IntArray? = IntArray(10) \ No newline at end of file +var a: IntArray? = IntArray(10) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.kt b/j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.kt index c3a5bb91fd6..a72f4f3fca6 100644 --- a/j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.kt +++ b/j2k/tests/testData/ast/arrayInitializerExpression/javaLangDoubleArray.kt @@ -1 +1 @@ -var a : Array? = array(1.0, 2.0, 3.0) \ No newline at end of file +var a: Array? = array(1.0, 2.0, 3.0) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.kt b/j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.kt index d31d26a7c74..a16630a32b0 100644 --- a/j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.kt +++ b/j2k/tests/testData/ast/arrayInitializerExpression/javaLangFloatArray.kt @@ -1 +1 @@ -var a : Array? = array(1.0, 2.0, 3.0) \ No newline at end of file +var a: Array? = array(1.0, 2.0, 3.0) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/newByte.kt b/j2k/tests/testData/ast/arrayInitializerExpression/newByte.kt index 2f0ce90f341..475d8e79643 100644 --- a/j2k/tests/testData/ast/arrayInitializerExpression/newByte.kt +++ b/j2k/tests/testData/ast/arrayInitializerExpression/newByte.kt @@ -1 +1 @@ -var a : ByteArray? = byteArray(1, 2, 3) \ No newline at end of file +var a: ByteArray? = byteArray(1, 2, 3) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.kt b/j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.kt index 2b294296ee3..aa66c312f36 100644 --- a/j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.kt +++ b/j2k/tests/testData/ast/arrayInitializerExpression/objectArrayWithLength.kt @@ -1 +1 @@ -var a : Array? = arrayOfNulls(10) \ No newline at end of file +var a: Array? = arrayOfNulls(10) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/oneDim.kt b/j2k/tests/testData/ast/arrayInitializerExpression/oneDim.kt index 19b3af3f5c4..00bb8182165 100644 --- a/j2k/tests/testData/ast/arrayInitializerExpression/oneDim.kt +++ b/j2k/tests/testData/ast/arrayInitializerExpression/oneDim.kt @@ -1 +1 @@ -var a : IntArray? = intArray(1, 2, 3) \ No newline at end of file +var a: IntArray? = intArray(1, 2, 3) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.kt b/j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.kt index a1b91cfa3ab..257787af11d 100644 --- a/j2k/tests/testData/ast/arrayInitializerExpression/oneDimWithVariables.kt +++ b/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) \ No newline at end of file +var a: Int = 0 +var b: Int = 0 +var c: Int = 0 +var `is`: IntArray? = intArray(a, b, c) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayInitializerExpression/twoDim.kt b/j2k/tests/testData/ast/arrayInitializerExpression/twoDim.kt index 4ccc886bd71..aacc8b02775 100644 --- a/j2k/tests/testData/ast/arrayInitializerExpression/twoDim.kt +++ b/j2k/tests/testData/ast/arrayInitializerExpression/twoDim.kt @@ -1 +1 @@ -var a : Array? = array(intArray(1, 2, 3), intArray(4, 5, 6), intArray(7, 8, 9)) \ No newline at end of file +var a: Array? = array(intArray(1, 2, 3), intArray(4, 5, 6), intArray(7, 8, 9)) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatement.kt b/j2k/tests/testData/ast/arrayType/arrayInitializationStatement.kt index 146484f79d7..e3273f111c8 100644 --- a/j2k/tests/testData/ast/arrayType/arrayInitializationStatement.kt +++ b/j2k/tests/testData/ast/arrayType/arrayInitializationStatement.kt @@ -1 +1 @@ -var d2 : Array? = array() \ No newline at end of file +var d2: Array? = array() \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.kt b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.kt index a55da469576..81eb8c77ac7 100644 --- a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.kt +++ b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension.kt @@ -1 +1 @@ -var d2 : Array? = arrayOfNulls(5) \ No newline at end of file +var d2: Array? = arrayOfNulls(5) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.ide.kt b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.ide.kt index 0752ec85a4c..f4cc76738ab 100644 --- a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.ide.kt +++ b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.ide.kt @@ -1 +1 @@ -val d3 = Array>(5, {arrayOfNulls(5)}) \ No newline at end of file +val d3 = Array>(5, { arrayOfNulls(5) }) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.kt b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.kt index 76a8da1a13f..9ba0d68c1b2 100644 --- a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.kt +++ b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimension3d.kt @@ -1 +1 @@ -var d3 : Array?>? = Array?>(5, {arrayOfNulls(5)}) \ No newline at end of file +var d3: Array?>? = Array?>(5, { arrayOfNulls(5) }) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.ide.kt b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.ide.kt index 27afd6103c3..53aa946565f 100644 --- a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.ide.kt +++ b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.ide.kt @@ -1 +1 @@ -val d2 = Array(5, {IntArray(5)}) \ No newline at end of file +val d2 = Array(5, { IntArray(5) }) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.kt b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.kt index 32ac4491c66..43b51980ee1 100644 --- a/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.kt +++ b/j2k/tests/testData/ast/arrayType/arrayInitializationStatementWithDimensionExplicit.kt @@ -1 +1 @@ -var d2 : Array? = Array(5, {IntArray(5)}) \ No newline at end of file +var d2: Array? = Array(5, { IntArray(5) }) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/d2StringEmptyArray.ide.kt b/j2k/tests/testData/ast/arrayType/d2StringEmptyArray.ide.kt index 4dab6bcb6f4..52d2dcfe14c 100644 --- a/j2k/tests/testData/ast/arrayType/d2StringEmptyArray.ide.kt +++ b/j2k/tests/testData/ast/arrayType/d2StringEmptyArray.ide.kt @@ -1 +1 @@ -val ss = Array>(5, {arrayOfNulls(5)}) \ No newline at end of file +val ss = Array>(5, { arrayOfNulls(5) }) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/d2StringEmptyArray.kt b/j2k/tests/testData/ast/arrayType/d2StringEmptyArray.kt index ada23e19294..a9a8e1ca8bf 100644 --- a/j2k/tests/testData/ast/arrayType/d2StringEmptyArray.kt +++ b/j2k/tests/testData/ast/arrayType/d2StringEmptyArray.kt @@ -1 +1 @@ -var ss : Array?>? = Array?>(5, {arrayOfNulls(5)}) \ No newline at end of file +var ss: Array?>? = Array?>(5, { arrayOfNulls(5) }) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/d3StringEmptyArray.ide.kt b/j2k/tests/testData/ast/arrayType/d3StringEmptyArray.ide.kt index dd399725576..b0691fa416a 100644 --- a/j2k/tests/testData/ast/arrayType/d3StringEmptyArray.ide.kt +++ b/j2k/tests/testData/ast/arrayType/d3StringEmptyArray.ide.kt @@ -1 +1 @@ -val sss = Array>>(5, {Array>(5, {arrayOfNulls(5)})}) \ No newline at end of file +val sss = Array>>(5, { Array>(5, { arrayOfNulls(5) }) }) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/d3StringEmptyArray.kt b/j2k/tests/testData/ast/arrayType/d3StringEmptyArray.kt index 2657bcc524c..90640a9a4c1 100644 --- a/j2k/tests/testData/ast/arrayType/d3StringEmptyArray.kt +++ b/j2k/tests/testData/ast/arrayType/d3StringEmptyArray.kt @@ -1 +1 @@ -var sss : Array?>?>? = Array?>?>(5, {Array?>(5, {arrayOfNulls(5)})}) \ No newline at end of file +var sss: Array?>?>? = Array?>?>(5, { Array?>(5, { arrayOfNulls(5) }) }) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/longArray.kt b/j2k/tests/testData/ast/arrayType/longArray.kt index 25e13c35f13..f217eca7257 100644 --- a/j2k/tests/testData/ast/arrayType/longArray.kt +++ b/j2k/tests/testData/ast/arrayType/longArray.kt @@ -1 +1 @@ -var a : LongArray? = longArray(1, 2, 3) \ No newline at end of file +var a: LongArray? = longArray(1, 2, 3) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/methodArrayArgs.ide.kt b/j2k/tests/testData/ast/arrayType/methodArrayArgs.ide.kt index 378e20f7bae..5be1e8e5db5 100644 --- a/j2k/tests/testData/ast/arrayType/methodArrayArgs.ide.kt +++ b/j2k/tests/testData/ast/arrayType/methodArrayArgs.ide.kt @@ -1,2 +1,2 @@ -fun fromArrayToCollection(a : Array) { +fun fromArrayToCollection(a: Array) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/methodArrayArgs.kt b/j2k/tests/testData/ast/arrayType/methodArrayArgs.kt index 6e3043e220d..e0d0052c135 100644 --- a/j2k/tests/testData/ast/arrayType/methodArrayArgs.kt +++ b/j2k/tests/testData/ast/arrayType/methodArrayArgs.kt @@ -1,2 +1,2 @@ -fun fromArrayToCollection(a : Array?) { +fun fromArrayToCollection(a: Array?) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/newIntArray.kt b/j2k/tests/testData/ast/arrayType/newIntArray.kt index 19b3af3f5c4..00bb8182165 100644 --- a/j2k/tests/testData/ast/arrayType/newIntArray.kt +++ b/j2k/tests/testData/ast/arrayType/newIntArray.kt @@ -1 +1 @@ -var a : IntArray? = intArray(1, 2, 3) \ No newline at end of file +var a: IntArray? = intArray(1, 2, 3) \ No newline at end of file diff --git a/j2k/tests/testData/ast/arrayType/newStringArray.kt b/j2k/tests/testData/ast/arrayType/newStringArray.kt index 8e2ed9e854c..30c1b0a9560 100644 --- a/j2k/tests/testData/ast/arrayType/newStringArray.kt +++ b/j2k/tests/testData/ast/arrayType/newStringArray.kt @@ -1 +1 @@ -var a : Array? = array("abc") \ No newline at end of file +var a: Array? = array("abc") \ No newline at end of file diff --git a/j2k/tests/testData/ast/assignmentExpression/nullability.ide.kt b/j2k/tests/testData/ast/assignmentExpression/nullability.ide.kt index be9c88711a3..d67044c5044 100644 --- a/j2k/tests/testData/ast/assignmentExpression/nullability.ide.kt +++ b/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() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/assignmentExpression/nullability.kt b/j2k/tests/testData/ast/assignmentExpression/nullability.kt index 97a0856def2..75e90a1771b 100644 --- a/j2k/tests/testData/ast/assignmentExpression/nullability.kt +++ b/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()!! + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/Boxing.ide.kt b/j2k/tests/testData/ast/boxedType/Boxing.ide.kt index 6872f4a7ff5..3cbc28cefd1 100644 --- a/j2k/tests/testData/ast/boxedType/Boxing.ide.kt +++ b/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!! + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/Boxing.kt b/j2k/tests/testData/ast/boxedType/Boxing.kt index 6084d021a30..927857f1a29 100644 --- a/j2k/tests/testData/ast/boxedType/Boxing.kt +++ b/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!! + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/boolean.kt b/j2k/tests/testData/ast/boxedType/boolean.kt index a04aa401cb4..fdfd04e3aa2 100644 --- a/j2k/tests/testData/ast/boxedType/boolean.kt +++ b/j2k/tests/testData/ast/boxedType/boolean.kt @@ -1 +1 @@ -var i : Boolean? = 10 \ No newline at end of file +var i: Boolean? = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/byte.kt b/j2k/tests/testData/ast/boxedType/byte.kt index c44367fae64..2902bb98552 100644 --- a/j2k/tests/testData/ast/boxedType/byte.kt +++ b/j2k/tests/testData/ast/boxedType/byte.kt @@ -1 +1 @@ -var i : Byte? = 10 \ No newline at end of file +var i: Byte? = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/character.kt b/j2k/tests/testData/ast/boxedType/character.kt index 66c64a43830..7d383e3d476 100644 --- a/j2k/tests/testData/ast/boxedType/character.kt +++ b/j2k/tests/testData/ast/boxedType/character.kt @@ -1 +1 @@ -var i : Char? = 10 \ No newline at end of file +var i: Char? = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/double.kt b/j2k/tests/testData/ast/boxedType/double.kt index ad23a49855d..24601e602bd 100644 --- a/j2k/tests/testData/ast/boxedType/double.kt +++ b/j2k/tests/testData/ast/boxedType/double.kt @@ -1 +1 @@ -var i : Double? = 10 \ No newline at end of file +var i: Double? = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/float.kt b/j2k/tests/testData/ast/boxedType/float.kt index 72df9c19575..f51e98f1060 100644 --- a/j2k/tests/testData/ast/boxedType/float.kt +++ b/j2k/tests/testData/ast/boxedType/float.kt @@ -1 +1 @@ -var i : Float? = 10 \ No newline at end of file +var i: Float? = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/integer.kt b/j2k/tests/testData/ast/boxedType/integer.kt index eb490098482..2c2d2172639 100644 --- a/j2k/tests/testData/ast/boxedType/integer.kt +++ b/j2k/tests/testData/ast/boxedType/integer.kt @@ -1 +1 @@ -var i : Int? = 10 \ No newline at end of file +var i: Int? = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/kt-671.ide.kt b/j2k/tests/testData/ast/boxedType/kt-671.ide.kt index 4cb2b68c2a9..3cd4711b3ae 100644 --- a/j2k/tests/testData/ast/boxedType/kt-671.ide.kt +++ b/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) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/kt-671.kt b/j2k/tests/testData/ast/boxedType/kt-671.kt index 111d4ed2437..3760a500f3c 100644 --- a/j2k/tests/testData/ast/boxedType/kt-671.kt +++ b/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) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/long.kt b/j2k/tests/testData/ast/boxedType/long.kt index aa1584ac634..933099062f0 100644 --- a/j2k/tests/testData/ast/boxedType/long.kt +++ b/j2k/tests/testData/ast/boxedType/long.kt @@ -1 +1 @@ -var i : Long? = 10 \ No newline at end of file +var i: Long? = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/object.kt b/j2k/tests/testData/ast/boxedType/object.kt index 611c618a389..c4048aa0a48 100644 --- a/j2k/tests/testData/ast/boxedType/object.kt +++ b/j2k/tests/testData/ast/boxedType/object.kt @@ -1 +1 @@ -var i : Any? = 10 \ No newline at end of file +var i: Any? = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/boxedType/short.kt b/j2k/tests/testData/ast/boxedType/short.kt index 8daff77deb3..aa759e7e746 100644 --- a/j2k/tests/testData/ast/boxedType/short.kt +++ b/j2k/tests/testData/ast/boxedType/short.kt @@ -1 +1 @@ -var i : Short? = 10 \ No newline at end of file +var i: Short? = 10 \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.ide.kt index 8d0504a0289..7337542b05a 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.ide.kt +++ b/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() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt b/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt index ffac70016b3..9fe389aac2d 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryFieldCall.kt +++ b/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() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt index 2b6b105c950..bd6d2431339 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.ide.kt +++ b/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() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt index 200cf33c69b..ba645c4e442 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCall.kt +++ b/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() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt index 3a1cce2149b..079cfae355b 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.ide.kt +++ b/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() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt b/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt index 2615cc44f80..ef42a00eb3f 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryMethodCallFromInstance.kt +++ b/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() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt index 88c0e39be8d..779ef502792 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.ide.kt +++ b/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() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt b/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt index 06d3d5b012d..d706a513df6 100644 --- a/j2k/tests/testData/ast/callChainExpression/libraryStringFieldCall.kt +++ b/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() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/ClassShadowing.ide.kt b/j2k/tests/testData/ast/class/ClassShadowing.ide.kt index 8639820dea3..c8b213e44ae 100644 --- a/j2k/tests/testData/ast/class/ClassShadowing.ide.kt +++ b/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") + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/ClassShadowing.kt b/j2k/tests/testData/ast/class/ClassShadowing.kt index 6be500e4bf5..29908bb66cf 100644 --- a/j2k/tests/testData/ast/class/ClassShadowing.kt +++ b/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") + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/abstractClass.ide.kt b/j2k/tests/testData/ast/class/abstractClass.ide.kt index ca2f54970f9..a894b31bc7b 100644 --- a/j2k/tests/testData/ast/class/abstractClass.ide.kt +++ b/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.") + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/abstractClass.kt b/j2k/tests/testData/ast/class/abstractClass.kt index f0513d57cf0..1671a7deb5d 100644 --- a/j2k/tests/testData/ast/class/abstractClass.kt +++ b/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.") + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/abstractClassShape.ide.kt b/j2k/tests/testData/ast/class/abstractClassShape.ide.kt index 8a1d91023d0..52864944fa2 100644 --- a/j2k/tests/testData/ast/class/abstractClassShape.ide.kt +++ b/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 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/abstractClassShape.kt b/j2k/tests/testData/ast/class/abstractClassShape.kt index 2ccef051dd4..43eba7811e8 100644 --- a/j2k/tests/testData/ast/class/abstractClassShape.kt +++ b/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 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/classWithEmptyMethods.ide.kt b/j2k/tests/testData/ast/class/classWithEmptyMethods.ide.kt index 005650d2e55..34384c82660 100644 --- a/j2k/tests/testData/ast/class/classWithEmptyMethods.ide.kt +++ b/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 { + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/classWithEmptyMethods.kt b/j2k/tests/testData/ast/class/classWithEmptyMethods.kt index 7795bc57065..b698dd2aa00 100644 --- a/j2k/tests/testData/ast/class/classWithEmptyMethods.kt +++ b/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? { + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/classWithFields.ide.kt b/j2k/tests/testData/ast/class/classWithFields.ide.kt index 2ba81d6077f..134d4d62abf 100644 --- a/j2k/tests/testData/ast/class/classWithFields.ide.kt +++ b/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 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/classWithFields.kt b/j2k/tests/testData/ast/class/classWithFields.kt index defec3e4ac3..da5fda100f5 100644 --- a/j2k/tests/testData/ast/class/classWithFields.kt +++ b/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 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/classWithMultiplyFields.ide.kt b/j2k/tests/testData/ast/class/classWithMultiplyFields.ide.kt index 8aa8aa3526e..19cbb56f9f5 100644 --- a/j2k/tests/testData/ast/class/classWithMultiplyFields.ide.kt +++ b/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" } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/classWithMultiplyFields.kt b/j2k/tests/testData/ast/class/classWithMultiplyFields.kt index 7f77e2e0cbd..62182c76382 100644 --- a/j2k/tests/testData/ast/class/classWithMultiplyFields.kt +++ b/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" } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/innerEmptyClass.ide.kt b/j2k/tests/testData/ast/class/innerEmptyClass.ide.kt index 983e65e757e..7258221afde 100644 --- a/j2k/tests/testData/ast/class/innerEmptyClass.ide.kt +++ b/j2k/tests/testData/ast/class/innerEmptyClass.ide.kt @@ -1,4 +1,4 @@ class A() { -class B() { -} + class B() { + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/innerEmptyClass.kt b/j2k/tests/testData/ast/class/innerEmptyClass.kt index 983e65e757e..7258221afde 100644 --- a/j2k/tests/testData/ast/class/innerEmptyClass.kt +++ b/j2k/tests/testData/ast/class/innerEmptyClass.kt @@ -1,4 +1,4 @@ class A() { -class B() { -} + class B() { + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/innerStaticClass.ide.kt b/j2k/tests/testData/ast/class/innerStaticClass.ide.kt index e88cebad2d3..3acaf484fcf 100644 --- a/j2k/tests/testData/ast/class/innerStaticClass.ide.kt +++ b/j2k/tests/testData/ast/class/innerStaticClass.ide.kt @@ -1,6 +1,6 @@ class S() { -class object { -class Inner() { -} -} + class object { + class Inner() { + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/innerStaticClass.kt b/j2k/tests/testData/ast/class/innerStaticClass.kt index dc0ae41dff2..36ff7f18334 100644 --- a/j2k/tests/testData/ast/class/innerStaticClass.kt +++ b/j2k/tests/testData/ast/class/innerStaticClass.kt @@ -1,6 +1,6 @@ class S() { -class object { -open class Inner() { -} -} + class object { + open class Inner() { + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/kt-639.ide.kt b/j2k/tests/testData/ast/class/kt-639.ide.kt index a7860adbf3b..e467fc23a2f 100644 --- a/j2k/tests/testData/ast/class/kt-639.ide.kt +++ b/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("") + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/kt-639.kt b/j2k/tests/testData/ast/class/kt-639.kt index bf354eb0974..2b7071344b2 100644 --- a/j2k/tests/testData/ast/class/kt-639.kt +++ b/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? = HashMap(1) -var m2 : HashMap? = HashMap(10) -var t1 : Test? = Test.init() -var t2 : Test? = Test.init("") -} + open fun main() { + var m: HashMap? = HashMap(1) + var m2: HashMap? = HashMap(10) + var t1: Test? = Test.init() + var t2: Test? = Test.init("") + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.ide.kt b/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.ide.kt index 7be6598f76a..2a73b17155c 100644 --- a/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.ide.kt +++ b/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 + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.kt b/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.kt index 7be6598f76a..2a73b17155c 100644 --- a/j2k/tests/testData/ast/class/oneStaticFieldOneNonStatic.kt +++ b/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 + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/oneStaticMethod.ide.kt b/j2k/tests/testData/ast/class/oneStaticMethod.ide.kt index beb564521e3..afff20a288b 100644 --- a/j2k/tests/testData/ast/class/oneStaticMethod.ide.kt +++ b/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 + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/oneStaticMethod.kt b/j2k/tests/testData/ast/class/oneStaticMethod.kt index beb564521e3..afff20a288b 100644 --- a/j2k/tests/testData/ast/class/oneStaticMethod.kt +++ b/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 + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.ide.kt b/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.ide.kt index cb96091ed53..acdc60cbc79 100644 --- a/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.ide.kt +++ b/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 + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.kt b/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.kt index cb96091ed53..acdc60cbc79 100644 --- a/j2k/tests/testData/ast/class/oneStaticMethodOneNonStatic.kt +++ b/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 + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/privateInit.ide.kt b/j2k/tests/testData/ast/class/privateInit.ide.kt index e3cb3fc1e00..519db1ffe95 100644 --- a/j2k/tests/testData/ast/class/privateInit.ide.kt +++ b/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) { + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/privateInit.kt b/j2k/tests/testData/ast/class/privateInit.kt index 84940a2fd16..406a1527d6b 100644 --- a/j2k/tests/testData/ast/class/privateInit.kt +++ b/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) { + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/twoStaticMethod.ide.kt b/j2k/tests/testData/ast/class/twoStaticMethod.ide.kt index 87bd397e519..a9606a266fa 100644 --- a/j2k/tests/testData/ast/class/twoStaticMethod.ide.kt +++ b/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 + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/class/twoStaticMethod.kt b/j2k/tests/testData/ast/class/twoStaticMethod.kt index 87bd397e519..a9606a266fa 100644 --- a/j2k/tests/testData/ast/class/twoStaticMethod.kt +++ b/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 + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/classExpression/complexExample.kt b/j2k/tests/testData/ast/classExpression/complexExample.kt index 40638ad4462..9a3af483bfb 100644 --- a/j2k/tests/testData/ast/classExpression/complexExample.kt +++ b/j2k/tests/testData/ast/classExpression/complexExample.kt @@ -1 +1 @@ -var constrArgTypes : Array?>? = array?>(javaClass>(), javaClass()) \ No newline at end of file +var constrArgTypes: Array?>? = array?>(javaClass>(), javaClass()) \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt index e8c83501d55..3ab24ceca3b 100644 --- a/j2k/tests/testData/ast/constructors/allCallsPrimary.ide.kt +++ b/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) + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary.kt index 0deff4ad62d..f715feb090f 100644 --- a/j2k/tests/testData/ast/constructors/allCallsPrimary.kt +++ b/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) + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt index 7697921e0e7..dc341646b60 100644 --- a/j2k/tests/testData/ast/constructors/allCallsPrimary2.ide.kt +++ b/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) + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt b/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt index 32fe6a6e021..b98593e7ef0 100644 --- a/j2k/tests/testData/ast/constructors/allCallsPrimary2.kt +++ b/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) + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt b/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt index 35aa1813fa5..8d1591b4fa6 100644 --- a/j2k/tests/testData/ast/constructors/customerBuilder.ide.kt +++ b/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()) + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/customerBuilder.kt b/j2k/tests/testData/ast/constructors/customerBuilder.kt index c546ee6d667..cea083b908e 100644 --- a/j2k/tests/testData/ast/constructors/customerBuilder.kt +++ b/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()) + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt b/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt index 2a6e3374c3f..8df85bc4457 100644 --- a/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt +++ b/j2k/tests/testData/ast/constructors/genericIdentifier.ide.kt @@ -1,37 +1,37 @@ -public class Identifier(_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 init(name : T) : Identifier { -val __ = Identifier(name, false) -return __ -} -public fun init(name : T, isNullable : Boolean) : Identifier { -val __ = Identifier(name, false) -__.myNullable = isNullable -return __ -} -public fun init(name : T, hasDollar : Boolean, isNullable : Boolean) : Identifier { -val __ = Identifier(name, hasDollar) -__.myNullable = isNullable -return __ -} -} +public class Identifier(_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 init(name: T): Identifier { + val __ = Identifier(name, false) + return __ + } + public fun init(name: T, isNullable: Boolean): Identifier { + val __ = Identifier(name, false) + __.myNullable = isNullable + return __ + } + public fun init(name: T, 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") + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/genericIdentifier.kt b/j2k/tests/testData/ast/constructors/genericIdentifier.kt index b4b6018da6c..6d9fd2bb17c 100644 --- a/j2k/tests/testData/ast/constructors/genericIdentifier.kt +++ b/j2k/tests/testData/ast/constructors/genericIdentifier.kt @@ -1,37 +1,37 @@ -public open class Identifier(_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 init(name : T?) : Identifier { -val __ = Identifier(name, false) -return __ -} -public open fun init(name : T?, isNullable : Boolean) : Identifier { -val __ = Identifier(name, false) -__.myNullable = isNullable -return __ -} -public open fun init(name : T?, hasDollar : Boolean, isNullable : Boolean) : Identifier { -val __ = Identifier(name, hasDollar) -__.myNullable = isNullable -return __ -} -} +public open class Identifier(_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 init(name: T?): Identifier { + val __ = Identifier(name, false) + return __ + } + public open fun init(name: T?, isNullable: Boolean): Identifier { + val __ = Identifier(name, false) + __.myNullable = isNullable + return __ + } + public open fun init(name: T?, 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") + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/identifier.ide.kt b/j2k/tests/testData/ast/constructors/identifier.ide.kt index 93ff15adcb0..52c7bfa51f9 100644 --- a/j2k/tests/testData/ast/constructors/identifier.ide.kt +++ b/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") + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/identifier.kt b/j2k/tests/testData/ast/constructors/identifier.kt index 2a424e3d939..45737d68bab 100644 --- a/j2k/tests/testData/ast/constructors/identifier.kt +++ b/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") + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt b/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt index 260def584f3..61a3625fc40 100644 --- a/j2k/tests/testData/ast/constructors/withManyDefaultParams.ide.kt +++ b/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") + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt b/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt index 801bdecb9e7..9e6dc503d7c 100644 --- a/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt +++ b/j2k/tests/testData/ast/constructors/withManyDefaultParams.kt @@ -1,40 +1,40 @@ -public open 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 open fun init() : Test { -val __ = Test(null, false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ') -return __ -} -public open fun init(name : String?) : Test { -val __ = Test(foo(name), false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ') -return __ -} -open fun foo(n : String?) : String? { -return "" -} -} +public open 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 open fun init(): Test { + val __ = Test(null, false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ') + return __ + } + public open fun init(name: String?): Test { + val __ = Test(foo(name), false, 0.toDouble(), 0.toFloat(), 0, 0, 0, ' ') + return __ + } + open fun foo(n: String?): String? { + return "" + } + } } public open class User() { -class object { -public open fun main() { -var t : Test? = Test.init("name") -} -} + class object { + public open fun main() { + var t: Test? = Test.init("name") + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.ide.kt b/j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.ide.kt index 08a84179833..a9685f5edb0 100644 --- a/j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.ide.kt +++ b/j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.ide.kt @@ -1,3 +1,3 @@ -val k : Int -val l : Int -val m : Int \ No newline at end of file +val k: Int +val l: Int +val m: Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.kt index 08a84179833..a9685f5edb0 100644 --- a/j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.kt +++ b/j2k/tests/testData/ast/declarationStatement/multiplyFinalIntDeclaration.kt @@ -1,3 +1,3 @@ -val k : Int -val l : Int -val m : Int \ No newline at end of file +val k: Int +val l: Int +val m: Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.ide.kt b/j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.ide.kt index 08a84179833..a9685f5edb0 100644 --- a/j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.ide.kt +++ b/j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.ide.kt @@ -1,3 +1,3 @@ -val k : Int -val l : Int -val m : Int \ No newline at end of file +val k: Int +val l: Int +val m: Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.kt index 357bb10b11e..fd6fdcff5c0 100644 --- a/j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.kt +++ b/j2k/tests/testData/ast/declarationStatement/multiplyIntDeclaration.kt @@ -1,3 +1,3 @@ -var k : Int -var l : Int -var m : Int \ No newline at end of file +var k: Int +var l: Int +var m: Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.ide.kt b/j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.ide.kt index 0ff0482bb0f..e6ec3869b80 100644 --- a/j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.ide.kt +++ b/j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.ide.kt @@ -1 +1 @@ -val s : Int \ No newline at end of file +val s: Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.kt index 0ff0482bb0f..e6ec3869b80 100644 --- a/j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.kt +++ b/j2k/tests/testData/ast/declarationStatement/singleFinalIntDeclaration.kt @@ -1 +1 @@ -val s : Int \ No newline at end of file +val s: Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.ide.kt b/j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.ide.kt index 3f658920fee..b217e2028f6 100644 --- a/j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.ide.kt +++ b/j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.ide.kt @@ -1 +1 @@ -val s : String \ No newline at end of file +val s: String \ No newline at end of file diff --git a/j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.kt index 734800a644c..e0ab795514f 100644 --- a/j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.kt +++ b/j2k/tests/testData/ast/declarationStatement/singleFinalStringDeclaration.kt @@ -1 +1 @@ -val s : String? \ No newline at end of file +val s: String? \ No newline at end of file diff --git a/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.ide.kt b/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.ide.kt index 0ff0482bb0f..e6ec3869b80 100644 --- a/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.ide.kt +++ b/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.ide.kt @@ -1 +1 @@ -val s : Int \ No newline at end of file +val s: Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.kt index 3639cd90f4a..19d6d1e7e08 100644 --- a/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.kt +++ b/j2k/tests/testData/ast/declarationStatement/singleIntDeclaration.kt @@ -1 +1 @@ -var s : Int \ No newline at end of file +var s: Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.ide.kt b/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.ide.kt index 3f658920fee..b217e2028f6 100644 --- a/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.ide.kt +++ b/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.ide.kt @@ -1 +1 @@ -val s : String \ No newline at end of file +val s: String \ No newline at end of file diff --git a/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.kt b/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.kt index 4bdd5d14ca2..d8bb3457603 100644 --- a/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.kt +++ b/j2k/tests/testData/ast/declarationStatement/singleStringDeclaration.kt @@ -1 +1 @@ -var s : String? \ No newline at end of file +var s: String? \ No newline at end of file diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.kt b/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.kt index d86f9999196..d23bfb30afb 100644 --- a/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.kt +++ b/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.kt @@ -1,6 +1,6 @@ do { -var i : Int = 1 +var i: Int = 1 i = i + 1 } while (a > b) \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/colorEnum.ide.kt b/j2k/tests/testData/ast/enum/colorEnum.ide.kt index 39fb85952d6..10b747a106f 100644 --- a/j2k/tests/testData/ast/enum/colorEnum.ide.kt +++ b/j2k/tests/testData/ast/enum/colorEnum.ide.kt @@ -1,12 +1,13 @@ package demo -enum class MyEnum(_color : Int) { -RED : MyEnum(10) -BLUE : MyEnum(20) -private val color : Int -public fun getColor() : Int { -return color -} -{ -color = _color -} + +enum class MyEnum(_color: Int) { + RED : MyEnum(10) + BLUE : MyEnum(20) + private val color: Int + public fun getColor(): Int { + return color + } + { + color = _color + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/colorEnum.kt b/j2k/tests/testData/ast/enum/colorEnum.kt index 39fb85952d6..10b747a106f 100644 --- a/j2k/tests/testData/ast/enum/colorEnum.kt +++ b/j2k/tests/testData/ast/enum/colorEnum.kt @@ -1,12 +1,13 @@ package demo -enum class MyEnum(_color : Int) { -RED : MyEnum(10) -BLUE : MyEnum(20) -private val color : Int -public fun getColor() : Int { -return color -} -{ -color = _color -} + +enum class MyEnum(_color: Int) { + RED : MyEnum(10) + BLUE : MyEnum(20) + private val color: Int + public fun getColor(): Int { + return color + } + { + color = _color + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/enumConstantIsNotNull.ide.kt b/j2k/tests/testData/ast/enum/enumConstantIsNotNull.ide.kt index c46b6f58d20..08c5dc6212e 100644 --- a/j2k/tests/testData/ast/enum/enumConstantIsNotNull.ide.kt +++ b/j2k/tests/testData/ast/enum/enumConstantIsNotNull.ide.kt @@ -1,6 +1,6 @@ enum class E { -FOO -fun foo() { -FOO.toString() -} + FOO + fun foo() { + FOO.toString() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/enumConstantIsNotNull.kt b/j2k/tests/testData/ast/enum/enumConstantIsNotNull.kt index c46b6f58d20..08c5dc6212e 100644 --- a/j2k/tests/testData/ast/enum/enumConstantIsNotNull.kt +++ b/j2k/tests/testData/ast/enum/enumConstantIsNotNull.kt @@ -1,6 +1,6 @@ enum class E { -FOO -fun foo() { -FOO.toString() -} + FOO + fun foo() { + FOO.toString() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/enumWithNameField.ide.kt b/j2k/tests/testData/ast/enum/enumWithNameField.ide.kt index e182e4d2eca..4dbfe1f26ac 100644 --- a/j2k/tests/testData/ast/enum/enumWithNameField.ide.kt +++ b/j2k/tests/testData/ast/enum/enumWithNameField.ide.kt @@ -1,4 +1,4 @@ enum class E { -I -private var name : String = 0 + I + private var name: String = 0 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/enumWithNameField.kt b/j2k/tests/testData/ast/enum/enumWithNameField.kt index 6419d8e9907..e89bf52cdd1 100644 --- a/j2k/tests/testData/ast/enum/enumWithNameField.kt +++ b/j2k/tests/testData/ast/enum/enumWithNameField.kt @@ -1,4 +1,4 @@ enum class E { -I -private var name : String? = null + I + private var name: String? = null } \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.ide.kt b/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.ide.kt index 6fdb4ebc7cc..51343206acf 100644 --- a/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.ide.kt +++ b/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.ide.kt @@ -1,14 +1,14 @@ -enum class Color(c : Int) { -WHITE : Color(21) -BLACK : Color(22) -RED : Color(23) -YELLOW : Color(24) -BLUE : Color(25) -private var code : Int = 0 -public fun getCode() : Int { -return code -} -{ -code = c -} +enum class Color(c: Int) { + WHITE : Color(21) + BLACK : Color(22) + RED : Color(23) + YELLOW : Color(24) + BLUE : Color(25) + private var code: Int = 0 + public fun getCode(): Int { + return code + } + { + code = c + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.kt b/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.kt index 6fdb4ebc7cc..51343206acf 100644 --- a/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.kt +++ b/j2k/tests/testData/ast/enum/fieldsWithPrimaryPrivateConstructor.kt @@ -1,14 +1,14 @@ -enum class Color(c : Int) { -WHITE : Color(21) -BLACK : Color(22) -RED : Color(23) -YELLOW : Color(24) -BLUE : Color(25) -private var code : Int = 0 -public fun getCode() : Int { -return code -} -{ -code = c -} +enum class Color(c: Int) { + WHITE : Color(21) + BLACK : Color(22) + RED : Color(23) + YELLOW : Color(24) + BLUE : Color(25) + private var code: Int = 0 + public fun getCode(): Int { + return code + } + { + code = c + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/overrideToString.ide.kt b/j2k/tests/testData/ast/enum/overrideToString.ide.kt index 24848d6a572..90eae56b973 100644 --- a/j2k/tests/testData/ast/enum/overrideToString.ide.kt +++ b/j2k/tests/testData/ast/enum/overrideToString.ide.kt @@ -1,10 +1,10 @@ enum class Color { -WHITE -BLACK -RED -YELLOW -BLUE -override fun toString() : String { -return "COLOR" -} + WHITE + BLACK + RED + YELLOW + BLUE + override fun toString(): String { + return "COLOR" + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/overrideToString.kt b/j2k/tests/testData/ast/enum/overrideToString.kt index a5653e82eac..7891b3b4ea0 100644 --- a/j2k/tests/testData/ast/enum/overrideToString.kt +++ b/j2k/tests/testData/ast/enum/overrideToString.kt @@ -1,10 +1,10 @@ enum class Color { -WHITE -BLACK -RED -YELLOW -BLUE -override fun toString() : String? { -return "COLOR" -} + WHITE + BLACK + RED + YELLOW + BLUE + override fun toString(): String? { + return "COLOR" + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/primaryPrivateConstructor.ide.kt b/j2k/tests/testData/ast/enum/primaryPrivateConstructor.ide.kt index b860f61eeed..6360c71872b 100644 --- a/j2k/tests/testData/ast/enum/primaryPrivateConstructor.ide.kt +++ b/j2k/tests/testData/ast/enum/primaryPrivateConstructor.ide.kt @@ -1,10 +1,11 @@ package demo -enum class Color(c : Int) { -private var code : Int = 0 -public fun getCode() : Int { -return code -} -{ -code = c -} + +enum class Color(c: Int) { + private var code: Int = 0 + public fun getCode(): Int { + return code + } + { + code = c + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/primaryPrivateConstructor.kt b/j2k/tests/testData/ast/enum/primaryPrivateConstructor.kt index b860f61eeed..6360c71872b 100644 --- a/j2k/tests/testData/ast/enum/primaryPrivateConstructor.kt +++ b/j2k/tests/testData/ast/enum/primaryPrivateConstructor.kt @@ -1,10 +1,11 @@ package demo -enum class Color(c : Int) { -private var code : Int = 0 -public fun getCode() : Int { -return code -} -{ -code = c -} + +enum class Color(c: Int) { + private var code: Int = 0 + public fun getCode(): Int { + return code + } + { + code = c + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/runnableImplementation.ide.kt b/j2k/tests/testData/ast/enum/runnableImplementation.ide.kt index 5b5d8706441..1c5655a0f00 100644 --- a/j2k/tests/testData/ast/enum/runnableImplementation.ide.kt +++ b/j2k/tests/testData/ast/enum/runnableImplementation.ide.kt @@ -1,10 +1,10 @@ enum class Color : Runnable { -WHITE -BLACK -RED -YELLOW -BLUE -override fun run() { -System.out.println("name()=" + name() + ", toString()=" + toString()) -} + WHITE + BLACK + RED + YELLOW + BLUE + override fun run() { + System.out.println("name()=" + name() + ", toString()=" + toString()) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/runnableImplementation.kt b/j2k/tests/testData/ast/enum/runnableImplementation.kt index 2ac136950c5..4f097ba5fae 100644 --- a/j2k/tests/testData/ast/enum/runnableImplementation.kt +++ b/j2k/tests/testData/ast/enum/runnableImplementation.kt @@ -1,10 +1,10 @@ enum class Color : Runnable { -WHITE -BLACK -RED -YELLOW -BLUE -override fun run() { -System.out?.println("name()=" + name() + ", toString()=" + toString()) -} + WHITE + BLACK + RED + YELLOW + BLUE + override fun run() { + System.out?.println("name()=" + name() + ", toString()=" + toString()) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/typeSafeEnum.ide.kt b/j2k/tests/testData/ast/enum/typeSafeEnum.ide.kt index 7d80ec0ac2f..5e49520179f 100644 --- a/j2k/tests/testData/ast/enum/typeSafeEnum.ide.kt +++ b/j2k/tests/testData/ast/enum/typeSafeEnum.ide.kt @@ -1,6 +1,6 @@ enum class Coin { -PENNY -NICKEL -DIME -QUARTER + PENNY + NICKEL + DIME + QUARTER } \ No newline at end of file diff --git a/j2k/tests/testData/ast/enum/typeSafeEnum.kt b/j2k/tests/testData/ast/enum/typeSafeEnum.kt index 7d80ec0ac2f..5e49520179f 100644 --- a/j2k/tests/testData/ast/enum/typeSafeEnum.kt +++ b/j2k/tests/testData/ast/enum/typeSafeEnum.kt @@ -1,6 +1,6 @@ enum class Coin { -PENNY -NICKEL -DIME -QUARTER + PENNY + NICKEL + DIME + QUARTER } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/classChildExtendsBase.ide.kt b/j2k/tests/testData/ast/field/classChildExtendsBase.ide.kt index 4c408004189..861c200ada5 100644 --- a/j2k/tests/testData/ast/field/classChildExtendsBase.ide.kt +++ b/j2k/tests/testData/ast/field/classChildExtendsBase.ide.kt @@ -1,6 +1,6 @@ class Base() { -private var myFirst : String = 0 + private var myFirst: String = 0 } class Child() : Base() { -private var mySecond : String = 0 + private var mySecond: String = 0 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/classChildExtendsBase.kt b/j2k/tests/testData/ast/field/classChildExtendsBase.kt index 17681369b0b..6c082ad22b7 100644 --- a/j2k/tests/testData/ast/field/classChildExtendsBase.kt +++ b/j2k/tests/testData/ast/field/classChildExtendsBase.kt @@ -1,6 +1,6 @@ open class Base() { -private var myFirst : String? = null + private var myFirst: String? = null } open class Child() : Base() { -private var mySecond : String? = null + private var mySecond: String? = null } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/internalField.ide.kt b/j2k/tests/testData/ast/field/internalField.ide.kt index 315f2cc44e3..8d789ab1717 100644 --- a/j2k/tests/testData/ast/field/internalField.ide.kt +++ b/j2k/tests/testData/ast/field/internalField.ide.kt @@ -1,3 +1,3 @@ class C() { -var f : Foo = 0 + var f: Foo = 0 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/internalField.kt b/j2k/tests/testData/ast/field/internalField.kt index 5cd1a6ac9a9..ae7755d1f9f 100644 --- a/j2k/tests/testData/ast/field/internalField.kt +++ b/j2k/tests/testData/ast/field/internalField.kt @@ -1,3 +1,3 @@ open class C() { -var f : Foo? = null + var f: Foo? = null } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/privateField.ide.kt b/j2k/tests/testData/ast/field/privateField.ide.kt index f917fda955b..f321996b3fe 100644 --- a/j2k/tests/testData/ast/field/privateField.ide.kt +++ b/j2k/tests/testData/ast/field/privateField.ide.kt @@ -1,3 +1,3 @@ class C() { -private var f : Foo = 0 + private var f: Foo = 0 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/privateField.kt b/j2k/tests/testData/ast/field/privateField.kt index b2441bf0c24..e6b40a96bad 100644 --- a/j2k/tests/testData/ast/field/privateField.kt +++ b/j2k/tests/testData/ast/field/privateField.kt @@ -1,3 +1,3 @@ open class C() { -private var f : Foo? = null + private var f: Foo? = null } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/protectedField.ide.kt b/j2k/tests/testData/ast/field/protectedField.ide.kt index df96011b431..91f3813466c 100644 --- a/j2k/tests/testData/ast/field/protectedField.ide.kt +++ b/j2k/tests/testData/ast/field/protectedField.ide.kt @@ -1,3 +1,3 @@ class C() { -protected var f : Foo = 0 + protected var f: Foo = 0 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/protectedField.kt b/j2k/tests/testData/ast/field/protectedField.kt index cba6200d896..df09fcaff99 100644 --- a/j2k/tests/testData/ast/field/protectedField.kt +++ b/j2k/tests/testData/ast/field/protectedField.kt @@ -1,3 +1,3 @@ open class C() { -protected var f : Foo? = null + protected var f: Foo? = null } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/publicField.ide.kt b/j2k/tests/testData/ast/field/publicField.ide.kt index ec03f42e0c7..2952347719f 100644 --- a/j2k/tests/testData/ast/field/publicField.ide.kt +++ b/j2k/tests/testData/ast/field/publicField.ide.kt @@ -1,3 +1,3 @@ class C() { -public var f : Foo = 0 + public var f: Foo = 0 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/publicField.kt b/j2k/tests/testData/ast/field/publicField.kt index c79b38d6c5c..cf25bc81490 100644 --- a/j2k/tests/testData/ast/field/publicField.kt +++ b/j2k/tests/testData/ast/field/publicField.kt @@ -1,3 +1,3 @@ open class C() { -public var f : Foo? = null + public var f: Foo? = null } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/valWithInit.ide.kt b/j2k/tests/testData/ast/field/valWithInit.ide.kt index 07ad534da53..2d120001aa4 100644 --- a/j2k/tests/testData/ast/field/valWithInit.ide.kt +++ b/j2k/tests/testData/ast/field/valWithInit.ide.kt @@ -1,3 +1,3 @@ class C() { -val f : Foo = Foo(1, 2) + val f: Foo = Foo(1, 2) } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/valWithInit.kt b/j2k/tests/testData/ast/field/valWithInit.kt index b311ebb6784..180515d343d 100644 --- a/j2k/tests/testData/ast/field/valWithInit.kt +++ b/j2k/tests/testData/ast/field/valWithInit.kt @@ -1,3 +1,3 @@ open class C() { -val f : Foo = Foo(1, 2) + val f: Foo = Foo(1, 2) } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/varWithInit.ide.kt b/j2k/tests/testData/ast/field/varWithInit.ide.kt index 698acd63479..9238f03f782 100644 --- a/j2k/tests/testData/ast/field/varWithInit.ide.kt +++ b/j2k/tests/testData/ast/field/varWithInit.ide.kt @@ -1,3 +1,3 @@ class C() { -var f : Foo = Foo(1, 2) + var f: Foo = Foo(1, 2) } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/varWithInit.kt b/j2k/tests/testData/ast/field/varWithInit.kt index 6d8dfd2b64c..1e58d5fe3e0 100644 --- a/j2k/tests/testData/ast/field/varWithInit.kt +++ b/j2k/tests/testData/ast/field/varWithInit.kt @@ -1,3 +1,3 @@ open class C() { -var f : Foo? = Foo(1, 2) + var f: Foo? = Foo(1, 2) } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/varWithoutInit.ide.kt b/j2k/tests/testData/ast/field/varWithoutInit.ide.kt index 315f2cc44e3..8d789ab1717 100644 --- a/j2k/tests/testData/ast/field/varWithoutInit.ide.kt +++ b/j2k/tests/testData/ast/field/varWithoutInit.ide.kt @@ -1,3 +1,3 @@ class C() { -var f : Foo = 0 + var f: Foo = 0 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/field/varWithoutInit.kt b/j2k/tests/testData/ast/field/varWithoutInit.kt index 5cd1a6ac9a9..ae7755d1f9f 100644 --- a/j2k/tests/testData/ast/field/varWithoutInit.kt +++ b/j2k/tests/testData/ast/field/varWithoutInit.kt @@ -1,3 +1,3 @@ open class C() { -var f : Foo? = null + var f: Foo? = null } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forRangeWithLE.kt b/j2k/tests/testData/ast/for/forRangeWithLE.kt index 79c11ab6288..b91e4fabd97 100644 --- a/j2k/tests/testData/ast/for/forRangeWithLE.kt +++ b/j2k/tests/testData/ast/for/forRangeWithLE.kt @@ -1,4 +1,4 @@ -var array : IntArray? = IntArray(10) +var array: IntArray? = IntArray(10) for (i in 0..10) { array[i] = i } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forRangeWithLT.kt b/j2k/tests/testData/ast/for/forRangeWithLT.kt index f31b904afa4..d6820b6c50b 100644 --- a/j2k/tests/testData/ast/for/forRangeWithLT.kt +++ b/j2k/tests/testData/ast/for/forRangeWithLT.kt @@ -1,4 +1,4 @@ -var array : IntArray? = IntArray(10) +var array: IntArray? = IntArray(10) for (i in 0..10 - 1) { array[i] = i } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithBlock.kt b/j2k/tests/testData/ast/for/forWithBlock.kt index f31b904afa4..d6820b6c50b 100644 --- a/j2k/tests/testData/ast/for/forWithBlock.kt +++ b/j2k/tests/testData/ast/for/forWithBlock.kt @@ -1,4 +1,4 @@ -var array : IntArray? = IntArray(10) +var array: IntArray? = IntArray(10) for (i in 0..10 - 1) { array[i] = i } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.ide.kt b/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.ide.kt index dd87b91e89e..984e9ed773e 100644 --- a/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.ide.kt +++ b/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.ide.kt @@ -1,6 +1,6 @@ { val i = 0 -while (i < 0) +while (i <0) { { val i = 1 diff --git a/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.kt b/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.kt index 4fd380f6ffe..05d830a2a34 100644 --- a/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.kt +++ b/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.kt @@ -1,9 +1,9 @@ { -var i : Int = 0 -while (i < 0) +var i: Int = 0 +while (i <0) { { -var i : Int = 1 +var i: Int = 1 i++ } { diff --git a/j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt b/j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt index 293b4688434..f13a8a6ac9f 100644 --- a/j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt +++ b/j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt @@ -1,6 +1,6 @@ { val i = 0 -while (i < 0) +while (i <0) { { } diff --git a/j2k/tests/testData/ast/for/forWithEmptyBlock.kt b/j2k/tests/testData/ast/for/forWithEmptyBlock.kt index a5743d94b32..9c657331381 100644 --- a/j2k/tests/testData/ast/for/forWithEmptyBlock.kt +++ b/j2k/tests/testData/ast/for/forWithEmptyBlock.kt @@ -1,6 +1,6 @@ { -var i : Int = 0 -while (i < 0) +var i: Int = 0 +while (i <0) { { } diff --git a/j2k/tests/testData/ast/for/forWithReturn.ide.kt b/j2k/tests/testData/ast/for/forWithReturn.ide.kt index 7a25971d6f7..f39117a839a 100644 --- a/j2k/tests/testData/ast/for/forWithReturn.ide.kt +++ b/j2k/tests/testData/ast/for/forWithReturn.ide.kt @@ -1,6 +1,6 @@ { val i = 0 -while (i < 0) +while (i <0) { return i { diff --git a/j2k/tests/testData/ast/for/forWithReturn.kt b/j2k/tests/testData/ast/for/forWithReturn.kt index 1c9a6cb9016..8370229d093 100644 --- a/j2k/tests/testData/ast/for/forWithReturn.kt +++ b/j2k/tests/testData/ast/for/forWithReturn.kt @@ -1,6 +1,6 @@ { -var i : Int = 0 -while (i < 0) +var i: Int = 0 +while (i <0) { return i { diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.kt index 3e0ff8ebda9..ae1d0d5a9a5 100644 --- a/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.kt +++ b/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.kt @@ -1,5 +1,5 @@ for (n in list) { -var i : Int = 1 +var i: Int = 1 i++ } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/abstractMethod.ide.kt b/j2k/tests/testData/ast/function/abstractMethod.ide.kt index 8163dfad9bb..7fcdd037e33 100644 --- a/j2k/tests/testData/ast/function/abstractMethod.ide.kt +++ b/j2k/tests/testData/ast/function/abstractMethod.ide.kt @@ -1 +1 @@ -abstract fun getNoofGears() : Int \ No newline at end of file +abstract fun getNoofGears(): Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/abstractMethod.kt b/j2k/tests/testData/ast/function/abstractMethod.kt index 8163dfad9bb..7fcdd037e33 100644 --- a/j2k/tests/testData/ast/function/abstractMethod.kt +++ b/j2k/tests/testData/ast/function/abstractMethod.kt @@ -1 +1 @@ -abstract fun getNoofGears() : Int \ No newline at end of file +abstract fun getNoofGears(): Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/classGenericParam.ide.kt b/j2k/tests/testData/ast/function/classGenericParam.ide.kt index 6a054f02f70..9286b7acb4b 100644 --- a/j2k/tests/testData/ast/function/classGenericParam.ide.kt +++ b/j2k/tests/testData/ast/function/classGenericParam.ide.kt @@ -1,2 +1,2 @@ -fun getT() : T { +fun getT(): T { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/classGenericParam.kt b/j2k/tests/testData/ast/function/classGenericParam.kt index b9ea1d49799..677843b64ee 100644 --- a/j2k/tests/testData/ast/function/classGenericParam.kt +++ b/j2k/tests/testData/ast/function/classGenericParam.kt @@ -1,2 +1,2 @@ -fun getT() : T? { +fun getT(): T? { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt index 611aa115710..c9fc63e66d0 100644 --- a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt +++ b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.ide.kt @@ -1,35 +1,36 @@ package test + class Test() : Base() { -override fun hashCode() : Int { -return super.hashCode() -} -override fun equals(o : Any) : Boolean { -return super.equals(o) -} -override fun clone() : Any { -return super.clone() -} -override fun toString() : String { -return super.toString() -} -override fun finalize() { -super.finalize() -} + override fun hashCode(): Int { + return super.hashCode() + } + override fun equals(o: Any): Boolean { + return super.equals(o) + } + override fun clone(): Any { + return super.clone() + } + override fun toString(): String { + return super.toString() + } + override fun finalize() { + super.finalize() + } } class Base() { -public fun hashCode() : Int { -return System.identityHashCode(this) -} -public fun equals(o : Any) : Boolean { -return this.identityEquals(o) -} -protected fun clone() : Any { -return super.clone() -} -public fun toString() : String { -return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) -} -protected fun finalize() { -super.finalize() -} + public fun hashCode(): Int { + return System.identityHashCode(this) + } + public fun equals(o: Any): Boolean { + return this.identityEquals(o) + } + protected fun clone(): Any { + return super.clone() + } + public fun toString(): String { + return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) + } + protected fun finalize() { + super.finalize() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt index 24c3ab863ca..7d55cefb60d 100644 --- a/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt +++ b/j2k/tests/testData/ast/function/extendsBaseWhichExtendsObject.kt @@ -1,35 +1,36 @@ package test + open class Test() : Base() { -override fun hashCode() : Int { -return super.hashCode() -} -override fun equals(o : Any?) : Boolean { -return super.equals(o) -} -override fun clone() : Any? { -return super.clone() -} -override fun toString() : String? { -return super.toString() -} -override fun finalize() { -super.finalize() -} + override fun hashCode(): Int { + return super.hashCode() + } + override fun equals(o: Any?): Boolean { + return super.equals(o) + } + override fun clone(): Any? { + return super.clone() + } + override fun toString(): String? { + return super.toString() + } + override fun finalize() { + super.finalize() + } } open class Base() { -public open fun hashCode() : Int { -return System.identityHashCode(this) -} -public open fun equals(o : Any?) : Boolean { -return this.identityEquals(o) -} -protected open fun clone() : Any? { -return super.clone() -} -public open fun toString() : String? { -return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) -} -protected open fun finalize() { -super.finalize() -} + public open fun hashCode(): Int { + return System.identityHashCode(this) + } + public open fun equals(o: Any?): Boolean { + return this.identityEquals(o) + } + protected open fun clone(): Any? { + return super.clone() + } + public open fun toString(): String? { + return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) + } + protected open fun finalize() { + super.finalize() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/final.ide.kt b/j2k/tests/testData/ast/function/final.ide.kt index 51517e6cfc6..836f70823d6 100644 --- a/j2k/tests/testData/ast/function/final.ide.kt +++ b/j2k/tests/testData/ast/function/final.ide.kt @@ -1,3 +1,3 @@ -fun getString() : String { -return "" +fun getString(): String { + return "" } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/final.kt b/j2k/tests/testData/ast/function/final.kt index e6cf12b2b3f..bf1a5d26a15 100644 --- a/j2k/tests/testData/ast/function/final.kt +++ b/j2k/tests/testData/ast/function/final.kt @@ -1,3 +1,3 @@ -fun getString() : String? { -return "" +fun getString(): String? { + return "" } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/functionInFinalClass.ide.kt b/j2k/tests/testData/ast/function/functionInFinalClass.ide.kt index e818c914915..a6f400168ce 100644 --- a/j2k/tests/testData/ast/function/functionInFinalClass.ide.kt +++ b/j2k/tests/testData/ast/function/functionInFinalClass.ide.kt @@ -1,5 +1,6 @@ package demo + class Final() { -fun test() { -} + fun test() { + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/functionInFinalClass.kt b/j2k/tests/testData/ast/function/functionInFinalClass.kt index e818c914915..a6f400168ce 100644 --- a/j2k/tests/testData/ast/function/functionInFinalClass.kt +++ b/j2k/tests/testData/ast/function/functionInFinalClass.kt @@ -1,5 +1,6 @@ package demo + class Final() { -fun test() { -} + fun test() { + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/main.ide.kt b/j2k/tests/testData/ast/function/main.ide.kt index 71d18852399..bbc3b65a453 100644 --- a/j2k/tests/testData/ast/function/main.ide.kt +++ b/j2k/tests/testData/ast/function/main.ide.kt @@ -1,4 +1,4 @@ class object { -public fun main(args : Array) { -} + public fun main(args: Array) { + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/main.kt b/j2k/tests/testData/ast/function/main.kt index 8af2386b4e6..4d5d6e99387 100644 --- a/j2k/tests/testData/ast/function/main.kt +++ b/j2k/tests/testData/ast/function/main.kt @@ -1,4 +1,4 @@ class object { -public fun main(args : Array?) { -} + public fun main(args: Array?) { + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/methodClassType.ide.kt b/j2k/tests/testData/ast/function/methodClassType.ide.kt index 63f4630144a..0124d08ad5b 100644 --- a/j2k/tests/testData/ast/function/methodClassType.ide.kt +++ b/j2k/tests/testData/ast/function/methodClassType.ide.kt @@ -1,2 +1,2 @@ -fun main() : String { +fun main(): String { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/methodClassType.kt b/j2k/tests/testData/ast/function/methodClassType.kt index 196c45b6bf8..2d291e0b1c1 100644 --- a/j2k/tests/testData/ast/function/methodClassType.kt +++ b/j2k/tests/testData/ast/function/methodClassType.kt @@ -1,2 +1,2 @@ -fun main() : String? { +fun main(): String? { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/methodPrimitiveType.ide.kt b/j2k/tests/testData/ast/function/methodPrimitiveType.ide.kt index c6ef43f8a14..bf6eb1424e4 100644 --- a/j2k/tests/testData/ast/function/methodPrimitiveType.ide.kt +++ b/j2k/tests/testData/ast/function/methodPrimitiveType.ide.kt @@ -1,2 +1,2 @@ -fun main() : Int { +fun main(): Int { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/methodPrimitiveType.kt b/j2k/tests/testData/ast/function/methodPrimitiveType.kt index c6ef43f8a14..bf6eb1424e4 100644 --- a/j2k/tests/testData/ast/function/methodPrimitiveType.kt +++ b/j2k/tests/testData/ast/function/methodPrimitiveType.kt @@ -1,2 +1,2 @@ -fun main() : Int { +fun main(): Int { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/methodPrimitiveType2.ide.kt b/j2k/tests/testData/ast/function/methodPrimitiveType2.ide.kt index c978e93e7aa..388e4288f4c 100644 --- a/j2k/tests/testData/ast/function/methodPrimitiveType2.ide.kt +++ b/j2k/tests/testData/ast/function/methodPrimitiveType2.ide.kt @@ -1,2 +1,2 @@ -fun main() : Boolean { +fun main(): Boolean { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/methodPrimitiveType2.kt b/j2k/tests/testData/ast/function/methodPrimitiveType2.kt index c978e93e7aa..388e4288f4c 100644 --- a/j2k/tests/testData/ast/function/methodPrimitiveType2.kt +++ b/j2k/tests/testData/ast/function/methodPrimitiveType2.kt @@ -1,2 +1,2 @@ -fun main() : Boolean { +fun main(): Boolean { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/methodWithReturnStatement.ide.kt b/j2k/tests/testData/ast/function/methodWithReturnStatement.ide.kt index acfbd1010d8..f2cd6c4849c 100644 --- a/j2k/tests/testData/ast/function/methodWithReturnStatement.ide.kt +++ b/j2k/tests/testData/ast/function/methodWithReturnStatement.ide.kt @@ -1,3 +1,3 @@ -fun isTrue() : Boolean { -return true +fun isTrue(): Boolean { + return true } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/methodWithReturnStatement.kt b/j2k/tests/testData/ast/function/methodWithReturnStatement.kt index acfbd1010d8..f2cd6c4849c 100644 --- a/j2k/tests/testData/ast/function/methodWithReturnStatement.kt +++ b/j2k/tests/testData/ast/function/methodWithReturnStatement.kt @@ -1,3 +1,3 @@ -fun isTrue() : Boolean { -return true +fun isTrue(): Boolean { + return true } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/open.ide.kt b/j2k/tests/testData/ast/function/open.ide.kt index 51517e6cfc6..836f70823d6 100644 --- a/j2k/tests/testData/ast/function/open.ide.kt +++ b/j2k/tests/testData/ast/function/open.ide.kt @@ -1,3 +1,3 @@ -fun getString() : String { -return "" +fun getString(): String { + return "" } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/open.kt b/j2k/tests/testData/ast/function/open.kt index e6cf12b2b3f..bf1a5d26a15 100644 --- a/j2k/tests/testData/ast/function/open.kt +++ b/j2k/tests/testData/ast/function/open.kt @@ -1,3 +1,3 @@ -fun getString() : String? { -return "" +fun getString(): String? { + return "" } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/override.ide.kt b/j2k/tests/testData/ast/function/override.ide.kt index 0357d73604f..cf7ed6fcaa3 100644 --- a/j2k/tests/testData/ast/function/override.ide.kt +++ b/j2k/tests/testData/ast/function/override.ide.kt @@ -1,8 +1,8 @@ class A() { -fun a() { -} + fun a() { + } } class B() : A() { -override fun a() { -} + override fun a() { + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/override.kt b/j2k/tests/testData/ast/function/override.kt index da82b33f766..54040f40578 100644 --- a/j2k/tests/testData/ast/function/override.kt +++ b/j2k/tests/testData/ast/function/override.kt @@ -1,8 +1,8 @@ open class A() { -open fun a() { -} + open fun a() { + } } class B() : A() { -override fun a() { -} + override fun a() { + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/overrideAndOpen.ide.kt b/j2k/tests/testData/ast/function/overrideAndOpen.ide.kt index 8d051af874c..d24ce93ae65 100644 --- a/j2k/tests/testData/ast/function/overrideAndOpen.ide.kt +++ b/j2k/tests/testData/ast/function/overrideAndOpen.ide.kt @@ -1,12 +1,12 @@ class A() { -fun foo() { -} + fun foo() { + } } class B() : A() { -override fun foo() { -} + override fun foo() { + } } class C() : B() { -override fun foo() { -} + override fun foo() { + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/overrideAndOpen.kt b/j2k/tests/testData/ast/function/overrideAndOpen.kt index 706fbe26f27..cc552fe8379 100644 --- a/j2k/tests/testData/ast/function/overrideAndOpen.kt +++ b/j2k/tests/testData/ast/function/overrideAndOpen.kt @@ -1,12 +1,12 @@ open class A() { -open fun foo() { -} + open fun foo() { + } } open class B() : A() { -override fun foo() { -} + override fun foo() { + } } open class C() : B() { -override fun foo() { -} + override fun foo() { + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/overrideObject.ide.kt b/j2k/tests/testData/ast/function/overrideObject.ide.kt index d1095a6ca9c..ba7e97297ea 100644 --- a/j2k/tests/testData/ast/function/overrideObject.ide.kt +++ b/j2k/tests/testData/ast/function/overrideObject.ide.kt @@ -1,18 +1,19 @@ package test + class Test() { -public fun hashCode() : Int { -return System.identityHashCode(this) -} -public fun equals(o : Any) : Boolean { -return this.identityEquals(o) -} -protected fun clone() : Any { -return super.clone() -} -public fun toString() : String { -return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) -} -protected fun finalize() { -super.finalize() -} + public fun hashCode(): Int { + return System.identityHashCode(this) + } + public fun equals(o: Any): Boolean { + return this.identityEquals(o) + } + protected fun clone(): Any { + return super.clone() + } + public fun toString(): String { + return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) + } + protected fun finalize() { + super.finalize() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/overrideObject.kt b/j2k/tests/testData/ast/function/overrideObject.kt index 3d11e4c80cf..365d330ecd0 100644 --- a/j2k/tests/testData/ast/function/overrideObject.kt +++ b/j2k/tests/testData/ast/function/overrideObject.kt @@ -1,18 +1,19 @@ package test + open class Test() { -public open fun hashCode() : Int { -return System.identityHashCode(this) -} -public open fun equals(o : Any?) : Boolean { -return this.identityEquals(o) -} -protected open fun clone() : Any? { -return super.clone() -} -public open fun toString() : String? { -return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) -} -protected open fun finalize() { -super.finalize() -} + public open fun hashCode(): Int { + return System.identityHashCode(this) + } + public open fun equals(o: Any?): Boolean { + return this.identityEquals(o) + } + protected open fun clone(): Any? { + return super.clone() + } + public open fun toString(): String? { + return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) + } + protected open fun finalize() { + super.finalize() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/ownGenericParam.ide.kt b/j2k/tests/testData/ast/function/ownGenericParam.ide.kt index 8d6e2b8eb3d..e0a4fa6e530 100644 --- a/j2k/tests/testData/ast/function/ownGenericParam.ide.kt +++ b/j2k/tests/testData/ast/function/ownGenericParam.ide.kt @@ -1,2 +1,2 @@ -fun putU(u : U) { +fun putU(u: U) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/ownGenericParam.kt b/j2k/tests/testData/ast/function/ownGenericParam.kt index ac3ef63834a..9f01d056d30 100644 --- a/j2k/tests/testData/ast/function/ownGenericParam.kt +++ b/j2k/tests/testData/ast/function/ownGenericParam.kt @@ -1,2 +1,2 @@ -fun putU(u : U?) { +fun putU(u: U?) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/ownSeveralGenericParams.ide.kt b/j2k/tests/testData/ast/function/ownSeveralGenericParams.ide.kt index 05ba059c70b..6f04d1b814f 100644 --- a/j2k/tests/testData/ast/function/ownSeveralGenericParams.ide.kt +++ b/j2k/tests/testData/ast/function/ownSeveralGenericParams.ide.kt @@ -1,2 +1,2 @@ -fun putUVW(u : U, v : V, w : W) { +fun putUVW(u: U, v: V, w: W) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/ownSeveralGenericParams.kt b/j2k/tests/testData/ast/function/ownSeveralGenericParams.kt index c580b30efd3..bf17cf44329 100644 --- a/j2k/tests/testData/ast/function/ownSeveralGenericParams.kt +++ b/j2k/tests/testData/ast/function/ownSeveralGenericParams.kt @@ -1,2 +1,2 @@ -fun putUVW(u : U?, v : V?, w : W?) { +fun putUVW(u: U?, v: V?, w: W?) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/varVararg.ide.kt b/j2k/tests/testData/ast/function/varVararg.ide.kt index 58c98923519..7f95d27628b 100644 --- a/j2k/tests/testData/ast/function/varVararg.ide.kt +++ b/j2k/tests/testData/ast/function/varVararg.ide.kt @@ -1,6 +1,7 @@ package demo + class Test() { -fun test(vararg var args : Any) { -args = array(1, 2, 3) -} + fun test(vararg var args: Any) { + args = array(1, 2, 3) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/varVararg.kt b/j2k/tests/testData/ast/function/varVararg.kt index 2e90c70287f..4cd8dcdf16b 100644 --- a/j2k/tests/testData/ast/function/varVararg.kt +++ b/j2k/tests/testData/ast/function/varVararg.kt @@ -1,6 +1,7 @@ package demo + open class Test() { -open fun test(vararg var args : Any?) { -args = array(1, 2, 3) -} + open fun test(vararg var args: Any?) { + args = array(1, 2, 3) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/writableParameter.ide.kt b/j2k/tests/testData/ast/function/writableParameter.ide.kt index 2afd03d146a..0e7f5d54eb6 100644 --- a/j2k/tests/testData/ast/function/writableParameter.ide.kt +++ b/j2k/tests/testData/ast/function/writableParameter.ide.kt @@ -1,7 +1,8 @@ package demo + class Test() { -fun test(var i : Int) : Int { -i = 10 -return i + 20 -} + fun test(var i: Int): Int { + i = 10 + return i + 20 + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/function/writableParameter.kt b/j2k/tests/testData/ast/function/writableParameter.kt index b098e657066..a05f287437f 100644 --- a/j2k/tests/testData/ast/function/writableParameter.kt +++ b/j2k/tests/testData/ast/function/writableParameter.kt @@ -1,7 +1,8 @@ package demo + open class Test() { -open fun test(var i : Int) : Int { -i = 10 -return i + 20 -} + open fun test(var i: Int): Int { + i = 10 + return i + 20 + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt b/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt index 4b0bca2277f..78d53a75b25 100644 --- a/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt +++ b/j2k/tests/testData/ast/identifier/finalFieldReference.ide.kt @@ -2,12 +2,12 @@ class `$$$$$`() { } class `$`() { } -class `$$`(`$$$$` : `$$$$$`) : `$`() { -val `$$$` : `$$$$$` -public fun `$$$$$$`() : `$$$$$` { -return `$$$` -} -{ -`$$$` = `$$$$` -} +class `$$`(`$$$$`: `$$$$$`) : `$`() { + val `$$$`: `$$$$$` + public fun `$$$$$$`(): `$$$$$` { + return `$$$` + } + { + `$$$` = `$$$$` + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/identifier/finalFieldReference.kt b/j2k/tests/testData/ast/identifier/finalFieldReference.kt index 3e5423839fb..36a1a60ee84 100644 --- a/j2k/tests/testData/ast/identifier/finalFieldReference.kt +++ b/j2k/tests/testData/ast/identifier/finalFieldReference.kt @@ -2,12 +2,12 @@ open class `$$$$$`() { } open class `$`() { } -open class `$$`(`$$$$` : `$$$$$`?) : `$`() { -val `$$$` : `$$$$$`? -public open fun `$$$$$$`() : `$$$$$`? { -return `$$$` -} -{ -`$$$` = `$$$$` -} +open class `$$`(`$$$$`: `$$$$$`?) : `$`() { + val `$$$`: `$$$$$`? + public open fun `$$$$$$`(): `$$$$$`? { + return `$$$` + } + { + `$$$` = `$$$$` + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/identifier/keywords.ide.kt b/j2k/tests/testData/ast/identifier/keywords.ide.kt index 9dbe1a315e7..c0f0386ed2b 100644 --- a/j2k/tests/testData/ast/identifier/keywords.ide.kt +++ b/j2k/tests/testData/ast/identifier/keywords.ide.kt @@ -1,11 +1,11 @@ -val `as` : Int -val `type` : Int -val `val` : Int -val `var` : Int -val `fun` : Int -val `is` : Int -val `in` : Int -val `object` : Int -val `when` : Int -val `trait` : Int -val `This` : Int \ No newline at end of file +val `as`: Int +val `type`: Int +val `val`: Int +val `var`: Int +val `fun`: Int +val `is`: Int +val `in`: Int +val `object`: Int +val `when`: Int +val `trait`: Int +val `This`: Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/identifier/keywords.kt b/j2k/tests/testData/ast/identifier/keywords.kt index 5395a402d72..b33a48d6b8c 100644 --- a/j2k/tests/testData/ast/identifier/keywords.kt +++ b/j2k/tests/testData/ast/identifier/keywords.kt @@ -1,11 +1,11 @@ -var `as` : Int -var `type` : Int -var `val` : Int -var `var` : Int -var `fun` : Int -var `is` : Int -var `in` : Int -var `object` : Int -var `when` : Int -var `trait` : Int -var `This` : Int \ No newline at end of file +var `as`: Int +var `type`: Int +var `val`: Int +var `var`: Int +var `fun`: Int +var `is`: Int +var `in`: Int +var `object`: Int +var `when`: Int +var `trait`: Int +var `This`: Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.kt index 41cfc10ac2d..2b3c3b0429a 100644 --- a/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.kt +++ b/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.kt @@ -1,6 +1,6 @@ if (1 > 0) { -var n : Int = 1 +var n: Int = 1 return n } else diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.kt index a63a714b79c..93c2be105c5 100644 --- a/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.kt +++ b/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.kt @@ -1,5 +1,5 @@ if (1 > 0) { -var n : Int = 1 +var n: Int = 1 return n } \ No newline at end of file diff --git a/j2k/tests/testData/ast/importStatement/importWithKeywords.ide.kt b/j2k/tests/testData/ast/importStatement/importWithKeywords.ide.kt index a3323a31bbc..98b8ed3ed83 100644 --- a/j2k/tests/testData/ast/importStatement/importWithKeywords.ide.kt +++ b/j2k/tests/testData/ast/importStatement/importWithKeywords.ide.kt @@ -1,4 +1,6 @@ package test + import `as`.`type`.`val`.`var`.`fun`.`is`.`in`.`object`.`when`.`trait`.`This` + class Test() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/importStatement/importWithKeywords.kt b/j2k/tests/testData/ast/importStatement/importWithKeywords.kt index 63b5935201f..f47afc622d6 100644 --- a/j2k/tests/testData/ast/importStatement/importWithKeywords.kt +++ b/j2k/tests/testData/ast/importStatement/importWithKeywords.kt @@ -1,4 +1,6 @@ package test + import `as`.`type`.`val`.`var`.`fun`.`is`.`in`.`object`.`when`.`trait`.`This` + open class Test() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/importStatement/importWithStar.ide.kt b/j2k/tests/testData/ast/importStatement/importWithStar.ide.kt index 3539bfa815c..610d38e7eee 100644 --- a/j2k/tests/testData/ast/importStatement/importWithStar.ide.kt +++ b/j2k/tests/testData/ast/importStatement/importWithStar.ide.kt @@ -1,4 +1,6 @@ package org.jetbrains.jet.j2k + import org.jetbrains.annotations.* + public class Converter() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/importStatement/importWithStar.kt b/j2k/tests/testData/ast/importStatement/importWithStar.kt index c390c539acc..92bc61b3392 100644 --- a/j2k/tests/testData/ast/importStatement/importWithStar.kt +++ b/j2k/tests/testData/ast/importStatement/importWithStar.kt @@ -1,4 +1,6 @@ package org.jetbrains.jet.j2k + import org.jetbrains.annotations.* + public open class Converter() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/importStatement/simpleImport.ide.kt b/j2k/tests/testData/ast/importStatement/simpleImport.ide.kt index 39fdc3dbb56..c444c00d280 100644 --- a/j2k/tests/testData/ast/importStatement/simpleImport.ide.kt +++ b/j2k/tests/testData/ast/importStatement/simpleImport.ide.kt @@ -1,3 +1,4 @@ package org.jetbrains.jet.j2k + public class Converter() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/importStatement/simpleImport.kt b/j2k/tests/testData/ast/importStatement/simpleImport.kt index c35720004e5..78622841398 100644 --- a/j2k/tests/testData/ast/importStatement/simpleImport.kt +++ b/j2k/tests/testData/ast/importStatement/simpleImport.kt @@ -1,3 +1,4 @@ package org.jetbrains.jet.j2k + public open class Converter() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/inProjectionType/methodParams.ide.kt b/j2k/tests/testData/ast/inProjectionType/methodParams.ide.kt index e2b9e873a85..ab6ba2211d8 100644 --- a/j2k/tests/testData/ast/inProjectionType/methodParams.ide.kt +++ b/j2k/tests/testData/ast/inProjectionType/methodParams.ide.kt @@ -1,2 +1,2 @@ -fun popAll(dst : Collection) { +fun popAll(dst: Collection) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/inProjectionType/methodParams.kt b/j2k/tests/testData/ast/inProjectionType/methodParams.kt index 628f7adac85..44136a2ff0c 100644 --- a/j2k/tests/testData/ast/inProjectionType/methodParams.kt +++ b/j2k/tests/testData/ast/inProjectionType/methodParams.kt @@ -1,2 +1,2 @@ -fun popAll(dst : Collection?) { +fun popAll(dst: Collection?) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt index b9010dcd7f3..a787629a59e 100644 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt +++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.ide.kt @@ -1,8 +1,8 @@ -class Base(name : T) { -} -class One(name : T, second : K) : Base(name) { -private var mySecond : K = 0 -{ -mySecond = second +class Base(name: T) { } +class One(name: T, second: K) : Base(name) { + private var mySecond: K = 0 + { + mySecond = second + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt index a324e8503b5..fa23657209a 100644 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt +++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseGeneric.kt @@ -1,8 +1,8 @@ -open class Base(name : T?) { -} -open class One(name : T?, second : K?) : Base(name) { -private var mySecond : K? = null -{ -mySecond = second +open class Base(name: T?) { } +open class One(name: T?, second: K?) : Base(name) { + private var mySecond: K? = null + { + mySecond = second + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt index 266245b9495..a7ed390e22c 100644 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt +++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.ide.kt @@ -1,4 +1,4 @@ -class Base(name : String) { +class Base(name: String) { } -class One(name : String, second : String) : Base(name) { +class One(name: String, second: String) : Base(name) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.kt index 3e82be38c5c..aedde863e0e 100644 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.kt +++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithOneParam.kt @@ -1,4 +1,4 @@ -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) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt index 2f7587496cb..6a6f6183046 100644 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt +++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.ide.kt @@ -1,8 +1,8 @@ -class Base(name : String) { -} -class One(name : String, second : String) : Base(name) { -private var mySecond : String = 0 -{ -mySecond = second +class Base(name: String) { } +class One(name: String, second: String) : Base(name) { + private var mySecond: String = 0 + { + mySecond = second + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt index cd9b7f3b8e9..403bd4a4c5f 100644 --- a/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt +++ b/j2k/tests/testData/ast/inheritance/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt @@ -1,8 +1,8 @@ -open class Base(name : String?) { -} -open class One(name : String?, second : String?) : Base(name) { -private var mySecond : String? = null -{ -mySecond = second +open class Base(name: String?) { } +open class One(name: String?, second: String?) : Base(name) { + private var mySecond: String? = null + { + mySecond = second + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/arrayLength.ide.kt b/j2k/tests/testData/ast/issues/arrayLength.ide.kt index 2e7349c1c5d..a68f7e6e4db 100644 --- a/j2k/tests/testData/ast/issues/arrayLength.ide.kt +++ b/j2k/tests/testData/ast/issues/arrayLength.ide.kt @@ -1,7 +1,7 @@ class Test() { -class object { -public fun foo(args : Array) : Int { -return args.size -} -} + class object { + public fun foo(args: Array): Int { + return args.size + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/arrayLength.kt b/j2k/tests/testData/ast/issues/arrayLength.kt index c8082cf2e65..9164aa943a0 100644 --- a/j2k/tests/testData/ast/issues/arrayLength.kt +++ b/j2k/tests/testData/ast/issues/arrayLength.kt @@ -1,7 +1,7 @@ open class Test() { -class object { -public open fun foo(args : Array?) : Int { -return args?.size!! -} -} + class object { + public open fun foo(args: Array?): Int { + return args?.size!! + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/comments.ide.kt b/j2k/tests/testData/ast/issues/comments.ide.kt index c85a32cbedf..36caef222c6 100644 --- a/j2k/tests/testData/ast/issues/comments.ide.kt +++ b/j2k/tests/testData/ast/issues/comments.ide.kt @@ -3,15 +3,15 @@ This is a block comment */ class C() { -// This is a class comment -/** - * This is a field doc comment. - */ -private var i : Int = 0 -/** - * This is a function doc comment. - */ -public fun foo() { -/* This is a function comment */ -} + // This is a class comment + /** + * This is a field doc comment. + */ + private var i: Int = 0 + /** + * This is a function doc comment. + */ + public fun foo() { + /* This is a function comment */ + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/comments.kt b/j2k/tests/testData/ast/issues/comments.kt index 4841220b571..9b4a400aefe 100644 --- a/j2k/tests/testData/ast/issues/comments.kt +++ b/j2k/tests/testData/ast/issues/comments.kt @@ -3,15 +3,15 @@ This is a block comment */ open class C() { -// This is a class comment -/** - * This is a field doc comment. - */ -private var i : Int = 0 -/** - * This is a function doc comment. - */ -public open fun foo() { -/* This is a function comment */ -} + // This is a class comment + /** + * This is a field doc comment. + */ + private var i: Int = 0 + /** + * This is a function doc comment. + */ + public open fun foo() { + /* This is a function comment */ + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-1016.ide.kt b/j2k/tests/testData/ast/issues/kt-1016.ide.kt index 93b6c42788a..b7eb2f7cb80 100644 --- a/j2k/tests/testData/ast/issues/kt-1016.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-1016.ide.kt @@ -1,7 +1,8 @@ package demo -class C(i : Int) { -private val i : Int -{ -this.i = i -} + +class C(i: Int) { + private val i: Int + { + this.i = i + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-1016.kt b/j2k/tests/testData/ast/issues/kt-1016.kt index 801abcf6e5a..3d14dea29ee 100644 --- a/j2k/tests/testData/ast/issues/kt-1016.kt +++ b/j2k/tests/testData/ast/issues/kt-1016.kt @@ -1,7 +1,8 @@ package demo -open class C(i : Int) { -private val i : Int -{ -this.i = i -} + +open class C(i: Int) { + private val i: Int + { + this.i = i + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-1048.ide.kt b/j2k/tests/testData/ast/issues/kt-1048.ide.kt index 6a08d106ad7..3963a9169a3 100644 --- a/j2k/tests/testData/ast/issues/kt-1048.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-1048.ide.kt @@ -1,14 +1,15 @@ import java.util.HashMap -class G(t : T) { + +class G(t: T) { } public class Java() { -fun test() { -val m = HashMap() -m.put(1, 1) -} -fun test2() { -val m = HashMap() -val g = G("") -val g2 = G("") -} + fun test() { + val m = HashMap() + m.put(1, 1) + } + fun test2() { + val m = HashMap() + val g = G("") + val g2 = G("") + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-1048.kt b/j2k/tests/testData/ast/issues/kt-1048.kt index 2cdc1976e7c..91ae0c06003 100644 --- a/j2k/tests/testData/ast/issues/kt-1048.kt +++ b/j2k/tests/testData/ast/issues/kt-1048.kt @@ -1,14 +1,15 @@ import java.util.HashMap -open class G(t : T?) { + +open class G(t: T?) { } public open class Java() { -open fun test() { -var m : HashMap? = HashMap() -m?.put(1, 1) -} -open fun test2() { -var m : HashMap<*, *>? = HashMap() -var g : G? = G("") -var g2 : G? = G("") -} + open fun test() { + var m: HashMap? = HashMap() + m?.put(1, 1) + } + open fun test2() { + var m: HashMap<*, *>? = HashMap() + var g: G? = G("") + var g2: G? = G("") + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-1074.ide.kt b/j2k/tests/testData/ast/issues/kt-1074.ide.kt index 193a67b19fe..56321222166 100644 --- a/j2k/tests/testData/ast/issues/kt-1074.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-1074.ide.kt @@ -1,13 +1,14 @@ package demo + class Test() { -class object { -fun subListRangeCheck(fromIndex : Int, toIndex : Int, size : Int) { -if (fromIndex < 0) -throw IndexOutOfBoundsException("fromIndex = " + fromIndex) -if (toIndex > size) -throw IndexOutOfBoundsException("toIndex = " + toIndex) -if (fromIndex > toIndex) -throw IllegalArgumentException("fromIndex(" + fromIndex + ") > toIndex(" + toIndex + ")") -} -} + class object { + fun subListRangeCheck(fromIndex: Int, toIndex: Int, size: Int) { + if (fromIndex < 0) + throw IndexOutOfBoundsException("fromIndex = " + fromIndex) + if (toIndex > size) + throw IndexOutOfBoundsException("toIndex = " + toIndex) + if (fromIndex > toIndex) + throw IllegalArgumentException("fromIndex(" + fromIndex + ") > toIndex(" + toIndex + ")") + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-1074.kt b/j2k/tests/testData/ast/issues/kt-1074.kt index 3b20d29c847..ae17f4cd853 100644 --- a/j2k/tests/testData/ast/issues/kt-1074.kt +++ b/j2k/tests/testData/ast/issues/kt-1074.kt @@ -1,13 +1,14 @@ package demo + open class Test() { -class object { -open fun subListRangeCheck(fromIndex : Int, toIndex : Int, size : Int) { -if (fromIndex < 0) -throw IndexOutOfBoundsException("fromIndex = " + fromIndex) -if (toIndex > size) -throw IndexOutOfBoundsException("toIndex = " + toIndex) -if (fromIndex > toIndex) -throw IllegalArgumentException("fromIndex(" + fromIndex + ") > toIndex(" + toIndex + ")") -} -} + class object { + open fun subListRangeCheck(fromIndex: Int, toIndex: Int, size: Int) { + if (fromIndex < 0) + throw IndexOutOfBoundsException("fromIndex = " + fromIndex) + if (toIndex > size) + throw IndexOutOfBoundsException("toIndex = " + toIndex) + if (fromIndex > toIndex) + throw IllegalArgumentException("fromIndex(" + fromIndex + ") > toIndex(" + toIndex + ")") + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-543-boxed.ide.kt b/j2k/tests/testData/ast/issues/kt-543-boxed.ide.kt index 6263a8e5335..78c96087c64 100644 --- a/j2k/tests/testData/ast/issues/kt-543-boxed.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-543-boxed.ide.kt @@ -1,11 +1,12 @@ package demo + class Test() { -fun putInt(i : Int) { -} -fun test() { -val b = 10 -putInt(b.toInt()) -val b2 = 10 -putInt(b2.toInt()) -} + fun putInt(i: Int) { + } + fun test() { + val b = 10 + putInt(b.toInt()) + val b2 = 10 + putInt(b2.toInt()) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-543-boxed.kt b/j2k/tests/testData/ast/issues/kt-543-boxed.kt index 0b202ba6075..caace9b949e 100644 --- a/j2k/tests/testData/ast/issues/kt-543-boxed.kt +++ b/j2k/tests/testData/ast/issues/kt-543-boxed.kt @@ -1,11 +1,12 @@ package demo + open class Test() { -open fun putInt(i : Int?) { -} -open fun test() { -var b : Byte = 10 -putInt(b.toInt()) -var b2 : Byte? = 10 -putInt(b2?.toInt()) -} + open fun putInt(i: Int?) { + } + open fun test() { + var b: Byte = 10 + putInt(b.toInt()) + var b2: Byte? = 10 + putInt(b2?.toInt()) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-543-mixed.ide.kt b/j2k/tests/testData/ast/issues/kt-543-mixed.ide.kt index 7ca01a76547..fa60b2b2919 100644 --- a/j2k/tests/testData/ast/issues/kt-543-mixed.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-543-mixed.ide.kt @@ -1,9 +1,10 @@ package demo + class Test() { -fun putInt(i : Int) { -} -fun test() { -val i = 10 -putInt(i) -} + fun putInt(i: Int) { + } + fun test() { + val i = 10 + putInt(i) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-543-mixed.kt b/j2k/tests/testData/ast/issues/kt-543-mixed.kt index 191485b8b48..40da8120e33 100644 --- a/j2k/tests/testData/ast/issues/kt-543-mixed.kt +++ b/j2k/tests/testData/ast/issues/kt-543-mixed.kt @@ -1,9 +1,10 @@ package demo + open class Test() { -open fun putInt(i : Int?) { -} -open fun test() { -var i : Int = 10 -putInt(i) -} + open fun putInt(i: Int?) { + } + open fun test() { + var i: Int = 10 + putInt(i) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-543.ide.kt b/j2k/tests/testData/ast/issues/kt-543.ide.kt index 4bec2bddb9e..2e6b93b5a3d 100644 --- a/j2k/tests/testData/ast/issues/kt-543.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-543.ide.kt @@ -1,9 +1,10 @@ package demo + class Test() { -fun putInt(i : Int) { -} -fun test() { -val b = 10 -putInt(b.toInt()) -} + fun putInt(i: Int) { + } + fun test() { + val b = 10 + putInt(b.toInt()) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-543.kt b/j2k/tests/testData/ast/issues/kt-543.kt index 4b77fc846c4..13008455c58 100644 --- a/j2k/tests/testData/ast/issues/kt-543.kt +++ b/j2k/tests/testData/ast/issues/kt-543.kt @@ -1,9 +1,10 @@ package demo + open class Test() { -open fun putInt(i : Int) { -} -open fun test() { -var b : Byte = 10 -putInt(b.toInt()) -} + open fun putInt(i: Int) { + } + open fun test() { + var b: Byte = 10 + putInt(b.toInt()) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-638.ide.kt b/j2k/tests/testData/ast/issues/kt-638.ide.kt index 795a1a3add1..8237d8ad8c1 100644 --- a/j2k/tests/testData/ast/issues/kt-638.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-638.ide.kt @@ -1,38 +1,38 @@ -public class Identifier(_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 init(name : T) : Identifier { -val __ = Identifier(name, false) -return __ -} -public fun init(name : T, isNullable : Boolean) : Identifier { -val __ = Identifier(name, false) -__.myNullable = isNullable -return __ -} -public fun init(name : T, hasDollar : Boolean, isNullable : Boolean) : Identifier { -val __ = Identifier(name, hasDollar) -__.myNullable = isNullable -return __ -} -} +public class Identifier(_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 init(name: T): Identifier { + val __ = Identifier(name, false) + return __ + } + public fun init(name: T, isNullable: Boolean): Identifier { + val __ = Identifier(name, false) + __.myNullable = isNullable + return __ + } + public fun init(name: T, hasDollar: Boolean, isNullable: Boolean): Identifier { + val __ = Identifier(name, hasDollar) + __.myNullable = isNullable + return __ + } + } } public class User() { -class object { -public fun main(args : Array) { -val i1 = Identifier.init("name", false, true) -val i2 = Identifier.init("name", false) -val i3 = Identifier.init("name") + class object { + public fun main(args: Array) { + val i1 = Identifier.init("name", false, true) + val i2 = Identifier.init("name", false) + val i3 = Identifier.init("name") + } + } } -} -} -fun main(args : Array) = User.main(args as Array?) \ No newline at end of file +fun main(args: Array) = User.main(args as Array?) \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-638.kt b/j2k/tests/testData/ast/issues/kt-638.kt index 2052bc6656c..fc80ebb18a4 100644 --- a/j2k/tests/testData/ast/issues/kt-638.kt +++ b/j2k/tests/testData/ast/issues/kt-638.kt @@ -1,38 +1,38 @@ -public open class Identifier(_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 init(name : T?) : Identifier { -val __ = Identifier(name, false) -return __ -} -public open fun init(name : T?, isNullable : Boolean) : Identifier { -val __ = Identifier(name, false) -__.myNullable = isNullable -return __ -} -public open fun init(name : T?, hasDollar : Boolean, isNullable : Boolean) : Identifier { -val __ = Identifier(name, hasDollar) -__.myNullable = isNullable -return __ -} -} +public open class Identifier(_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 init(name: T?): Identifier { + val __ = Identifier(name, false) + return __ + } + public open fun init(name: T?, isNullable: Boolean): Identifier { + val __ = Identifier(name, false) + __.myNullable = isNullable + return __ + } + public open fun init(name: T?, hasDollar: Boolean, isNullable: Boolean): Identifier { + val __ = Identifier(name, hasDollar) + __.myNullable = isNullable + return __ + } + } } public open class User() { -class object { -public open fun main(args : Array?) { -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(args: Array?) { + var i1: Identifier<*>? = Identifier.init("name", false, true) + var i2: Identifier<*>? = Identifier.init("name", false) + var i3: Identifier<*>? = Identifier.init("name") + } + } } -} -} -fun main(args : Array) = User.main(args as Array?) \ No newline at end of file +fun main(args: Array) = User.main(args as Array?) \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-696.ide.kt b/j2k/tests/testData/ast/issues/kt-696.ide.kt index e684d6d2294..9adf5f0dec4 100644 --- a/j2k/tests/testData/ast/issues/kt-696.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-696.ide.kt @@ -1,23 +1,24 @@ package test + class Base() { -public fun hashCode() : Int { -return System.identityHashCode(this) -} -public fun equals(o : Any) : Boolean { -return this.identityEquals(o) -} -public fun toString() : String { -return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) -} + public fun hashCode(): Int { + return System.identityHashCode(this) + } + public fun equals(o: Any): Boolean { + return this.identityEquals(o) + } + public fun toString(): String { + return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) + } } class Child() : Base() { -override fun hashCode() : Int { -return super.hashCode() -} -override fun equals(o : Any) : Boolean { -return super.equals(o) -} -override fun toString() : String { -return super.toString() -} + override fun hashCode(): Int { + return super.hashCode() + } + override fun equals(o: Any): Boolean { + return super.equals(o) + } + override fun toString(): String { + return super.toString() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-696.kt b/j2k/tests/testData/ast/issues/kt-696.kt index dedcc48e291..6f7a0b9aae2 100644 --- a/j2k/tests/testData/ast/issues/kt-696.kt +++ b/j2k/tests/testData/ast/issues/kt-696.kt @@ -1,23 +1,24 @@ package test + open class Base() { -public open fun hashCode() : Int { -return System.identityHashCode(this) -} -public open fun equals(o : Any?) : Boolean { -return this.identityEquals(o) -} -public open fun toString() : String? { -return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) -} + public open fun hashCode(): Int { + return System.identityHashCode(this) + } + public open fun equals(o: Any?): Boolean { + return this.identityEquals(o) + } + public open fun toString(): String? { + return getJavaClass.getName() + '@' + Integer.toHexString(hashCode()) + } } open class Child() : Base() { -override fun hashCode() : Int { -return super.hashCode() -} -override fun equals(o : Any?) : Boolean { -return super.equals(o) -} -override fun toString() : String? { -return super.toString() -} + override fun hashCode(): Int { + return super.hashCode() + } + override fun equals(o: Any?): Boolean { + return super.equals(o) + } + override fun toString(): String? { + return super.toString() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-792-mixed.ide.kt b/j2k/tests/testData/ast/issues/kt-792-mixed.ide.kt index 7c74d13cb0a..c7b886e0e11 100644 --- a/j2k/tests/testData/ast/issues/kt-792-mixed.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-792-mixed.ide.kt @@ -1,7 +1,8 @@ package demo -class Test(i : Int) { -fun test() { -val i = 10 -Test(i) -} + +class Test(i: Int) { + fun test() { + val i = 10 + Test(i) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-792-mixed.kt b/j2k/tests/testData/ast/issues/kt-792-mixed.kt index a3ba1b47946..2c71b72c9ff 100644 --- a/j2k/tests/testData/ast/issues/kt-792-mixed.kt +++ b/j2k/tests/testData/ast/issues/kt-792-mixed.kt @@ -1,7 +1,8 @@ package demo -open class Test(i : Int?) { -open fun test() { -var i : Int = 10 -Test(i) -} + +open class Test(i: Int?) { + open fun test() { + var i: Int = 10 + Test(i) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-792.ide.kt b/j2k/tests/testData/ast/issues/kt-792.ide.kt index c4378be5213..f947568586b 100644 --- a/j2k/tests/testData/ast/issues/kt-792.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-792.ide.kt @@ -1,7 +1,8 @@ package demo -class Test(i : Int) { -fun test() { -val b = 10 -Test(b.toInt()) -} + +class Test(i: Int) { + fun test() { + val b = 10 + Test(b.toInt()) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-792.kt b/j2k/tests/testData/ast/issues/kt-792.kt index 5d3a34252f9..342d735dc88 100644 --- a/j2k/tests/testData/ast/issues/kt-792.kt +++ b/j2k/tests/testData/ast/issues/kt-792.kt @@ -1,7 +1,8 @@ package demo -open class Test(i : Int) { -open fun test() { -var b : Byte = 10 -Test(b.toInt()) -} + +open class Test(i: Int) { + open fun test() { + var b: Byte = 10 + Test(b.toInt()) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-794-mixed.ide.kt b/j2k/tests/testData/ast/issues/kt-794-mixed.ide.kt index d985d167d7a..6cf64956d7b 100644 --- a/j2k/tests/testData/ast/issues/kt-794-mixed.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-794-mixed.ide.kt @@ -1,9 +1,10 @@ package demo + class Test() { -fun getInteger(i : Int) : Int { -return i -} -fun test() { -val i = getInteger(10)!! -} + fun getInteger(i: Int): Int { + return i + } + fun test() { + val i = getInteger(10)!! + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-794-mixed.kt b/j2k/tests/testData/ast/issues/kt-794-mixed.kt index aa937d2512f..6bc4e670398 100644 --- a/j2k/tests/testData/ast/issues/kt-794-mixed.kt +++ b/j2k/tests/testData/ast/issues/kt-794-mixed.kt @@ -1,9 +1,10 @@ package demo + open class Test() { -open fun getInteger(i : Int?) : Int? { -return i -} -open fun test() { -var i : Int = getInteger(10)!! -} + open fun getInteger(i: Int?): Int? { + return i + } + open fun test() { + var i: Int = getInteger(10)!! + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-794.ide.kt b/j2k/tests/testData/ast/issues/kt-794.ide.kt index b7067e73b22..fc8a0f8fb4e 100644 --- a/j2k/tests/testData/ast/issues/kt-794.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-794.ide.kt @@ -1,6 +1,6 @@ class Test() { -fun getInt() : Int { -val b = 10 -return b.toInt() -} + fun getInt(): Int { + val b = 10 + return b.toInt() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-794.kt b/j2k/tests/testData/ast/issues/kt-794.kt index f27c7dcba3e..9c85a938677 100644 --- a/j2k/tests/testData/ast/issues/kt-794.kt +++ b/j2k/tests/testData/ast/issues/kt-794.kt @@ -1,6 +1,6 @@ open class Test() { -open fun getInt() : Int { -var b : Byte = 10 -return b.toInt() -} + open fun getInt(): Int { + var b: Byte = 10 + return b.toInt() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-809-string.ide.kt b/j2k/tests/testData/ast/issues/kt-809-string.ide.kt index a50c85da690..ea61fae6a2b 100644 --- a/j2k/tests/testData/ast/issues/kt-809-string.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-809-string.ide.kt @@ -1,19 +1,20 @@ package demo + class Container() { -var myString : String = "1" + var myString: String = "1" } class One() { -class object { -var myContainer : Container = Container() + class object { + var myContainer: Container = Container() + } } -} -class StringContainer(s : String) { +class StringContainer(s: String) { } class Test() { -fun putString(s : String) { -} -fun test() { -putString(One.myContainer.myString) -StringContainer(One.myContainer.myString) -} + fun putString(s: String) { + } + fun test() { + putString(One.myContainer.myString) + StringContainer(One.myContainer.myString) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-809-string.kt b/j2k/tests/testData/ast/issues/kt-809-string.kt index 8899df9f049..fa038c8da75 100644 --- a/j2k/tests/testData/ast/issues/kt-809-string.kt +++ b/j2k/tests/testData/ast/issues/kt-809-string.kt @@ -1,19 +1,20 @@ package demo + open class Container() { -var myString : String? = "1" + var myString: String? = "1" } open class One() { -class object { -var myContainer : Container? = Container() + class object { + var myContainer: Container? = Container() + } } -} -open class StringContainer(s : String?) { +open class StringContainer(s: String?) { } open class Test() { -open fun putString(s : String?) { -} -open fun test() { -putString(One.myContainer?.myString) -StringContainer(One.myContainer?.myString) -} + open fun putString(s: String?) { + } + open fun test() { + putString(One.myContainer?.myString) + StringContainer(One.myContainer?.myString) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-809.ide.kt b/j2k/tests/testData/ast/issues/kt-809.ide.kt index 03bc44ea02d..9705cb9ef2d 100644 --- a/j2k/tests/testData/ast/issues/kt-809.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-809.ide.kt @@ -1,19 +1,20 @@ package demo + class Container() { -var myInt : Int = 1 + var myInt: Int = 1 } class One() { -class object { -var myContainer : Container = Container() + class object { + var myContainer: Container = Container() + } } -} -class IntContainer(i : Int) { +class IntContainer(i: Int) { } class Test() { -fun putInt(i : Int) { -} -fun test() { -putInt(One.myContainer.myInt) -IntContainer(One.myContainer.myInt) -} + fun putInt(i: Int) { + } + fun test() { + putInt(One.myContainer.myInt) + IntContainer(One.myContainer.myInt) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-809.kt b/j2k/tests/testData/ast/issues/kt-809.kt index 21274c4d138..dab58dadf3a 100644 --- a/j2k/tests/testData/ast/issues/kt-809.kt +++ b/j2k/tests/testData/ast/issues/kt-809.kt @@ -1,19 +1,20 @@ package demo + open class Container() { -var myInt : Int = 1 + var myInt: Int = 1 } open class One() { -class object { -var myContainer : Container? = Container() + class object { + var myContainer: Container? = Container() + } } -} -open class IntContainer(i : Int) { +open class IntContainer(i: Int) { } open class Test() { -open fun putInt(i : Int) { -} -open fun test() { -putInt(One.myContainer?.myInt!!) -IntContainer(One.myContainer?.myInt!!) -} + open fun putInt(i: Int) { + } + open fun test() { + putInt(One.myContainer?.myInt!!) + IntContainer(One.myContainer?.myInt!!) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-820-field.ide.kt b/j2k/tests/testData/ast/issues/kt-820-field.ide.kt index 69b7fc6c6f6..21fd4b307ac 100644 --- a/j2k/tests/testData/ast/issues/kt-820-field.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-820-field.ide.kt @@ -1,12 +1,13 @@ package demo + class Container() { -var myInt : Int = 1 + var myInt: Int = 1 } class One() { -class object { -var myContainer : Container = Container() -} + class object { + var myContainer: Container = Container() + } } class Test() { -var b : Byte = One.myContainer.myInt.toByte() + var b: Byte = One.myContainer.myInt.toByte() } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-820-field.kt b/j2k/tests/testData/ast/issues/kt-820-field.kt index 5f9141abcc7..dab2a693849 100644 --- a/j2k/tests/testData/ast/issues/kt-820-field.kt +++ b/j2k/tests/testData/ast/issues/kt-820-field.kt @@ -1,12 +1,13 @@ package demo + open class Container() { -var myInt : Int = 1 + var myInt: Int = 1 } open class One() { -class object { -var myContainer : Container? = Container() -} + class object { + var myContainer: Container? = Container() + } } open class Test() { -var b : Byte = One.myContainer?.myInt!!.toByte() + var b: Byte = One.myContainer?.myInt!!.toByte() } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-820-string.ide.kt b/j2k/tests/testData/ast/issues/kt-820-string.ide.kt index 0d71b4c5309..f9ab23ad088 100644 --- a/j2k/tests/testData/ast/issues/kt-820-string.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-820-string.ide.kt @@ -1,8 +1,8 @@ class Test() { -class object { -public fun toFileSystemSafeName(name : String) : String { -val size = name.length() -return name -} -} + class object { + public fun toFileSystemSafeName(name: String): String { + val size = name.length() + return name + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-820-string.kt b/j2k/tests/testData/ast/issues/kt-820-string.kt index 762e1aa8f90..cdf5f625bea 100644 --- a/j2k/tests/testData/ast/issues/kt-820-string.kt +++ b/j2k/tests/testData/ast/issues/kt-820-string.kt @@ -1,8 +1,8 @@ open class Test() { -class object { -public open fun toFileSystemSafeName(name : String?) : String? { -var size : Int = name?.length()!! -return name -} -} + class object { + public open fun toFileSystemSafeName(name: String?): String? { + var size: Int = name?.length()!! + return name + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-820.ide.kt b/j2k/tests/testData/ast/issues/kt-820.ide.kt index cc29672c4b3..f480216c8c8 100644 --- a/j2k/tests/testData/ast/issues/kt-820.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-820.ide.kt @@ -1,14 +1,15 @@ package demo + class Container() { -var myInt : Int = 1 + var myInt: Int = 1 } class One() { -class object { -var myContainer : Container = Container() -} + class object { + var myContainer: Container = Container() + } } class Test() { -fun test() { -val b = One.myContainer.myInt.toByte() -} + fun test() { + val b = One.myContainer.myInt.toByte() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-820.kt b/j2k/tests/testData/ast/issues/kt-820.kt index 41edf849b00..0fd08b78df5 100644 --- a/j2k/tests/testData/ast/issues/kt-820.kt +++ b/j2k/tests/testData/ast/issues/kt-820.kt @@ -1,14 +1,15 @@ package demo + open class Container() { -var myInt : Int = 1 + var myInt: Int = 1 } open class One() { -class object { -var myContainer : Container? = Container() -} + class object { + var myContainer: Container? = Container() + } } open class Test() { -open fun test() { -var b : Byte = One.myContainer?.myInt!!.toByte() -} + open fun test() { + var b: Byte = One.myContainer?.myInt!!.toByte() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-824-isDir.ide.kt b/j2k/tests/testData/ast/issues/kt-824-isDir.ide.kt index 6cef6156624..f34e446f1b1 100644 --- a/j2k/tests/testData/ast/issues/kt-824-isDir.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-824-isDir.ide.kt @@ -1,22 +1,24 @@ package test + import java.io.File + /** -* User: ignatov -*/ + * User: ignatov + */ public class Test() { -class object { -public fun isDir(parent : File) : Boolean { -if (parent == null || !parent.exists()) -{ -return false -} -val result = true -if (parent.isDirectory()) -{ -return true -} -else -return false -} -} + class object { + public fun isDir(parent: File): Boolean { + if (parent == null || !parent.exists()) + { + return false + } + val result = true + if (parent.isDirectory()) + { + return true + } + else + return false + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-824-isDir.kt b/j2k/tests/testData/ast/issues/kt-824-isDir.kt index 715092216b6..4e088c7b1e4 100644 --- a/j2k/tests/testData/ast/issues/kt-824-isDir.kt +++ b/j2k/tests/testData/ast/issues/kt-824-isDir.kt @@ -1,22 +1,24 @@ package test + import java.io.File + /** -* User: ignatov -*/ + * User: ignatov + */ public open class Test() { -class object { -public open fun isDir(parent : File?) : Boolean { -if (parent == null || !parent?.exists()!!) -{ -return false -} -var result : Boolean = true -if (parent?.isDirectory()!!) -{ -return true -} -else -return false -} -} + class object { + public open fun isDir(parent: File?): Boolean { + if (parent == null || !parent?.exists()!!) + { + return false + } + var result: Boolean = true + if (parent?.isDirectory()!!) + { + return true + } + else + return false + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-824.ide.kt b/j2k/tests/testData/ast/issues/kt-824.ide.kt index 2148721145f..33fdf09a833 100644 --- a/j2k/tests/testData/ast/issues/kt-824.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-824.ide.kt @@ -1,26 +1,27 @@ package demo + class Container() { -var myBoolean : Boolean = true + var myBoolean: Boolean = true } class One() { -class object { -var myContainer : Container = Container() -} + class object { + var myContainer: Container = Container() + } } class Test() { -fun test() { -if (One.myContainer.myBoolean) -System.out.println("Ok") -val s = (if (One.myContainer.myBoolean) -"YES" -else -"NO") -while (One.myContainer.myBoolean) -System.out.println("Ok") -do -{ -System.out.println("Ok") -} -while (One.myContainer.myBoolean) -} + fun test() { + if (One.myContainer.myBoolean) + System.out.println("Ok") + val s = (if (One.myContainer.myBoolean) + "YES" + else + "NO") + while (One.myContainer.myBoolean) + System.out.println("Ok") + do + { + System.out.println("Ok") + } + while (One.myContainer.myBoolean) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-824.kt b/j2k/tests/testData/ast/issues/kt-824.kt index 426738359a5..73fced71bd9 100644 --- a/j2k/tests/testData/ast/issues/kt-824.kt +++ b/j2k/tests/testData/ast/issues/kt-824.kt @@ -1,26 +1,27 @@ package demo + open class Container() { -var myBoolean : Boolean = true + var myBoolean: Boolean = true } open class One() { -class object { -var myContainer : Container? = Container() -} + class object { + var myContainer: Container? = Container() + } } open class Test() { -open fun test() { -if (One.myContainer?.myBoolean!!) -System.out?.println("Ok") -var s : String? = (if (One.myContainer?.myBoolean!!) -"YES" -else -"NO") -while (One.myContainer?.myBoolean!!) -System.out?.println("Ok") -do -{ -System.out?.println("Ok") -} -while (One.myContainer?.myBoolean!!) -} + open fun test() { + if (One.myContainer?.myBoolean!!) + System.out?.println("Ok") + var s: String? = (if (One.myContainer?.myBoolean!!) + "YES" + else + "NO") + while (One.myContainer?.myBoolean!!) + System.out?.println("Ok") + do + { + System.out?.println("Ok") + } + while (One.myContainer?.myBoolean!!) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-828.ide.kt b/j2k/tests/testData/ast/issues/kt-828.ide.kt index 4309c3fb376..82edae5c5ba 100644 --- a/j2k/tests/testData/ast/issues/kt-828.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-828.ide.kt @@ -1,14 +1,14 @@ class Test() { -fun test() { -val res = true -res = res and false -res = res or false -res = res xor false -System.out.println(true and false) -System.out.println(true or false) -System.out.println(true xor false) -System.out.println(!true) -System.out.println(true && false) -System.out.println(true || false) -} + fun test() { + val res = true + res = res and false + res = res or false + res = res xor false + System.out.println(true and false) + System.out.println(true or false) + System.out.println(true xor false) + System.out.println(!true) + System.out.println(true && false) + System.out.println(true || false) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-828.kt b/j2k/tests/testData/ast/issues/kt-828.kt index 03ed14b63e8..d7234738e39 100644 --- a/j2k/tests/testData/ast/issues/kt-828.kt +++ b/j2k/tests/testData/ast/issues/kt-828.kt @@ -1,14 +1,14 @@ open class Test() { -open fun test() { -var res : Boolean = true -res = res and false -res = res or false -res = res xor false -System.out?.println(true and false) -System.out?.println(true or false) -System.out?.println(true xor false) -System.out?.println(!true) -System.out?.println(true && false) -System.out?.println(true || false) -} + open fun test() { + var res: Boolean = true + res = res and false + res = res or false + res = res xor false + System.out?.println(true and false) + System.out?.println(true or false) + System.out?.println(true xor false) + System.out?.println(!true) + System.out?.println(true && false) + System.out?.println(true || false) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-836.ide.kt b/j2k/tests/testData/ast/issues/kt-836.ide.kt index ee309b5da2b..fb1b78b4f11 100644 --- a/j2k/tests/testData/ast/issues/kt-836.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-836.ide.kt @@ -1,25 +1,27 @@ package com.voltvoodoo.saplo4j.model + import java.io.Serializable -public class Language(code : String) : Serializable { -protected var code : String = 0 -override fun toString() : String { -return this.code -} -{ -this.code = code -} + +public class Language(code: String) : Serializable { + protected var code: String = 0 + override fun toString(): String { + return this.code + } + { + this.code = code + } } class Base() { -fun test() { -} -fun toString() : String { -return "BASE" -} + fun test() { + } + fun toString(): String { + return "BASE" + } } class Child() : Base() { -override fun test() { -} -override fun toString() : String { -return "Child" -} + override fun test() { + } + override fun toString(): String { + return "Child" + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-836.kt b/j2k/tests/testData/ast/issues/kt-836.kt index be6f2359ae0..b51e71678a6 100644 --- a/j2k/tests/testData/ast/issues/kt-836.kt +++ b/j2k/tests/testData/ast/issues/kt-836.kt @@ -1,25 +1,27 @@ package com.voltvoodoo.saplo4j.model + import java.io.Serializable -public open class Language(code : String?) : Serializable { -protected var code : String? = null -override fun toString() : String? { -return this.code -} -{ -this.code = code -} + +public open class Language(code: String?) : Serializable { + protected var code: String? = null + override fun toString(): String? { + return this.code + } + { + this.code = code + } } open class Base() { -open fun test() { -} -open fun toString() : String? { -return "BASE" -} + open fun test() { + } + open fun toString(): String? { + return "BASE" + } } open class Child() : Base() { -override fun test() { -} -override fun toString() : String? { -return "Child" -} + override fun test() { + } + override fun toString(): String? { + return "Child" + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-837.ide.kt b/j2k/tests/testData/ast/issues/kt-837.ide.kt index 4850b2319c2..d770f4caecf 100644 --- a/j2k/tests/testData/ast/issues/kt-837.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-837.ide.kt @@ -1,16 +1,18 @@ package com.voltvoodoo.saplo4j.model + import java.io.Serializable -public class Language(code : String) : Serializable { -protected var code : String = 0 -public fun equals(other : Language) : Boolean { -return other.toString().equals(this.toString()) -} -{ -this.code = code -} -class object { -public var ENGLISH : Language = Language("en") -public var SWEDISH : Language = Language("sv") -private val serialVersionUID : Long = -2442762969929206780 -} + +public class Language(code: String) : Serializable { + protected var code: String = 0 + public fun equals(other: Language): Boolean { + return other.toString().equals(this.toString()) + } + { + this.code = code + } + class object { + public var ENGLISH: Language = Language("en") + public var SWEDISH: Language = Language("sv") + private val serialVersionUID: Long = -2442762969929206780 + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-837.kt b/j2k/tests/testData/ast/issues/kt-837.kt index a04124924ea..85df0dcad1f 100644 --- a/j2k/tests/testData/ast/issues/kt-837.kt +++ b/j2k/tests/testData/ast/issues/kt-837.kt @@ -1,16 +1,18 @@ package com.voltvoodoo.saplo4j.model + import java.io.Serializable -public open class Language(code : String?) : Serializable { -protected var code : String? = null -public open fun equals(other : Language?) : Boolean { -return other?.toString()?.equals(this.toString())!! -} -{ -this.code = code -} -class object { -public var ENGLISH : Language? = Language("en") -public var SWEDISH : Language? = Language("sv") -private val serialVersionUID : Long = -2442762969929206780 -} + +public open class Language(code: String?) : Serializable { + protected var code: String? = null + public open fun equals(other: Language?): Boolean { + return other?.toString()?.equals(this.toString())!! + } + { + this.code = code + } + class object { + public var ENGLISH: Language? = Language("en") + public var SWEDISH: Language? = Language("sv") + private val serialVersionUID: Long = -2442762969929206780 + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-852.ide.kt b/j2k/tests/testData/ast/issues/kt-852.ide.kt index 4fe4a91dad9..3c47f611c16 100644 --- a/j2k/tests/testData/ast/issues/kt-852.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-852.ide.kt @@ -1,13 +1,14 @@ package demo + class Test() { -fun test() : String { -val s1 = "" -val s2 = "" -val s3 = "" -if (s1.isEmpty() && s2.isEmpty()) -return "OK" -if (s1.isEmpty() && s2.isEmpty() && s3.isEmpty()) -return "OOOK" -return "" -} + fun test(): String { + val s1 = "" + val s2 = "" + val s3 = "" + if (s1.isEmpty() && s2.isEmpty()) + return "OK" + if (s1.isEmpty() && s2.isEmpty() && s3.isEmpty()) + return "OOOK" + return "" + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-852.kt b/j2k/tests/testData/ast/issues/kt-852.kt index 1dc37fb5e16..eec4c089d4f 100644 --- a/j2k/tests/testData/ast/issues/kt-852.kt +++ b/j2k/tests/testData/ast/issues/kt-852.kt @@ -1,13 +1,14 @@ package demo + open class Test() { -open fun test() : String? { -var s1 : String? = "" -var s2 : String? = "" -var s3 : String? = "" -if (s1?.isEmpty()!! && s2?.isEmpty()!!) -return "OK" -if (s1?.isEmpty()!! && s2?.isEmpty()!! && s3?.isEmpty()!!) -return "OOOK" -return "" -} + open fun test(): String? { + var s1: String? = "" + var s2: String? = "" + var s3: String? = "" + if (s1?.isEmpty()!! && s2?.isEmpty()!!) + return "OK" + if (s1?.isEmpty()!! && s2?.isEmpty()!! && s3?.isEmpty()!!) + return "OOOK" + return "" + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-871.ide.kt b/j2k/tests/testData/ast/issues/kt-871.ide.kt index 803065ebe16..1f09d168f4b 100644 --- a/j2k/tests/testData/ast/issues/kt-871.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-871.ide.kt @@ -1,9 +1,10 @@ package demo + class Program() { -class object { -public fun main(args : Array) { -System.out.println("Halo!") + class object { + public fun main(args: Array) { + System.out.println("Halo!") + } + } } -} -} -fun main(args : Array) = Program.main(args as Array?) \ No newline at end of file +fun main(args: Array) = Program.main(args as Array?) \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-871.kt b/j2k/tests/testData/ast/issues/kt-871.kt index 388ba5a33be..15b776bacc4 100644 --- a/j2k/tests/testData/ast/issues/kt-871.kt +++ b/j2k/tests/testData/ast/issues/kt-871.kt @@ -1,9 +1,10 @@ package demo + open class Program() { -class object { -public open fun main(args : Array?) { -System.out?.println("Halo!") + class object { + public open fun main(args: Array?) { + System.out?.println("Halo!") + } + } } -} -} -fun main(args : Array) = Program.main(args as Array?) \ No newline at end of file +fun main(args: Array) = Program.main(args as Array?) \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-879.ide.kt b/j2k/tests/testData/ast/issues/kt-879.ide.kt index d776d77d5e0..1afd07def0b 100644 --- a/j2k/tests/testData/ast/issues/kt-879.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-879.ide.kt @@ -1,23 +1,23 @@ class Test() { -class object { -public fun getInt(i : Int) : Int { -when (i) { -0 -> { -return 0 -} -1 -> { -return 1 -} -2 -> { -return 2 -} -3 -> { -return 3 -} -else -> { -return -1 -} -} -} -} + class object { + public fun getInt(i: Int): Int { + when (i) { + 0 -> { + return 0 + } + 1 -> { + return 1 + } + 2 -> { + return 2 + } + 3 -> { + return 3 + } + else -> { + return -1 + } + } + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-879.kt b/j2k/tests/testData/ast/issues/kt-879.kt index b52d1403a85..4844637577c 100644 --- a/j2k/tests/testData/ast/issues/kt-879.kt +++ b/j2k/tests/testData/ast/issues/kt-879.kt @@ -1,23 +1,23 @@ open class Test() { -class object { -public open fun getInt(i : Int) : Int { -when (i) { -0 -> { -return 0 -} -1 -> { -return 1 -} -2 -> { -return 2 -} -3 -> { -return 3 -} -else -> { -return -1 -} -} -} -} + class object { + public open fun getInt(i: Int): Int { + when (i) { + 0 -> { + return 0 + } + 1 -> { + return 1 + } + 2 -> { + return 2 + } + 3 -> { + return 3 + } + else -> { + return -1 + } + } + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-893.ide.kt b/j2k/tests/testData/ast/issues/kt-893.ide.kt index afc74707030..17a4e93b8da 100644 --- a/j2k/tests/testData/ast/issues/kt-893.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-893.ide.kt @@ -1,8 +1,9 @@ package demo + class Test() { -fun test() { -for (i in 0..10 - 1) { -System.out.println(i) -} -} + fun test() { + for (i in 0..10 - 1) { + System.out.println(i) + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-893.kt b/j2k/tests/testData/ast/issues/kt-893.kt index 198ca0d9a7f..f10e5b5aeb6 100644 --- a/j2k/tests/testData/ast/issues/kt-893.kt +++ b/j2k/tests/testData/ast/issues/kt-893.kt @@ -1,8 +1,9 @@ package demo + open class Test() { -open fun test() { -for (i in 0..10 - 1) { -System.out?.println(i) -} -} + open fun test() { + for (i in 0..10 - 1) { + System.out?.println(i) + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-963.ide.kt b/j2k/tests/testData/ast/issues/kt-963.ide.kt index 2bedcb5055d..8f15dd9b5a3 100644 --- a/j2k/tests/testData/ast/issues/kt-963.ide.kt +++ b/j2k/tests/testData/ast/issues/kt-963.ide.kt @@ -1,7 +1,8 @@ package demo -class C(a : Int) { -var abc : Int = 0 -{ -abc = a * 2 -} + +class C(a: Int) { + var abc: Int = 0 + { + abc = a * 2 + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/kt-963.kt b/j2k/tests/testData/ast/issues/kt-963.kt index 2e024295a77..499d4d36381 100644 --- a/j2k/tests/testData/ast/issues/kt-963.kt +++ b/j2k/tests/testData/ast/issues/kt-963.kt @@ -1,7 +1,8 @@ package demo -open class C(a : Int) { -var abc : Int = 0 -{ -abc = a * 2 -} + +open class C(a: Int) { + var abc: Int = 0 + { + abc = a * 2 + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/qualifyStatic.ide.kt b/j2k/tests/testData/ast/issues/qualifyStatic.ide.kt index 020c9f1f9cb..78187e0669e 100644 --- a/j2k/tests/testData/ast/issues/qualifyStatic.ide.kt +++ b/j2k/tests/testData/ast/issues/qualifyStatic.ide.kt @@ -1,6 +1,7 @@ import java.util.Calendar + abstract class MyCalendar() : Calendar() { -public fun foo() { -val i = Calendar.ALL_STYLES -} + public fun foo() { + val i = Calendar.ALL_STYLES + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/issues/qualifyStatic.kt b/j2k/tests/testData/ast/issues/qualifyStatic.kt index ce8ed20125b..4c50d0fe284 100644 --- a/j2k/tests/testData/ast/issues/qualifyStatic.kt +++ b/j2k/tests/testData/ast/issues/qualifyStatic.kt @@ -1,6 +1,7 @@ import java.util.Calendar + abstract class MyCalendar() : Calendar() { -public open fun foo() { -var i : Int = Calendar.ALL_STYLES -} + public open fun foo() { + var i: Int = Calendar.ALL_STYLES + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt b/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt index 5e868bbe9ea..54b8fb14b79 100644 --- a/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt +++ b/j2k/tests/testData/ast/kotlinExclusion/kt-656.ide.kt @@ -1,19 +1,20 @@ package demo + class Test() : java.lang.Iterable { -override fun iterator() : java.util.Iterator { -return null -} -public fun push(i : java.util.Iterator) : java.util.Iterator { -val j = i -return j -} + override fun iterator(): java.util.Iterator { + return null + } + public fun push(i: java.util.Iterator): java.util.Iterator { + val j = i + return j + } } class FullTest() : java.lang.Iterable { -override fun iterator() : java.util.Iterator { -return null -} -public fun push(i : java.util.Iterator) : java.util.Iterator { -val j = i -return j -} + override fun iterator(): java.util.Iterator { + return null + } + public fun push(i: java.util.Iterator): java.util.Iterator { + val j = i + return j + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/kotlinExclusion/kt-656.kt b/j2k/tests/testData/ast/kotlinExclusion/kt-656.kt index 22dcdd133c9..fc63d0dd5ab 100644 --- a/j2k/tests/testData/ast/kotlinExclusion/kt-656.kt +++ b/j2k/tests/testData/ast/kotlinExclusion/kt-656.kt @@ -1,19 +1,20 @@ package demo + open class Test() : java.lang.Iterable { -override fun iterator() : java.util.Iterator? { -return null -} -public open fun push(i : java.util.Iterator?) : java.util.Iterator? { -var j : java.util.Iterator? = i -return j -} + override fun iterator(): java.util.Iterator? { + return null + } + public open fun push(i: java.util.Iterator?): java.util.Iterator? { + var j: java.util.Iterator? = i + return j + } } open class FullTest() : java.lang.Iterable { -override fun iterator() : java.util.Iterator? { -return null -} -public open fun push(i : java.util.Iterator?) : java.util.Iterator? { -var j : java.util.Iterator? = i -return j -} + override fun iterator(): java.util.Iterator? { + return null + } + public open fun push(i: java.util.Iterator?): java.util.Iterator? { + var j: java.util.Iterator? = i + return j + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.ide.kt b/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.ide.kt index 5730840e161..a97a4d9ed35 100644 --- a/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.ide.kt +++ b/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.ide.kt @@ -13,6 +13,6 @@ foundIt = true break@test } System.out.println((if (foundIt) -"Found it" + "Found it" else -"Didn't find it")) \ No newline at end of file + "Didn't find it")) \ No newline at end of file diff --git a/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.kt b/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.kt index bb5b07c2f36..0e2ffa25899 100644 --- a/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.kt +++ b/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.kt @@ -1,7 +1,7 @@ @test for (i in 0..max) { -var n : Int = substring.length() -var j : Int = i -var k : Int = 0 +var n: Int = substring.length() +var j: Int = i +var k: Int = 0 while (n-- != 0) { if (searchMe.charAt(j++) != substring.charAt(k++)) @@ -13,6 +13,6 @@ foundIt = true break@test } System.out?.println((if (foundIt) -"Found it" + "Found it" else -"Didn't find it")) \ No newline at end of file + "Didn't find it")) \ No newline at end of file diff --git a/j2k/tests/testData/ast/list/ForEach.ide.kt b/j2k/tests/testData/ast/list/ForEach.ide.kt index 004e4fee5e0..f768e83a4c6 100644 --- a/j2k/tests/testData/ast/list/ForEach.ide.kt +++ b/j2k/tests/testData/ast/list/ForEach.ide.kt @@ -1,15 +1,16 @@ import java.util.* + public class ForEach() { -public fun test() { -val xs = ArrayList() -val ys = LinkedList() -for (x in xs) -{ -ys.add(x) -} -for (y in ys) -{ -xs.add(y) -} -} + public fun test() { + val xs = ArrayList() + val ys = LinkedList() + for (x in xs) + { + ys.add(x) + } + for (y in ys) + { + xs.add(y) + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/list/ForEach.kt b/j2k/tests/testData/ast/list/ForEach.kt index bc2f7eac112..f2c69d3ad88 100644 --- a/j2k/tests/testData/ast/list/ForEach.kt +++ b/j2k/tests/testData/ast/list/ForEach.kt @@ -1,15 +1,16 @@ import java.util.* + public open class ForEach() { -public open fun test() { -var xs : ArrayList? = ArrayList() -var ys : MutableList? = LinkedList() -for (x in xs!!) -{ -ys?.add(x) -} -for (y in ys!!) -{ -xs?.add(y) -} -} + public open fun test() { + var xs: ArrayList? = ArrayList() + var ys: MutableList? = LinkedList() + for (x in xs!!) + { + ys?.add(x) + } + for (y in ys!!) + { + xs?.add(y) + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/list/Lists.ide.kt b/j2k/tests/testData/ast/list/Lists.ide.kt index e4d83caca07..fa18ac3de26 100644 --- a/j2k/tests/testData/ast/list/Lists.ide.kt +++ b/j2k/tests/testData/ast/list/Lists.ide.kt @@ -1,13 +1,14 @@ import java.util.* + public class Lists() { -public fun test() { -val xs = ArrayList() -val ys = LinkedList() -val zs = ArrayList() -xs.add(null) -ys.add(null) -xs.clear() -ys.clear() -zs.add(null) -} + public fun test() { + val xs = ArrayList() + val ys = LinkedList() + val zs = ArrayList() + xs.add(null) + ys.add(null) + xs.clear() + ys.clear() + zs.add(null) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/list/Lists.kt b/j2k/tests/testData/ast/list/Lists.kt index 21d212fe4e8..6c40e0a861e 100644 --- a/j2k/tests/testData/ast/list/Lists.kt +++ b/j2k/tests/testData/ast/list/Lists.kt @@ -1,13 +1,14 @@ import java.util.* + public open class Lists() { -public open fun test() { -var xs : MutableList? = ArrayList() -var ys : MutableList? = LinkedList() -var zs : ArrayList? = ArrayList() -xs?.add(null) -ys?.add(null) -xs?.clear() -ys?.clear() -zs?.add(null) -} + public open fun test() { + var xs: MutableList? = ArrayList() + var ys: MutableList? = LinkedList() + var zs: ArrayList? = ArrayList() + xs?.add(null) + ys?.add(null) + xs?.clear() + ys?.clear() + zs?.add(null) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/char.ide.kt b/j2k/tests/testData/ast/literalExpression/char.ide.kt index de4e7f46fb7..fde7d4cd475 100644 --- a/j2k/tests/testData/ast/literalExpression/char.ide.kt +++ b/j2k/tests/testData/ast/literalExpression/char.ide.kt @@ -1,6 +1,6 @@ class Test() { -fun test() { -val c1 = 'c' -val c2 = 'C' -} + fun test() { + val c1 = 'c' + val c2 = 'C' + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/char.kt b/j2k/tests/testData/ast/literalExpression/char.kt index 9214446774e..cbdd0433836 100644 --- a/j2k/tests/testData/ast/literalExpression/char.kt +++ b/j2k/tests/testData/ast/literalExpression/char.kt @@ -1,6 +1,6 @@ open class Test() { -open fun test() { -var c1 : Char = 'c' -var c2 : Char? = 'C' -} + open fun test() { + var c1: Char = 'c' + var c2: Char? = 'C' + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/dollarInsideString.ide.kt b/j2k/tests/testData/ast/literalExpression/dollarInsideString.ide.kt index 1e12af56d36..fbfa7a99bac 100644 --- a/j2k/tests/testData/ast/literalExpression/dollarInsideString.ide.kt +++ b/j2k/tests/testData/ast/literalExpression/dollarInsideString.ide.kt @@ -1,11 +1,12 @@ package demo + class Test() { -fun test() { -val name = "$$$$" -name = name.replaceAll("\\$[0-9]+", "\\$") -val c = '$' -System.out.println(c) -val C = '$' -System.out.println(C) -} + fun test() { + val name = "$$$$" + name = name.replaceAll("\\$[0-9]+", "\\$") + val c = '$' + System.out.println(c) + val C = '$' + System.out.println(C) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/dollarInsideString.kt b/j2k/tests/testData/ast/literalExpression/dollarInsideString.kt index 27bc7069c7b..855dd03c072 100644 --- a/j2k/tests/testData/ast/literalExpression/dollarInsideString.kt +++ b/j2k/tests/testData/ast/literalExpression/dollarInsideString.kt @@ -1,11 +1,12 @@ package demo + open class Test() { -open fun test() { -var name : String? = "$$$$" -name = name?.replaceAll("\\$[0-9]+", "\\$") -var c : Char = '$' -System.out?.println(c) -var C : Char? = '$' -System.out?.println(C) -} + open fun test() { + var name: String? = "$$$$" + name = name?.replaceAll("\\$[0-9]+", "\\$") + var c: Char = '$' + System.out?.println(c) + var C: Char? = '$' + System.out?.println(C) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt b/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt index 6067dc39886..8f09e80e06f 100644 --- a/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt +++ b/j2k/tests/testData/ast/literalExpression/endsWithDFL.ide.kt @@ -1,18 +1,18 @@ class Test() { -fun test() { -val l1 = 10 -val d1 = 10.0 -val f1 = 10.0.toFloat() -val l2 = 10 -val d2 = 10.0 -val f2 = 10.0.toFloat() -} -fun testBoxed() { -val l1 = 10 -val d1 = 10.0 -val f1 = 10.0.toFloat() -val l2 = 10 -val d2 = 10.0 -val f2 = 10.0.toFloat() -} + fun test() { + val l1 = 10 + val d1 = 10.0 + val f1 = 10.0.toFloat() + val l2 = 10 + val d2 = 10.0 + val f2 = 10.0.toFloat() + } + fun testBoxed() { + val l1 = 10 + val d1 = 10.0 + val f1 = 10.0.toFloat() + val l2 = 10 + val d2 = 10.0 + val f2 = 10.0.toFloat() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/endsWithDFL.kt b/j2k/tests/testData/ast/literalExpression/endsWithDFL.kt index 9f599f640a3..edfebc856ee 100644 --- a/j2k/tests/testData/ast/literalExpression/endsWithDFL.kt +++ b/j2k/tests/testData/ast/literalExpression/endsWithDFL.kt @@ -1,18 +1,18 @@ open class Test() { -open fun test() { -var l1 : Long = 10 -var d1 : Double = 10.0 -var f1 : Float = 10.0.toFloat() -var l2 : Long = 10 -var d2 : Double = 10.0 -var f2 : Float = 10.0.toFloat() -} -open fun testBoxed() { -var l1 : Long? = 10 -var d1 : Double? = 10.0 -var f1 : Float? = 10.0.toFloat() -var l2 : Long? = 10 -var d2 : Double? = 10.0 -var f2 : Float? = 10.0.toFloat() -} + open fun test() { + var l1: Long = 10 + var d1: Double = 10.0 + var f1: Float = 10.0.toFloat() + var l2: Long = 10 + var d2: Double = 10.0 + var f2: Float = 10.0.toFloat() + } + open fun testBoxed() { + var l1: Long? = 10 + var d1: Double? = 10.0 + var f1: Float? = 10.0.toFloat() + var l2: Long? = 10 + var d2: Double? = 10.0 + var f2: Float? = 10.0.toFloat() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/hex.ide.kt b/j2k/tests/testData/ast/literalExpression/hex.ide.kt index 4950575dd93..764a4d98026 100644 --- a/j2k/tests/testData/ast/literalExpression/hex.ide.kt +++ b/j2k/tests/testData/ast/literalExpression/hex.ide.kt @@ -1,6 +1,6 @@ class Test() { -fun test() { -val i1 = 33 -val i2 = 51 -} + fun test() { + val i1 = 33 + val i2 = 51 + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/hex.kt b/j2k/tests/testData/ast/literalExpression/hex.kt index 513d64e695d..00dba06dfef 100644 --- a/j2k/tests/testData/ast/literalExpression/hex.kt +++ b/j2k/tests/testData/ast/literalExpression/hex.kt @@ -1,6 +1,6 @@ open class Test() { -open fun test() { -var i1 : Int = 33 -var i2 : Int? = 51 -} + open fun test() { + var i1: Int = 33 + var i2: Int? = 51 + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/octal.ide.kt b/j2k/tests/testData/ast/literalExpression/octal.ide.kt index 6be3ac79dc9..dc68442d8ee 100644 --- a/j2k/tests/testData/ast/literalExpression/octal.ide.kt +++ b/j2k/tests/testData/ast/literalExpression/octal.ide.kt @@ -1,6 +1,6 @@ class Test() { -fun test() { -val i1 = 37 -val i2 = 26 -} + fun test() { + val i1 = 37 + val i2 = 26 + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/octal.kt b/j2k/tests/testData/ast/literalExpression/octal.kt index ed0680edbde..280414f0197 100644 --- a/j2k/tests/testData/ast/literalExpression/octal.kt +++ b/j2k/tests/testData/ast/literalExpression/octal.kt @@ -1,6 +1,6 @@ open class Test() { -open fun test() { -var i1 : Int = 37 -var i2 : Int? = 26 -} + open fun test() { + var i1: Int = 37 + var i2: Int? = 26 + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/trueOrFalse.ide.kt b/j2k/tests/testData/ast/literalExpression/trueOrFalse.ide.kt index d8a6a5ad6a0..33f385fea2d 100644 --- a/j2k/tests/testData/ast/literalExpression/trueOrFalse.ide.kt +++ b/j2k/tests/testData/ast/literalExpression/trueOrFalse.ide.kt @@ -1,8 +1,8 @@ class Test() { -fun test() { -val t1 = true -val t2 = true -val f1 = false -val f2 = false -} + fun test() { + val t1 = true + val t2 = true + val f1 = false + val f2 = false + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/literalExpression/trueOrFalse.kt b/j2k/tests/testData/ast/literalExpression/trueOrFalse.kt index dd9958976bc..a5af63ef0df 100644 --- a/j2k/tests/testData/ast/literalExpression/trueOrFalse.kt +++ b/j2k/tests/testData/ast/literalExpression/trueOrFalse.kt @@ -1,8 +1,8 @@ open class Test() { -open fun test() { -var t1 : Boolean = true -var t2 : Boolean? = true -var f1 : Boolean = false -var f2 : Boolean? = false -} + open fun test() { + var t1: Boolean = true + var t2: Boolean? = true + var f1: Boolean = false + var f2: Boolean? = false + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/localVariable/object.ide.kt b/j2k/tests/testData/ast/localVariable/object.ide.kt index d6bf0084f01..203f56027c6 100644 --- a/j2k/tests/testData/ast/localVariable/object.ide.kt +++ b/j2k/tests/testData/ast/localVariable/object.ide.kt @@ -1 +1 @@ -val i : Int \ No newline at end of file +val i: Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/localVariable/object.kt b/j2k/tests/testData/ast/localVariable/object.kt index 03ab5111a88..406b70ca8e1 100644 --- a/j2k/tests/testData/ast/localVariable/object.kt +++ b/j2k/tests/testData/ast/localVariable/object.kt @@ -1 +1 @@ -var i : Int \ No newline at end of file +var i: Int \ No newline at end of file diff --git a/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt b/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt index 21ae0bf48cd..1c3ff7e2399 100644 --- a/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt +++ b/j2k/tests/testData/ast/methodCallExpression/genericMethod.ide.kt @@ -1,11 +1,12 @@ package demo + class Map() { -fun put(k : K, v : V) { -} + fun put(k: K, v: V) { + } } class U() { -fun test() { -val m = Map() -m.put("10", 10) -} + fun test() { + val m = Map() + m.put("10", 10) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/methodCallExpression/genericMethod.kt b/j2k/tests/testData/ast/methodCallExpression/genericMethod.kt index 3c5c8052bbb..3b89a606a4d 100644 --- a/j2k/tests/testData/ast/methodCallExpression/genericMethod.kt +++ b/j2k/tests/testData/ast/methodCallExpression/genericMethod.kt @@ -1,11 +1,12 @@ package demo + open class Map() { -open fun put(k : K?, v : V?) { -} + open fun put(k: K?, v: V?) { + } } open class U() { -open fun test() { -var m : Map? = Map() -m?.put("10", 10) -} + open fun test() { + var m: Map? = Map() + m?.put("10", 10) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/misc/packageWithClass.ide.kt b/j2k/tests/testData/ast/misc/packageWithClass.ide.kt index 3f205654c0b..3eba9865a4d 100644 --- a/j2k/tests/testData/ast/misc/packageWithClass.ide.kt +++ b/j2k/tests/testData/ast/misc/packageWithClass.ide.kt @@ -1,3 +1,4 @@ package test + class C() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/misc/packageWithClass.kt b/j2k/tests/testData/ast/misc/packageWithClass.kt index 3f205654c0b..3eba9865a4d 100644 --- a/j2k/tests/testData/ast/misc/packageWithClass.kt +++ b/j2k/tests/testData/ast/misc/packageWithClass.kt @@ -1,3 +1,4 @@ package test + class C() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/misc/packageWithImports.ide.kt b/j2k/tests/testData/ast/misc/packageWithImports.ide.kt index d646d02ccc0..1ab1fb21e99 100644 --- a/j2k/tests/testData/ast/misc/packageWithImports.ide.kt +++ b/j2k/tests/testData/ast/misc/packageWithImports.ide.kt @@ -1,3 +1,4 @@ package test + import ast import ast2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/misc/packageWithImports.kt b/j2k/tests/testData/ast/misc/packageWithImports.kt index d646d02ccc0..1ab1fb21e99 100644 --- a/j2k/tests/testData/ast/misc/packageWithImports.kt +++ b/j2k/tests/testData/ast/misc/packageWithImports.kt @@ -1,3 +1,4 @@ package test + import ast import ast2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/misc/packageWithMixedImports.ide.kt b/j2k/tests/testData/ast/misc/packageWithMixedImports.ide.kt index d646d02ccc0..1ab1fb21e99 100644 --- a/j2k/tests/testData/ast/misc/packageWithMixedImports.ide.kt +++ b/j2k/tests/testData/ast/misc/packageWithMixedImports.ide.kt @@ -1,3 +1,4 @@ package test + import ast import ast2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/misc/packageWithMixedImports.kt b/j2k/tests/testData/ast/misc/packageWithMixedImports.kt index d646d02ccc0..1ab1fb21e99 100644 --- a/j2k/tests/testData/ast/misc/packageWithMixedImports.kt +++ b/j2k/tests/testData/ast/misc/packageWithMixedImports.kt @@ -1,3 +1,4 @@ package test + import ast import ast2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/misc/packageWithOpenClass.ide.kt b/j2k/tests/testData/ast/misc/packageWithOpenClass.ide.kt index 3f205654c0b..3eba9865a4d 100644 --- a/j2k/tests/testData/ast/misc/packageWithOpenClass.ide.kt +++ b/j2k/tests/testData/ast/misc/packageWithOpenClass.ide.kt @@ -1,3 +1,4 @@ package test + class C() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/misc/packageWithOpenClass.kt b/j2k/tests/testData/ast/misc/packageWithOpenClass.kt index d4336ffcc51..9885503c2d2 100644 --- a/j2k/tests/testData/ast/misc/packageWithOpenClass.kt +++ b/j2k/tests/testData/ast/misc/packageWithOpenClass.kt @@ -1,3 +1,4 @@ package test + open class C() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/misc/packageWithStaticImports.ide.kt b/j2k/tests/testData/ast/misc/packageWithStaticImports.ide.kt index d646d02ccc0..1ab1fb21e99 100644 --- a/j2k/tests/testData/ast/misc/packageWithStaticImports.ide.kt +++ b/j2k/tests/testData/ast/misc/packageWithStaticImports.ide.kt @@ -1,3 +1,4 @@ package test + import ast import ast2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/misc/packageWithStaticImports.kt b/j2k/tests/testData/ast/misc/packageWithStaticImports.kt index d646d02ccc0..1ab1fb21e99 100644 --- a/j2k/tests/testData/ast/misc/packageWithStaticImports.kt +++ b/j2k/tests/testData/ast/misc/packageWithStaticImports.kt @@ -1,3 +1,4 @@ package test + import ast import ast2 \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.ide.kt b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.ide.kt index 5c8756e96ad..61d3e8d4c60 100644 --- a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.ide.kt @@ -1,6 +1,7 @@ package test + class User() { -fun main() { -val list = java.util.LinkedList() -} + fun main() { + val list = java.util.LinkedList() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.kt b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.kt index 83cb2cef93c..ff74844d2f6 100644 --- a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.kt +++ b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName.kt @@ -1,6 +1,7 @@ package test + open class User() { -open fun main() { -var list : MutableList<*>? = java.util.LinkedList() -} + open fun main() { + var list: MutableList<*>? = java.util.LinkedList() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.ide.kt b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.ide.kt index 5c8756e96ad..61d3e8d4c60 100644 --- a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.ide.kt @@ -1,6 +1,7 @@ package test + class User() { -fun main() { -val list = java.util.LinkedList() -} + fun main() { + val list = java.util.LinkedList() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.kt b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.kt index 83cb2cef93c..ff74844d2f6 100644 --- a/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.kt +++ b/j2k/tests/testData/ast/newClassExpression/fullQualifiedName2.kt @@ -1,6 +1,7 @@ package test + open class User() { -open fun main() { -var list : MutableList<*>? = java.util.LinkedList() -} + open fun main() { + var list: MutableList<*>? = java.util.LinkedList() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.ide.kt b/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.ide.kt index dc67e78dfd2..cab47c50a09 100644 --- a/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.ide.kt @@ -1,6 +1,7 @@ import java.util.LinkedList + class User() { -fun main() { -val list = LinkedList() -} + fun main() { + val list = LinkedList() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.kt b/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.kt index db9941b7576..4447b1dd47f 100644 --- a/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.kt +++ b/j2k/tests/testData/ast/newClassExpression/genericClassInvocation.kt @@ -1,6 +1,7 @@ import java.util.LinkedList + open class User() { -open fun main() { -var list : MutableList? = LinkedList() -} + open fun main() { + var list: MutableList? = LinkedList() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt index bb123408a03..2b64b2eddbb 100644 --- a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.ide.kt @@ -1,8 +1,9 @@ package org.test + class Library() { } class User() { -fun main() { -val lib = Library() -} + fun main() { + val lib = Library() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt index 65868d3485a..5b8f962effa 100644 --- a/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt +++ b/j2k/tests/testData/ast/newClassExpression/newClassByFullName.kt @@ -1,8 +1,9 @@ package org.test + open class Library() { } open class User() { -open fun main() { -var lib : Library? = Library() -} + open fun main() { + var lib: Library? = Library() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.ide.kt b/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.ide.kt index fd3ea1afc0d..35239a1ba7f 100644 --- a/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.ide.kt @@ -1,5 +1,5 @@ object : Runnable() { override fun run() { -System.out.println("Run") + System.out.println("Run") } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.kt b/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.kt index 1f0937f42a6..b02de80f6f2 100644 --- a/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.kt +++ b/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.kt @@ -1,5 +1,5 @@ object : Runnable() { override fun run() { -System.out?.println("Run") + System.out?.println("Run") } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt b/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt index 2037cb68f9f..f01f86df89d 100644 --- a/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/newInnerClass.ide.kt @@ -1,11 +1,12 @@ package org.test + class OuterClass() { -class InnerClass() { -} + class InnerClass() { + } } class User() { -fun main() { -val outerObject = OuterClass() -val innerObject = outerObject.InnerClass() -} + fun main() { + val outerObject = OuterClass() + val innerObject = outerObject.InnerClass() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt b/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt index 1ce2c7ca119..fe233ffe21a 100644 --- a/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt +++ b/j2k/tests/testData/ast/newClassExpression/newInnerClass.kt @@ -1,11 +1,12 @@ package org.test + open class OuterClass() { -open class InnerClass() { -} + open class InnerClass() { + } } open class User() { -open fun main() { -var outerObject : OuterClass? = OuterClass() -var innerObject : OuterClass.InnerClass? = outerObject?.InnerClass() -} + open fun main() { + var outerObject: OuterClass? = OuterClass() + var innerObject: OuterClass.InnerClass? = outerObject?.InnerClass() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt index be88a6c8b13..81a23f07903 100644 --- a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.ide.kt @@ -1,10 +1,12 @@ package org.test + import java.util.LinkedList + class Member() { } class User() { -fun main() { -val members = LinkedList() -members.add(Member()) -} + fun main() { + val members = LinkedList() + members.add(Member()) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt index 3f8c8199874..7fd271d1d6a 100644 --- a/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt +++ b/j2k/tests/testData/ast/newClassExpression/newListAndNewMember.kt @@ -1,10 +1,12 @@ package org.test + import java.util.LinkedList + open class Member() { } open class User() { -open fun main() { -var members : MutableList? = LinkedList() -members?.add(Member()) -} + open fun main() { + var members: MutableList? = LinkedList() + members?.add(Member()) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt index 10226c6e2f6..93dc97665ab 100644 --- a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt +++ b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.ide.kt @@ -1,12 +1,13 @@ package demo + class Foo() { -class object { -class Bar() { -} -} + class object { + class Bar() { + } + } } class User() { -fun main() { -val boo = Foo.Bar() -} + fun main() { + val boo = Foo.Bar() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt index 690ffaa66bd..aba9556e77d 100644 --- a/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt +++ b/j2k/tests/testData/ast/newClassExpression/newStaticInnerClass.kt @@ -1,12 +1,13 @@ package demo + open class Foo() { -class object { -open class Bar() { -} -} + class object { + open class Bar() { + } + } } open class User() { -open fun main() { -var boo : Foo.Bar? = Foo.Bar() -} + open fun main() { + var boo: Foo.Bar? = Foo.Bar() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt b/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt index a19666c864d..e6c74c7fc9a 100644 --- a/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt +++ b/j2k/tests/testData/ast/objectLiteral/MyFrame.ide.kt @@ -1,18 +1,19 @@ package demo + class WindowAdapter() { -public fun windowClosing() { -} + public fun windowClosing() { + } } public class Client() : Frame() { -{ -val a = object : WindowAdapter() { -override fun windowClosing() { -} -} -addWindowListener(a) -addWindowListener(object : WindowAdapter() { -override fun windowClosing() { -} -}) -} + { + val a = object : WindowAdapter() { + override fun windowClosing() { + } + } + addWindowListener(a) + addWindowListener(object : WindowAdapter() { + override fun windowClosing() { + } + }) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/objectLiteral/MyFrame.kt b/j2k/tests/testData/ast/objectLiteral/MyFrame.kt index d779bcdbc16..19751dff0a4 100644 --- a/j2k/tests/testData/ast/objectLiteral/MyFrame.kt +++ b/j2k/tests/testData/ast/objectLiteral/MyFrame.kt @@ -1,18 +1,19 @@ package demo + open class WindowAdapter() { -public open fun windowClosing() { -} + public open fun windowClosing() { + } } public class Client() : Frame() { -{ -var a : WindowAdapter? = object : WindowAdapter() { -override fun windowClosing() { -} -} -addWindowListener(a) -addWindowListener(object : WindowAdapter() { -override fun windowClosing() { -} -}) -} + { + var a: WindowAdapter? = object : WindowAdapter() { + override fun windowClosing() { + } + } + addWindowListener(a) + addWindowListener(object : WindowAdapter() { + override fun windowClosing() { + } + }) + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/outProjectionType/methodParams.ide.kt b/j2k/tests/testData/ast/outProjectionType/methodParams.ide.kt index df98594dc7b..f04b37cf5ce 100644 --- a/j2k/tests/testData/ast/outProjectionType/methodParams.ide.kt +++ b/j2k/tests/testData/ast/outProjectionType/methodParams.ide.kt @@ -1,2 +1,2 @@ -fun pushAll(src : Collection) { +fun pushAll(src: Collection) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/outProjectionType/methodParams.kt b/j2k/tests/testData/ast/outProjectionType/methodParams.kt index 61dcdc8dad3..16946be5ee1 100644 --- a/j2k/tests/testData/ast/outProjectionType/methodParams.kt +++ b/j2k/tests/testData/ast/outProjectionType/methodParams.kt @@ -1,2 +1,2 @@ -fun pushAll(src : Collection?) { +fun pushAll(src: Collection?) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.ide.kt b/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.ide.kt index 4a8c534eb73..a8d47460aa1 100644 --- a/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.ide.kt +++ b/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.ide.kt @@ -1,4 +1,6 @@ package org.jetbrains.jet.j2k.`in` + import org.jetbrains.annotations.Nullable + public class Converter() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt b/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt index a673d540277..08264274970 100644 --- a/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt +++ b/j2k/tests/testData/ast/packageStatement/orgJetbrainsJetJ2kIn.kt @@ -1,4 +1,6 @@ package org.jetbrains.jet.j2k.`in` + import org.jetbrains.annotations.Nullable + public open class Converter() { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/prefixOperator/excl.kt b/j2k/tests/testData/ast/prefixOperator/excl.kt index 54a88090fcb..e0b51ec2084 100644 --- a/j2k/tests/testData/ast/prefixOperator/excl.kt +++ b/j2k/tests/testData/ast/prefixOperator/excl.kt @@ -1,2 +1,2 @@ -var i : Boolean = true -var j : Boolean = !i \ No newline at end of file +var i: Boolean = true +var j: Boolean = !i \ No newline at end of file diff --git a/j2k/tests/testData/ast/prefixOperator/kt-667.kt b/j2k/tests/testData/ast/prefixOperator/kt-667.kt index 529e9a8b422..577120ab6fe 100644 --- a/j2k/tests/testData/ast/prefixOperator/kt-667.kt +++ b/j2k/tests/testData/ast/prefixOperator/kt-667.kt @@ -1,2 +1,2 @@ -var i : Int = (10).inv() -var j : Int = ((i * 100)).inv() \ No newline at end of file +var i: Int = (10).inv() +var j: Int = ((i * 100)).inv() \ No newline at end of file diff --git a/j2k/tests/testData/ast/prefixOperator/nullableIf.kt b/j2k/tests/testData/ast/prefixOperator/nullableIf.kt index fde5ffa225e..57590122e66 100644 --- a/j2k/tests/testData/ast/prefixOperator/nullableIf.kt +++ b/j2k/tests/testData/ast/prefixOperator/nullableIf.kt @@ -1,4 +1,4 @@ -var s : String? = null +var s: String? = null if (!s?.isEmpty()!!) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/prefixOperator/tilde.kt b/j2k/tests/testData/ast/prefixOperator/tilde.kt index 96d67f4d028..b5a1b376cd4 100644 --- a/j2k/tests/testData/ast/prefixOperator/tilde.kt +++ b/j2k/tests/testData/ast/prefixOperator/tilde.kt @@ -1,2 +1,2 @@ -var i : Int = 10 -var j : Int = (10).inv() \ No newline at end of file +var i: Int = 10 +var j: Int = (10).inv() \ No newline at end of file diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540-map.ide.kt b/j2k/tests/testData/ast/rawGenerics/kt-540-map.ide.kt index 64246fef913..218ae4d0df5 100644 --- a/j2k/tests/testData/ast/rawGenerics/kt-540-map.ide.kt +++ b/j2k/tests/testData/ast/rawGenerics/kt-540-map.ide.kt @@ -1,9 +1,11 @@ package demo + import java.util.HashMap + class Test() { -fun main() { -val commonMap = HashMap() -val rawMap = HashMap() -val superRawMap = HashMap() -} + fun main() { + val commonMap = HashMap() + val rawMap = HashMap() + val superRawMap = HashMap() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540-map.kt b/j2k/tests/testData/ast/rawGenerics/kt-540-map.kt index 0410e23d9d3..c0ba05f34d0 100644 --- a/j2k/tests/testData/ast/rawGenerics/kt-540-map.kt +++ b/j2k/tests/testData/ast/rawGenerics/kt-540-map.kt @@ -1,9 +1,11 @@ package demo + import java.util.HashMap + open class Test() { -open fun main() { -var commonMap : HashMap? = HashMap() -var rawMap : HashMap? = HashMap() -var superRawMap : HashMap? = HashMap() -} + open fun main() { + var commonMap: HashMap? = HashMap() + var rawMap: HashMap? = HashMap() + var superRawMap: HashMap? = HashMap() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.ide.kt b/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.ide.kt index d09cfefbca3..c01e2c1cb94 100644 --- a/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.ide.kt +++ b/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.ide.kt @@ -1,13 +1,14 @@ package demo -class Collection(e : E) { -{ -System.out.println(e) -} + +class Collection(e: E) { + { + System.out.println(e) + } } class Test() { -fun main() { -val raw1 = Collection(1) -val raw2 = Collection(1) -val raw3 = Collection("1") -} + fun main() { + val raw1 = Collection(1) + val raw2 = Collection(1) + val raw3 = Collection("1") + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt b/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt index e3401238279..903ae923d9e 100644 --- a/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt +++ b/j2k/tests/testData/ast/rawGenerics/kt-540-rawGenericClass.kt @@ -1,13 +1,14 @@ package demo -open class Collection(e : E?) { -{ -System.out?.println(e) -} + +open class Collection(e: E?) { + { + System.out?.println(e) + } } open class Test() { -open fun main() { -var raw1 : Collection<*>? = Collection(1) -var raw2 : Collection<*>? = Collection(1) -var raw3 : Collection<*>? = Collection("1") -} + open fun main() { + var raw1: Collection<*>? = Collection(1) + var raw2: Collection<*>? = Collection(1) + var raw3: Collection<*>? = Collection("1") + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540.ide.kt b/j2k/tests/testData/ast/rawGenerics/kt-540.ide.kt index 27b9adf3219..716b971d661 100644 --- a/j2k/tests/testData/ast/rawGenerics/kt-540.ide.kt +++ b/j2k/tests/testData/ast/rawGenerics/kt-540.ide.kt @@ -1,9 +1,11 @@ package demo + import java.util.LinkedList + class Test() { -fun main() { -val common = LinkedList() -val raw = LinkedList() -val superRaw = LinkedList() -} + fun main() { + val common = LinkedList() + val raw = LinkedList() + val superRaw = LinkedList() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/rawGenerics/kt-540.kt b/j2k/tests/testData/ast/rawGenerics/kt-540.kt index e5b202a9cac..c12ac80a3c9 100644 --- a/j2k/tests/testData/ast/rawGenerics/kt-540.kt +++ b/j2k/tests/testData/ast/rawGenerics/kt-540.kt @@ -1,9 +1,11 @@ package demo + import java.util.LinkedList + open class Test() { -open fun main() { -var common : MutableList? = LinkedList() -var raw : MutableList<*>? = LinkedList() -var superRaw : MutableList<*>? = LinkedList() -} + open fun main() { + var common: MutableList? = LinkedList() + var raw: MutableList<*>? = LinkedList() + var superRaw: MutableList<*>? = LinkedList() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt index 27fdba03920..74785132b1d 100644 --- a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt +++ b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.ide.kt @@ -1,13 +1,14 @@ package demo + class TestT() { -fun getT() { -} + fun getT() { + } } class U() { -fun main() { -val t = TestT() -t.getT() -t.getT() -t.getT() -} + fun main() { + val t = TestT() + t.getT() + t.getT() + t.getT() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt index dcc769aa40c..51bab3c7699 100644 --- a/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt +++ b/j2k/tests/testData/ast/rawGenerics/rawGenericMethod.kt @@ -1,13 +1,14 @@ package demo + open class TestT() { -open fun getT() { -} + open fun getT() { + } } open class U() { -open fun main() { -var t : TestT? = TestT() -t?.getT() -t?.getT() -t?.getT() -} + open fun main() { + var t: TestT? = TestT() + t?.getT() + t?.getT() + t?.getT() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/starProjectionType/methodParams.ide.kt b/j2k/tests/testData/ast/starProjectionType/methodParams.ide.kt index 14625caf23f..74bf6891c03 100644 --- a/j2k/tests/testData/ast/starProjectionType/methodParams.ide.kt +++ b/j2k/tests/testData/ast/starProjectionType/methodParams.ide.kt @@ -1,2 +1,2 @@ -fun wtf(w : Collection<*>) { +fun wtf(w: Collection<*>) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/starProjectionType/methodParams.kt b/j2k/tests/testData/ast/starProjectionType/methodParams.kt index 6df4954e3b8..b34d120446d 100644 --- a/j2k/tests/testData/ast/starProjectionType/methodParams.kt +++ b/j2k/tests/testData/ast/starProjectionType/methodParams.kt @@ -1,2 +1,2 @@ -fun wtf(w : Collection<*>?) { +fun wtf(w: Collection<*>?) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt index 146d212af09..2e22c03bc29 100644 --- a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt +++ b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.ide.kt @@ -1,10 +1,10 @@ class Base() { -fun foo() + fun foo() } class A() : Base() { -class C() { -fun test() { -super@A.foo() -} -} + class C() { + fun test() { + super@A.foo() + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt index 2fe44fa3554..04754d0f13e 100644 --- a/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt +++ b/j2k/tests/testData/ast/superExpression/classAdotSuperFoo.kt @@ -1,10 +1,10 @@ open class Base() { -open fun foo() + open fun foo() } open class A() : Base() { -open class C() { -open fun test() { -super@A.foo() -} -} + open class C() { + open fun test() { + super@A.foo() + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt b/j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt index 7457890f3a0..9c24efb73a0 100644 --- a/j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt +++ b/j2k/tests/testData/ast/superExpression/classAextendsB.ide.kt @@ -1,10 +1,10 @@ -class B(i : Int) { -fun call() : Int { -return 1 -} +class B(i: Int) { + fun call(): Int { + return 1 + } } class A() : B(10) { -override fun call() : Int { -return super.call() -} + override fun call(): Int { + return super.call() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/superExpression/classAextendsB.kt b/j2k/tests/testData/ast/superExpression/classAextendsB.kt index b9c5e29b288..3e19fb5638a 100644 --- a/j2k/tests/testData/ast/superExpression/classAextendsB.kt +++ b/j2k/tests/testData/ast/superExpression/classAextendsB.kt @@ -1,10 +1,10 @@ -open class B(i : Int) { -open fun call() : Int { -return 1 -} +open class B(i: Int) { + open fun call(): Int { + return 1 + } } open class A() : B(10) { -override fun call() : Int { -return super.call() -} + override fun call(): Int { + return super.call() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt b/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt index be25895bc24..412ca6a4804 100644 --- a/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt +++ b/j2k/tests/testData/ast/switch/comlicatedFallDown.ide.kt @@ -1,88 +1,89 @@ package demo + public class SwitchDemo() { -class object { -public fun print(o : Any) { -System.out.println(o) + class object { + public fun print(o: Any) { + System.out.println(o) + } + public fun test(i: Int) { + val monthString = "" + when (i) { + 1 -> { + print(1) + print(2) + print(3) + print(4) + print(5) + } + 2 -> { + print(2) + print(3) + print(4) + print(5) + } + 3 -> { + print(3) + print(4) + print(5) + } + 4 -> { + print(4) + print(5) + } + 5 -> { + print(5) + } + 6 -> { + print(6) + print(7) + print(8) + print(9) + print(10) + print(11) + monthString = "December" + } + 7 -> { + print(7) + print(8) + print(9) + print(10) + print(11) + monthString = "December" + } + 8 -> { + print(8) + print(9) + print(10) + print(11) + monthString = "December" + } + 9 -> { + print(9) + print(10) + print(11) + monthString = "December" + } + 10 -> { + print(10) + print(11) + monthString = "December" + } + 11 -> { + print(11) + monthString = "December" + } + 12 -> { + monthString = "December" + } + else -> { + monthString = "Invalid month" + } + } + System.out.println(monthString) + } + public fun main(args: Array) { + for (i in 1..12) test(i) + } + } } -public fun test(i : Int) { -val monthString = "" -when (i) { -1 -> { -print(1) -print(2) -print(3) -print(4) -print(5) -} -2 -> { -print(2) -print(3) -print(4) -print(5) -} -3 -> { -print(3) -print(4) -print(5) -} -4 -> { -print(4) -print(5) -} -5 -> { -print(5) -} -6 -> { -print(6) -print(7) -print(8) -print(9) -print(10) -print(11) -monthString = "December" -} -7 -> { -print(7) -print(8) -print(9) -print(10) -print(11) -monthString = "December" -} -8 -> { -print(8) -print(9) -print(10) -print(11) -monthString = "December" -} -9 -> { -print(9) -print(10) -print(11) -monthString = "December" -} -10 -> { -print(10) -print(11) -monthString = "December" -} -11 -> { -print(11) -monthString = "December" -} -12 -> { -monthString = "December" -} -else -> { -monthString = "Invalid month" -} -} -System.out.println(monthString) -} -public fun main(args : Array) { -for (i in 1..12) test(i) -} -} -} -fun main(args : Array) = SwitchDemo.main(args as Array?) \ No newline at end of file +fun main(args: Array) = SwitchDemo.main(args as Array?) \ No newline at end of file diff --git a/j2k/tests/testData/ast/switch/comlicatedFallDown.kt b/j2k/tests/testData/ast/switch/comlicatedFallDown.kt index 69da2a0bfd6..b7407421c00 100644 --- a/j2k/tests/testData/ast/switch/comlicatedFallDown.kt +++ b/j2k/tests/testData/ast/switch/comlicatedFallDown.kt @@ -1,88 +1,89 @@ package demo + public open class SwitchDemo() { -class object { -public open fun print(o : Any?) { -System.out?.println(o) + class object { + public open fun print(o: Any?) { + System.out?.println(o) + } + public open fun test(i: Int) { + var monthString: String? = "" + when (i) { + 1 -> { + print(1) + print(2) + print(3) + print(4) + print(5) + } + 2 -> { + print(2) + print(3) + print(4) + print(5) + } + 3 -> { + print(3) + print(4) + print(5) + } + 4 -> { + print(4) + print(5) + } + 5 -> { + print(5) + } + 6 -> { + print(6) + print(7) + print(8) + print(9) + print(10) + print(11) + monthString = "December" + } + 7 -> { + print(7) + print(8) + print(9) + print(10) + print(11) + monthString = "December" + } + 8 -> { + print(8) + print(9) + print(10) + print(11) + monthString = "December" + } + 9 -> { + print(9) + print(10) + print(11) + monthString = "December" + } + 10 -> { + print(10) + print(11) + monthString = "December" + } + 11 -> { + print(11) + monthString = "December" + } + 12 -> { + monthString = "December" + } + else -> { + monthString = "Invalid month" + } + } + System.out?.println(monthString) + } + public open fun main(args: Array?) { + for (i in 1..12) test(i) + } + } } -public open fun test(i : Int) { -var monthString : String? = "" -when (i) { -1 -> { -print(1) -print(2) -print(3) -print(4) -print(5) -} -2 -> { -print(2) -print(3) -print(4) -print(5) -} -3 -> { -print(3) -print(4) -print(5) -} -4 -> { -print(4) -print(5) -} -5 -> { -print(5) -} -6 -> { -print(6) -print(7) -print(8) -print(9) -print(10) -print(11) -monthString = "December" -} -7 -> { -print(7) -print(8) -print(9) -print(10) -print(11) -monthString = "December" -} -8 -> { -print(8) -print(9) -print(10) -print(11) -monthString = "December" -} -9 -> { -print(9) -print(10) -print(11) -monthString = "December" -} -10 -> { -print(10) -print(11) -monthString = "December" -} -11 -> { -print(11) -monthString = "December" -} -12 -> { -monthString = "December" -} -else -> { -monthString = "Invalid month" -} -} -System.out?.println(monthString) -} -public open fun main(args : Array?) { -for (i in 1..12) test(i) -} -} -} -fun main(args : Array) = SwitchDemo.main(args as Array?) \ No newline at end of file +fun main(args: Array) = SwitchDemo.main(args as Array?) \ No newline at end of file diff --git a/j2k/tests/testData/ast/switch/emptySwitch.ide.kt b/j2k/tests/testData/ast/switch/emptySwitch.ide.kt index b3d95387ea0..1695851d453 100644 --- a/j2k/tests/testData/ast/switch/emptySwitch.ide.kt +++ b/j2k/tests/testData/ast/switch/emptySwitch.ide.kt @@ -1,14 +1,14 @@ public class NonDefault() { -class object { -public fun main(args : Array) { -val value = 3 -val valueString = "" -when (value) { -else -> { + class object { + public fun main(args: Array) { + val value = 3 + val valueString = "" + when (value) { + else -> { + } + } + System.out.println(valueString) + } + } } -} -System.out.println(valueString) -} -} -} -fun main(args : Array) = NonDefault.main(args as Array?) \ No newline at end of file +fun main(args: Array) = NonDefault.main(args as Array?) \ No newline at end of file diff --git a/j2k/tests/testData/ast/switch/emptySwitch.kt b/j2k/tests/testData/ast/switch/emptySwitch.kt index 05637f67902..c8bfdaa6e09 100644 --- a/j2k/tests/testData/ast/switch/emptySwitch.kt +++ b/j2k/tests/testData/ast/switch/emptySwitch.kt @@ -1,14 +1,14 @@ public open class NonDefault() { -class object { -public open fun main(args : Array?) { -var value : Int = 3 -var valueString : String? = "" -when (value) { -else -> { + class object { + public open fun main(args: Array?) { + var value: Int = 3 + var valueString: String? = "" + when (value) { + else -> { + } + } + System.out?.println(valueString) + } + } } -} -System.out?.println(valueString) -} -} -} -fun main(args : Array) = NonDefault.main(args as Array?) \ No newline at end of file +fun main(args: Array) = NonDefault.main(args as Array?) \ No newline at end of file diff --git a/j2k/tests/testData/ast/switch/fallDown.ide.kt b/j2k/tests/testData/ast/switch/fallDown.ide.kt index aa9585ea90e..9a55b06ec8d 100644 --- a/j2k/tests/testData/ast/switch/fallDown.ide.kt +++ b/j2k/tests/testData/ast/switch/fallDown.ide.kt @@ -1,19 +1,20 @@ package switch_demo + public class SwitchDemo() { -class object { -public fun main(args : Array) { -val month = 8 -val monthString : String -when (month) { -1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 -> { -monthString = "December" + class object { + public fun main(args: Array) { + val month = 8 + val monthString: String + when (month) { + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 -> { + monthString = "December" + } + else -> { + monthString = "Invalid month" + } + } + System.out.println(monthString) + } + } } -else -> { -monthString = "Invalid month" -} -} -System.out.println(monthString) -} -} -} -fun main(args : Array) = SwitchDemo.main(args as Array?) \ No newline at end of file +fun main(args: Array) = SwitchDemo.main(args as Array?) \ No newline at end of file diff --git a/j2k/tests/testData/ast/switch/fallDown.kt b/j2k/tests/testData/ast/switch/fallDown.kt index dccfb215143..d34cc351c8e 100644 --- a/j2k/tests/testData/ast/switch/fallDown.kt +++ b/j2k/tests/testData/ast/switch/fallDown.kt @@ -1,19 +1,20 @@ package switch_demo + public open class SwitchDemo() { -class object { -public open fun main(args : Array?) { -var month : Int = 8 -var monthString : String? -when (month) { -1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 -> { -monthString = "December" + class object { + public open fun main(args: Array?) { + var month: Int = 8 + var monthString: String? + when (month) { + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 -> { + monthString = "December" + } + else -> { + monthString = "Invalid month" + } + } + System.out?.println(monthString) + } + } } -else -> { -monthString = "Invalid month" -} -} -System.out?.println(monthString) -} -} -} -fun main(args : Array) = SwitchDemo.main(args as Array?) \ No newline at end of file +fun main(args: Array) = SwitchDemo.main(args as Array?) \ No newline at end of file diff --git a/j2k/tests/testData/ast/switch/kt-539.ide.kt b/j2k/tests/testData/ast/switch/kt-539.ide.kt index 6d80ac75d76..5a088e9ed95 100644 --- a/j2k/tests/testData/ast/switch/kt-539.ide.kt +++ b/j2k/tests/testData/ast/switch/kt-539.ide.kt @@ -1,52 +1,53 @@ package switch_demo + public class SwitchDemo() { -class object { -public fun main(args : Array) { -val month = 8 -val monthString : String -when (month) { -1 -> { -monthString = "January" + class object { + public fun main(args: Array) { + val month = 8 + val monthString: String + when (month) { + 1 -> { + monthString = "January" + } + 2 -> { + monthString = "February" + } + 3 -> { + monthString = "March" + } + 4 -> { + monthString = "April" + } + 5 -> { + monthString = "May" + } + 6 -> { + monthString = "June" + } + 7 -> { + monthString = "July" + } + 8 -> { + monthString = "August" + } + 9 -> { + monthString = "September" + } + 10 -> { + monthString = "October" + } + 11 -> { + monthString = "November" + } + 12 -> { + monthString = "December" + } + else -> { + monthString = "Invalid month" + } + } + System.out.println(monthString) + } + } } -2 -> { -monthString = "February" -} -3 -> { -monthString = "March" -} -4 -> { -monthString = "April" -} -5 -> { -monthString = "May" -} -6 -> { -monthString = "June" -} -7 -> { -monthString = "July" -} -8 -> { -monthString = "August" -} -9 -> { -monthString = "September" -} -10 -> { -monthString = "October" -} -11 -> { -monthString = "November" -} -12 -> { -monthString = "December" -} -else -> { -monthString = "Invalid month" -} -} -System.out.println(monthString) -} -} -} -fun main(args : Array) = SwitchDemo.main(args as Array?) \ No newline at end of file +fun main(args: Array) = SwitchDemo.main(args as Array?) \ No newline at end of file diff --git a/j2k/tests/testData/ast/switch/kt-539.kt b/j2k/tests/testData/ast/switch/kt-539.kt index 6b6d5288e80..eb260e66ba6 100644 --- a/j2k/tests/testData/ast/switch/kt-539.kt +++ b/j2k/tests/testData/ast/switch/kt-539.kt @@ -1,52 +1,53 @@ package switch_demo + public open class SwitchDemo() { -class object { -public open fun main(args : Array?) { -var month : Int = 8 -var monthString : String? -when (month) { -1 -> { -monthString = "January" + class object { + public open fun main(args: Array?) { + var month: Int = 8 + var monthString: String? + when (month) { + 1 -> { + monthString = "January" + } + 2 -> { + monthString = "February" + } + 3 -> { + monthString = "March" + } + 4 -> { + monthString = "April" + } + 5 -> { + monthString = "May" + } + 6 -> { + monthString = "June" + } + 7 -> { + monthString = "July" + } + 8 -> { + monthString = "August" + } + 9 -> { + monthString = "September" + } + 10 -> { + monthString = "October" + } + 11 -> { + monthString = "November" + } + 12 -> { + monthString = "December" + } + else -> { + monthString = "Invalid month" + } + } + System.out?.println(monthString) + } + } } -2 -> { -monthString = "February" -} -3 -> { -monthString = "March" -} -4 -> { -monthString = "April" -} -5 -> { -monthString = "May" -} -6 -> { -monthString = "June" -} -7 -> { -monthString = "July" -} -8 -> { -monthString = "August" -} -9 -> { -monthString = "September" -} -10 -> { -monthString = "October" -} -11 -> { -monthString = "November" -} -12 -> { -monthString = "December" -} -else -> { -monthString = "Invalid month" -} -} -System.out?.println(monthString) -} -} -} -fun main(args : Array) = SwitchDemo.main(args as Array?) \ No newline at end of file +fun main(args: Array) = SwitchDemo.main(args as Array?) \ No newline at end of file diff --git a/j2k/tests/testData/ast/switch/nondefault.ide.kt b/j2k/tests/testData/ast/switch/nondefault.ide.kt index 60f3a4bc558..3e01149e7bf 100644 --- a/j2k/tests/testData/ast/switch/nondefault.ide.kt +++ b/j2k/tests/testData/ast/switch/nondefault.ide.kt @@ -1,23 +1,23 @@ public class NonDefault() { -class object { -public fun main(args : Array) { -val value = 3 -val valueString = "" -when (value) { -1 -> { -valueString = "ONE" + class object { + public fun main(args: Array) { + val value = 3 + val valueString = "" + when (value) { + 1 -> { + valueString = "ONE" + } + 2 -> { + valueString = "TWO" + } + 3 -> { + valueString = "THREE" + } + else -> { + } + } + System.out.println(valueString) + } + } } -2 -> { -valueString = "TWO" -} -3 -> { -valueString = "THREE" -} -else -> { -} -} -System.out.println(valueString) -} -} -} -fun main(args : Array) = NonDefault.main(args as Array?) \ No newline at end of file +fun main(args: Array) = NonDefault.main(args as Array?) \ No newline at end of file diff --git a/j2k/tests/testData/ast/switch/nondefault.kt b/j2k/tests/testData/ast/switch/nondefault.kt index facbbe8fa10..683cecf68c3 100644 --- a/j2k/tests/testData/ast/switch/nondefault.kt +++ b/j2k/tests/testData/ast/switch/nondefault.kt @@ -1,23 +1,23 @@ public open class NonDefault() { -class object { -public open fun main(args : Array?) { -var value : Int = 3 -var valueString : String? = "" -when (value) { -1 -> { -valueString = "ONE" + class object { + public open fun main(args: Array?) { + var value: Int = 3 + var valueString: String? = "" + when (value) { + 1 -> { + valueString = "ONE" + } + 2 -> { + valueString = "TWO" + } + 3 -> { + valueString = "THREE" + } + else -> { + } + } + System.out?.println(valueString) + } + } } -2 -> { -valueString = "TWO" -} -3 -> { -valueString = "THREE" -} -else -> { -} -} -System.out?.println(valueString) -} -} -} -fun main(args : Array) = NonDefault.main(args as Array?) \ No newline at end of file +fun main(args: Array) = NonDefault.main(args as Array?) \ No newline at end of file diff --git a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt index 511b9c1f28e..5ea8636214a 100644 --- a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt +++ b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.ide.kt @@ -1,11 +1,11 @@ class Base() { -fun foo() { -} + fun foo() { + } } class A() : Base() { -class C() { -fun test() { -this@A.foo() -} -} + class C() { + fun test() { + this@A.foo() + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt index 4bb52748296..245de9e0a39 100644 --- a/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt +++ b/j2k/tests/testData/ast/thisExpression/classAdotThisFoo.kt @@ -1,11 +1,11 @@ open class Base() { -open fun foo() { -} + open fun foo() { + } } open class A() : Base() { -open class C() { -open fun test() { -this@A.foo() -} -} + open class C() { + open fun test() { + this@A.foo() + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/trait/interfaceWithFields.ide.kt b/j2k/tests/testData/ast/trait/interfaceWithFields.ide.kt index cfd0705e789..1cd7c1bb0ac 100644 --- a/j2k/tests/testData/ast/trait/interfaceWithFields.ide.kt +++ b/j2k/tests/testData/ast/trait/interfaceWithFields.ide.kt @@ -1,7 +1,7 @@ trait INode { -class object { -val IN : String = "in" -val AT : String = "@" -val COMMA_WITH_SPACE : String = COMMA + SPACE -} + class object { + val IN: String = "in" + val AT: String = "@" + val COMMA_WITH_SPACE: String = COMMA + SPACE + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/trait/interfaceWithFields.kt b/j2k/tests/testData/ast/trait/interfaceWithFields.kt index f8fdfeacaf4..8ca3777deac 100644 --- a/j2k/tests/testData/ast/trait/interfaceWithFields.kt +++ b/j2k/tests/testData/ast/trait/interfaceWithFields.kt @@ -1,7 +1,7 @@ trait INode { -class object { -val IN : String = "in" -val AT : String = "@" -val COMMA_WITH_SPACE : String? = COMMA + SPACE -} + class object { + val IN: String = "in" + val AT: String = "@" + val COMMA_WITH_SPACE: String? = COMMA + SPACE + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.ide.kt b/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.ide.kt index 2536f3f7190..7379723f17b 100644 --- a/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.ide.kt +++ b/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.ide.kt @@ -1,4 +1,4 @@ trait INode { -fun getTag() : Tag -fun toKotlin() : String + fun getTag(): Tag + fun toKotlin(): String } \ No newline at end of file diff --git a/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.kt b/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.kt index aff8b40c610..51faca96c9f 100644 --- a/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.kt +++ b/j2k/tests/testData/ast/trait/interfaceWithMethodDeclaration.kt @@ -1,4 +1,4 @@ trait INode { -open fun getTag() : Tag? -open fun toKotlin() : String? + open fun getTag(): Tag? + open fun toKotlin(): String? } \ No newline at end of file diff --git a/j2k/tests/testData/ast/trait/interfaceWithStaticFields.ide.kt b/j2k/tests/testData/ast/trait/interfaceWithStaticFields.ide.kt index d6527b5f2be..813f496d125 100644 --- a/j2k/tests/testData/ast/trait/interfaceWithStaticFields.ide.kt +++ b/j2k/tests/testData/ast/trait/interfaceWithStaticFields.ide.kt @@ -1,7 +1,7 @@ public trait INode { -class object { -public val IN : String = "in" -public val AT : String = "@" -public val COMMA_WITH_SPACE : String = COMMA + SPACE -} + class object { + public val IN: String = "in" + public val AT: String = "@" + public val COMMA_WITH_SPACE: String = COMMA + SPACE + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/trait/interfaceWithStaticFields.kt b/j2k/tests/testData/ast/trait/interfaceWithStaticFields.kt index 0f1ab7c26f1..59e0d7cbed5 100644 --- a/j2k/tests/testData/ast/trait/interfaceWithStaticFields.kt +++ b/j2k/tests/testData/ast/trait/interfaceWithStaticFields.kt @@ -1,7 +1,7 @@ public trait INode { -class object { -public val IN : String = "in" -public val AT : String = "@" -public val COMMA_WITH_SPACE : String? = COMMA + SPACE -} + class object { + public val IN: String = "in" + public val AT: String = "@" + public val COMMA_WITH_SPACE: String? = COMMA + SPACE + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/genericParam.ide.kt b/j2k/tests/testData/ast/typeParameters/genericParam.ide.kt index 7906dcc847d..e7f54df3449 100644 --- a/j2k/tests/testData/ast/typeParameters/genericParam.ide.kt +++ b/j2k/tests/testData/ast/typeParameters/genericParam.ide.kt @@ -1 +1 @@ -val l : List \ No newline at end of file +val l: List \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/genericParam.kt b/j2k/tests/testData/ast/typeParameters/genericParam.kt index 53f9c91dba7..45fd6c20cf2 100644 --- a/j2k/tests/testData/ast/typeParameters/genericParam.kt +++ b/j2k/tests/testData/ast/typeParameters/genericParam.kt @@ -1 +1 @@ -var l : List? \ No newline at end of file +var l: List? \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/manyGenericParams.ide.kt b/j2k/tests/testData/ast/typeParameters/manyGenericParams.ide.kt index 27182aa85e3..c8219f80a79 100644 --- a/j2k/tests/testData/ast/typeParameters/manyGenericParams.ide.kt +++ b/j2k/tests/testData/ast/typeParameters/manyGenericParams.ide.kt @@ -1 +1 @@ -val l : List \ No newline at end of file +val l: List \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/manyGenericParams.kt b/j2k/tests/testData/ast/typeParameters/manyGenericParams.kt index 007056e4c03..dec3e5c17b9 100644 --- a/j2k/tests/testData/ast/typeParameters/manyGenericParams.kt +++ b/j2k/tests/testData/ast/typeParameters/manyGenericParams.kt @@ -1 +1 @@ -var l : List? \ No newline at end of file +var l: List? \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.ide.kt b/j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.ide.kt index 4f78ed1cf95..ea8e4426ebb 100644 --- a/j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.ide.kt +++ b/j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.ide.kt @@ -1,2 +1,2 @@ -fun max(coll : Collection) : T where T : Comparable, K : Collection { +fun max(coll: Collection): T where T : Comparable, K : Collection { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.kt b/j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.kt index 9e72bf2b2e3..94037a798d9 100644 --- a/j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.kt +++ b/j2k/tests/testData/ast/typeParameters/methodDoubleParametrizationWithTwoBounds.kt @@ -1,2 +1,2 @@ -fun max(coll : Collection?) : T? where T : Comparable?, K : Collection? { +fun max(coll: Collection?): T? where T : Comparable?, K : Collection? { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/where.ide.kt b/j2k/tests/testData/ast/typeParameters/where.ide.kt index 7fda9a05e1b..347e80c1306 100644 --- a/j2k/tests/testData/ast/typeParameters/where.ide.kt +++ b/j2k/tests/testData/ast/typeParameters/where.ide.kt @@ -1,2 +1,2 @@ -fun max(coll : Collection) : T where T : Comparable { +fun max(coll: Collection): T where T : Comparable { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/typeParameters/where.kt b/j2k/tests/testData/ast/typeParameters/where.kt index ef6ca892846..8538b7536d4 100644 --- a/j2k/tests/testData/ast/typeParameters/where.kt +++ b/j2k/tests/testData/ast/typeParameters/where.kt @@ -1,2 +1,2 @@ -fun max(coll : Collection?) : T? where T : Comparable? { +fun max(coll: Collection?): T? where T : Comparable? { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.ide.kt b/j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.ide.kt index fc817eef037..28aec67d146 100644 --- a/j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.ide.kt +++ b/j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.ide.kt @@ -1 +1 @@ -fun format(pattern : String, vararg arguments : Any) : String \ No newline at end of file +fun format(pattern: String, vararg arguments: Any): String \ No newline at end of file diff --git a/j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.kt b/j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.kt index 78207eee74b..f81a8d2b812 100644 --- a/j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.kt +++ b/j2k/tests/testData/ast/varArg/ellipsisTypeSeveralParams.kt @@ -1 +1 @@ -fun format(pattern : String?, vararg arguments : Any?) : String? \ No newline at end of file +fun format(pattern: String?, vararg arguments: Any?): String? \ No newline at end of file diff --git a/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.ide.kt b/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.ide.kt index 5a8349961bf..e1403964927 100644 --- a/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.ide.kt +++ b/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.ide.kt @@ -1,2 +1,2 @@ -fun pushAll(vararg objs : Any) { +fun pushAll(vararg objs: Any) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.kt b/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.kt index 5e2076786e1..34689e6d465 100644 --- a/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.kt +++ b/j2k/tests/testData/ast/varArg/ellipsisTypeSingleParams.kt @@ -1,2 +1,2 @@ -fun pushAll(vararg objs : Any?) { +fun pushAll(vararg objs: Any?) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/whileStatement/whileWithBlock.kt b/j2k/tests/testData/ast/whileStatement/whileWithBlock.kt index 88e9992f59a..be03003893b 100644 --- a/j2k/tests/testData/ast/whileStatement/whileWithBlock.kt +++ b/j2k/tests/testData/ast/whileStatement/whileWithBlock.kt @@ -1,5 +1,5 @@ while (a > b) { -var i : Int = 1 +var i: Int = 1 i = i + 1 } \ No newline at end of file