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 b4c7b230361..25ab48477a6 100644 --- a/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt +++ b/j2k/tests/test/org/jetbrains/jet/j2k/test/AbstractJavaToKotlinConverterTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,6 +36,8 @@ import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.project.Project import com.intellij.openapi.command.WriteCommandAction import com.intellij.openapi.application.Result +import java.io.BufferedReader +import java.io.StringReader public abstract class AbstractJavaToKotlinConverterPluginTest() : AbstractJavaToKotlinConverterTest("ide.kt", PluginSettings) public abstract class AbstractJavaToKotlinConverterBasicTest() : AbstractJavaToKotlinConverterTest("kt", TestSettings) @@ -66,18 +68,32 @@ abstract class AbstractJavaToKotlinConverterTest( else -> throw IllegalStateException("Specify what is it: file, class, method, statement or expression " + "using the first line of test data file") } - val actual = reformat(rawConverted, project) + + val reformatInFun = when (prefix) { + "element", "expression", "statement" -> true + else -> false + } + + val actual = reformat(rawConverted, project, reformatInFun) val kotlinPath = javaPath.replace(".java", ".$kotlinFileExtension") val expectedFile = File(kotlinPath) JetTestUtils.assertEqualsToFile(expectedFile, actual) } - private fun reformat(text: String, project: Project): String { - val convertedFile = JetTestUtils.createFile("converted", text, project) + private fun reformat(text: String, project: Project, inFunContext: Boolean): String { + val textToFormat = if (inFunContext) "fun convertedTemp() {\n$text\n}" else text + + val convertedFile = JetTestUtils.createFile("converted", textToFormat, project) WriteCommandAction.runWriteCommandAction(project) { CodeStyleManager.getInstance(project)!!.reformat(convertedFile) } - return convertedFile.getText()!! + + val reformattedText = convertedFile.getText()!! + + return if (inFunContext) + reformattedText.removeFirstLine().removeLastLine().trimIndent() + else + reformattedText } private fun elementToKotlin(converter: Converter, text: String): String { @@ -121,4 +137,42 @@ abstract class AbstractJavaToKotlinConverterTest( override fun getProjectJDK(): Sdk? { return PluginTestCaseBase.jdkFromIdeaHome() } + + private fun String.removeFirstLine(): String { + val lastNewLine = indexOf('\n') + return if (lastNewLine == -1) "" else substring(lastNewLine) + } + + private fun String.removeLastLine(): String { + val lastNewLine = lastIndexOf('\n') + return if (lastNewLine == -1) "" else substring(0, lastNewLine) + } + + private fun String.trimIndent(): String { + val lines = split('\n') + + val firstNonEmpty = lines.firstOrNull { !it.trim().isEmpty() } + if (firstNonEmpty == null) { + return this + } + + val trimmedPrefix = firstNonEmpty.takeWhile { ch -> ch.isWhitespace() } + if (trimmedPrefix.isEmpty()) { + return this + } + + return lines.map { line -> + if (line.trim().isEmpty()) { + "" + } + else { + if (!line.startsWith(trimmedPrefix)) { + throw IllegalArgumentException( + """Invalid line "$line", ${trimmedPrefix.size} whitespace character are expected""") + } + + line.substring(trimmedPrefix.length) + } + }.makeString(separator = "\n") + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/assertStatement/withStringDetail.ide.kt b/j2k/tests/testData/ast/assertStatement/withStringDetail.ide.kt index ef76c6cd22d..dbf44bd5eb8 100644 --- a/j2k/tests/testData/ast/assertStatement/withStringDetail.ide.kt +++ b/j2k/tests/testData/ast/assertStatement/withStringDetail.ide.kt @@ -1 +1 @@ -assert(true) {"string details"} \ No newline at end of file +assert(true) { "string details" } \ No newline at end of file diff --git a/j2k/tests/testData/ast/assertStatement/withStringDetail.kt b/j2k/tests/testData/ast/assertStatement/withStringDetail.kt index ef76c6cd22d..dbf44bd5eb8 100644 --- a/j2k/tests/testData/ast/assertStatement/withStringDetail.kt +++ b/j2k/tests/testData/ast/assertStatement/withStringDetail.kt @@ -1 +1 @@ -assert(true) {"string details"} \ No newline at end of file +assert(true) { "string details" } \ No newline at end of file diff --git a/j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.ide.kt b/j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.ide.kt index 85131998260..a97f9ef4807 100644 --- a/j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.ide.kt +++ b/j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.ide.kt @@ -1,4 +1,4 @@ (if (a.isEmpty()) -0 + 0 else -1) \ No newline at end of file + 1) \ No newline at end of file diff --git a/j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.kt b/j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.kt index 85131998260..a97f9ef4807 100644 --- a/j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.kt +++ b/j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.kt @@ -1,4 +1,4 @@ (if (a.isEmpty()) -0 + 0 else -1) \ No newline at end of file + 1) \ No newline at end of file diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.ide.kt b/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.ide.kt index 1de090155c7..2730c62c402 100644 --- a/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.ide.kt +++ b/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.ide.kt @@ -1,6 +1,4 @@ -do -{ -val i = 1 -i = i + 1 -} -while (a > b) \ No newline at end of file +do { + val i = 1 + i = i + 1 +} while (a > b) \ 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 d23bfb30afb..8ff4423bf33 100644 --- a/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.kt +++ b/j2k/tests/testData/ast/doWhileStatement/whileWithBlock.kt @@ -1,6 +1,4 @@ -do -{ -var i: Int = 1 -i = i + 1 -} -while (a > b) \ No newline at end of file +do { + var i: Int = 1 + i = i + 1 +} while (a > b) \ No newline at end of file diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.ide.kt b/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.ide.kt index 245cb4d5856..e70bed37653 100644 --- a/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.ide.kt +++ b/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.ide.kt @@ -1,3 +1,2 @@ -do -{} -while (true) \ No newline at end of file +do { +} while (true) \ No newline at end of file diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.kt b/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.kt index 245cb4d5856..e70bed37653 100644 --- a/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.kt +++ b/j2k/tests/testData/ast/doWhileStatement/whileWithEmptyBlock.kt @@ -1,3 +1,2 @@ -do -{} -while (true) \ No newline at end of file +do { +} while (true) \ No newline at end of file diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithExpression.ide.kt b/j2k/tests/testData/ast/doWhileStatement/whileWithExpression.ide.kt index a20c7c5d83d..cae40e3d98f 100644 --- a/j2k/tests/testData/ast/doWhileStatement/whileWithExpression.ide.kt +++ b/j2k/tests/testData/ast/doWhileStatement/whileWithExpression.ide.kt @@ -1,3 +1,3 @@ do -i = i + 1 + i = i + 1 while (true) \ No newline at end of file diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithExpression.kt b/j2k/tests/testData/ast/doWhileStatement/whileWithExpression.kt index a20c7c5d83d..cae40e3d98f 100644 --- a/j2k/tests/testData/ast/doWhileStatement/whileWithExpression.kt +++ b/j2k/tests/testData/ast/doWhileStatement/whileWithExpression.kt @@ -1,3 +1,3 @@ do -i = i + 1 + i = i + 1 while (true) \ No newline at end of file diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithReturn.ide.kt b/j2k/tests/testData/ast/doWhileStatement/whileWithReturn.ide.kt index 21de9dff87a..3f495449470 100644 --- a/j2k/tests/testData/ast/doWhileStatement/whileWithReturn.ide.kt +++ b/j2k/tests/testData/ast/doWhileStatement/whileWithReturn.ide.kt @@ -1,3 +1,3 @@ do -return 1 + return 1 while (true) \ No newline at end of file diff --git a/j2k/tests/testData/ast/doWhileStatement/whileWithReturn.kt b/j2k/tests/testData/ast/doWhileStatement/whileWithReturn.kt index 21de9dff87a..3f495449470 100644 --- a/j2k/tests/testData/ast/doWhileStatement/whileWithReturn.kt +++ b/j2k/tests/testData/ast/doWhileStatement/whileWithReturn.kt @@ -1,3 +1,3 @@ do -return 1 + return 1 while (true) \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/commonCaseForTest.ide.kt b/j2k/tests/testData/ast/for/commonCaseForTest.ide.kt index 0fab59caf33..93765cdb4f9 100644 --- a/j2k/tests/testData/ast/for/commonCaseForTest.ide.kt +++ b/j2k/tests/testData/ast/for/commonCaseForTest.ide.kt @@ -1,10 +1,9 @@ { -init() -while (condition()) -{ -body() -{ -update() -} -} + init() + while (condition()) { + body() + { + update() + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/commonCaseForTest.kt b/j2k/tests/testData/ast/for/commonCaseForTest.kt index 0fab59caf33..93765cdb4f9 100644 --- a/j2k/tests/testData/ast/for/commonCaseForTest.kt +++ b/j2k/tests/testData/ast/for/commonCaseForTest.kt @@ -1,10 +1,9 @@ { -init() -while (condition()) -{ -body() -{ -update() -} -} + init() + while (condition()) { + body() + { + update() + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forRangeWithLE.ide.kt b/j2k/tests/testData/ast/for/forRangeWithLE.ide.kt index caf76ef83ff..311f19b237c 100644 --- a/j2k/tests/testData/ast/for/forRangeWithLE.ide.kt +++ b/j2k/tests/testData/ast/for/forRangeWithLE.ide.kt @@ -1,4 +1,4 @@ val array = IntArray(10) for (i in 0..10) { -array[i] = i + array[i] = i } \ 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 b91e4fabd97..24c565e1eb6 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) for (i in 0..10) { -array[i] = i + array[i] = i } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forRangeWithLT.ide.kt b/j2k/tests/testData/ast/for/forRangeWithLT.ide.kt index a749417fdb2..69ad99b50a8 100644 --- a/j2k/tests/testData/ast/for/forRangeWithLT.ide.kt +++ b/j2k/tests/testData/ast/for/forRangeWithLT.ide.kt @@ -1,4 +1,4 @@ val array = IntArray(10) for (i in 0..10 - 1) { -array[i] = i + 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 d6820b6c50b..6215132aa81 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) for (i in 0..10 - 1) { -array[i] = i + array[i] = i } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithBlock.ide.kt b/j2k/tests/testData/ast/for/forWithBlock.ide.kt index a749417fdb2..69ad99b50a8 100644 --- a/j2k/tests/testData/ast/for/forWithBlock.ide.kt +++ b/j2k/tests/testData/ast/for/forWithBlock.ide.kt @@ -1,4 +1,4 @@ val array = IntArray(10) for (i in 0..10 - 1) { -array[i] = i + 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 d6820b6c50b..6215132aa81 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) for (i in 0..10 - 1) { -array[i] = i + 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 984e9ed773e..45e8901650b 100644 --- a/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.ide.kt +++ b/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.ide.kt @@ -1,14 +1,13 @@ { -val i = 0 -while (i <0) -{ -{ -val i = 1 -i++ -} -{ -j++ -i++ -} -} + val i = 0 + while (i < 0) { + { + val i = 1 + i++ + } + { + j++ + i++ + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.kt b/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.kt index 05d830a2a34..7f40a6b8885 100644 --- a/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.kt +++ b/j2k/tests/testData/ast/for/forWithBlockAndDoubleUpdate.kt @@ -1,14 +1,13 @@ { -var i: Int = 0 -while (i <0) -{ -{ -var i: Int = 1 -i++ -} -{ -j++ -i++ -} -} + var i: Int = 0 + while (i < 0) { + { + var i: Int = 1 + i++ + } + { + j++ + i++ + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt b/j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt index fd915d7ca50..aaa605d46f6 100644 --- a/j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt +++ b/j2k/tests/testData/ast/for/forWithEmptyBlock.ide.kt @@ -1,11 +1,10 @@ { -val i = 0 -while (i <0) -{ -{} -{ -j++ -i++ -} -} + val i = 0 + while (i < 0) { + { } + { + j++ + i++ + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithEmptyBlock.kt b/j2k/tests/testData/ast/for/forWithEmptyBlock.kt index 28acafae030..e2e024205a8 100644 --- a/j2k/tests/testData/ast/for/forWithEmptyBlock.kt +++ b/j2k/tests/testData/ast/for/forWithEmptyBlock.kt @@ -1,11 +1,10 @@ { -var i: Int = 0 -while (i <0) -{ -{} -{ -j++ -i++ -} -} + var i: Int = 0 + while (i < 0) { + { } + { + j++ + i++ + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithNullCondition.ide.kt b/j2k/tests/testData/ast/for/forWithNullCondition.ide.kt index cf2473e1d9a..068c816cfcf 100644 --- a/j2k/tests/testData/ast/for/forWithNullCondition.ide.kt +++ b/j2k/tests/testData/ast/for/forWithNullCondition.ide.kt @@ -1,10 +1,9 @@ { -init() -while (true) -{ -body() -{ -update() -} -} + init() + while (true) { + body() + { + update() + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithNullCondition.kt b/j2k/tests/testData/ast/for/forWithNullCondition.kt index cf2473e1d9a..068c816cfcf 100644 --- a/j2k/tests/testData/ast/for/forWithNullCondition.kt +++ b/j2k/tests/testData/ast/for/forWithNullCondition.kt @@ -1,10 +1,9 @@ { -init() -while (true) -{ -body() -{ -update() -} -} + init() + while (true) { + body() + { + update() + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithNullInit.ide.kt b/j2k/tests/testData/ast/for/forWithNullInit.ide.kt index f0216b02c94..9848b9962ac 100644 --- a/j2k/tests/testData/ast/for/forWithNullInit.ide.kt +++ b/j2k/tests/testData/ast/for/forWithNullInit.ide.kt @@ -1,9 +1,8 @@ { -while (condition()) -{ -body() -{ -update() -} -} + while (condition()) { + body() + { + update() + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithNullInit.kt b/j2k/tests/testData/ast/for/forWithNullInit.kt index f0216b02c94..9848b9962ac 100644 --- a/j2k/tests/testData/ast/for/forWithNullInit.kt +++ b/j2k/tests/testData/ast/for/forWithNullInit.kt @@ -1,9 +1,8 @@ { -while (condition()) -{ -body() -{ -update() -} -} + while (condition()) { + body() + { + update() + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithNullUpdate.ide.kt b/j2k/tests/testData/ast/for/forWithNullUpdate.ide.kt index b683704827b..7ca346555e1 100644 --- a/j2k/tests/testData/ast/for/forWithNullUpdate.ide.kt +++ b/j2k/tests/testData/ast/for/forWithNullUpdate.ide.kt @@ -1,7 +1,6 @@ { -init() -while (condition()) -{ -body() -} + init() + while (condition()) { + body() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithNullUpdate.kt b/j2k/tests/testData/ast/for/forWithNullUpdate.kt index b683704827b..7ca346555e1 100644 --- a/j2k/tests/testData/ast/for/forWithNullUpdate.kt +++ b/j2k/tests/testData/ast/for/forWithNullUpdate.kt @@ -1,7 +1,6 @@ { -init() -while (condition()) -{ -body() -} + init() + while (condition()) { + body() + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithReturn.ide.kt b/j2k/tests/testData/ast/for/forWithReturn.ide.kt index f39117a839a..cd07bc24e34 100644 --- a/j2k/tests/testData/ast/for/forWithReturn.ide.kt +++ b/j2k/tests/testData/ast/for/forWithReturn.ide.kt @@ -1,11 +1,10 @@ { -val i = 0 -while (i <0) -{ -return i -{ -j++ -i++ -} -} + val i = 0 + while (i < 0) { + return i + { + j++ + i++ + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/for/forWithReturn.kt b/j2k/tests/testData/ast/for/forWithReturn.kt index 8370229d093..bc0bf300ef7 100644 --- a/j2k/tests/testData/ast/for/forWithReturn.kt +++ b/j2k/tests/testData/ast/for/forWithReturn.kt @@ -1,11 +1,10 @@ { -var i: Int = 0 -while (i <0) -{ -return i -{ -j++ -i++ -} -} + var i: Int = 0 + while (i < 0) { + return i + { + j++ + i++ + } + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.ide.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.ide.kt index 8b03dd6d4ce..aad8f1fe027 100644 --- a/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.ide.kt +++ b/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.ide.kt @@ -1,5 +1,4 @@ -for (n in list) -{ -val i = 1 -i++ +for (n in list) { + val i = 1 + i++ } \ No newline at end of file diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.kt index ae1d0d5a9a5..defda6b0aa6 100644 --- a/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.kt +++ b/j2k/tests/testData/ast/foreachStatement/enhancedForWithBlock.kt @@ -1,5 +1,4 @@ -for (n in list) -{ -var i: Int = 1 -i++ +for (n in list) { + var i: Int = 1 + i++ } \ No newline at end of file diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.ide.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.ide.kt index 9f0afd80670..69ca8ed72fd 100644 --- a/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.ide.kt +++ b/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.ide.kt @@ -1,2 +1,2 @@ -for (n in list) -{} \ No newline at end of file +for (n in list) { +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.kt index 9f0afd80670..69ca8ed72fd 100644 --- a/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.kt +++ b/j2k/tests/testData/ast/foreachStatement/enhancedForWithEmptyBlock.kt @@ -1,2 +1,2 @@ -for (n in list) -{} \ No newline at end of file +for (n in list) { +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.ide.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.ide.kt index 999fe998205..6e73d85bff7 100644 --- a/j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.ide.kt +++ b/j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.ide.kt @@ -1,2 +1,2 @@ for (n in list) -i++ \ No newline at end of file + i++ \ No newline at end of file diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.kt index 999fe998205..6e73d85bff7 100644 --- a/j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.kt +++ b/j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.kt @@ -1,2 +1,2 @@ for (n in list) -i++ \ No newline at end of file + i++ \ No newline at end of file diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.ide.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.ide.kt index 1e2f43f9a1f..94e85bb493e 100644 --- a/j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.ide.kt +++ b/j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.ide.kt @@ -1,2 +1,2 @@ for (n in list) -return n \ No newline at end of file + return n \ No newline at end of file diff --git a/j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.kt b/j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.kt index 1e2f43f9a1f..94e85bb493e 100644 --- a/j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.kt +++ b/j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.kt @@ -1,2 +1,2 @@ for (n in list) -return n \ No newline at end of file + return n \ No newline at end of file diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.ide.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.ide.kt index 8b46ffb918e..e41b4fa942b 100644 --- a/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.ide.kt +++ b/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.ide.kt @@ -1,4 +1,3 @@ -if (1 > 0) -{} -else -{} \ No newline at end of file +if (1 > 0) { +} else { +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.kt index 8b46ffb918e..e41b4fa942b 100644 --- a/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.kt +++ b/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.kt @@ -1,4 +1,3 @@ -if (1 > 0) -{} -else -{} \ No newline at end of file +if (1 > 0) { +} else { +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.ide.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.ide.kt index 19c68833ab2..803d3a232c7 100644 --- a/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.ide.kt +++ b/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.ide.kt @@ -1,9 +1,6 @@ -if (1 > 0) -{ -val n = 1 -return n -} -else -{ -return 0 +if (1 > 0) { + val n = 1 + return n +} else { + return 0 } \ 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 2b3c3b0429a..3d83bfd7509 100644 --- a/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.kt +++ b/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.kt @@ -1,9 +1,6 @@ -if (1 > 0) -{ -var n: Int = 1 -return n -} -else -{ -return 0 +if (1 > 0) { + var n: Int = 1 + return n +} else { + return 0 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.ide.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.ide.kt index 923c0d36318..693e8dab8dc 100644 --- a/j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.ide.kt +++ b/j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.ide.kt @@ -1,4 +1,4 @@ if (true) -return 1 + return 1 else -return 0 \ No newline at end of file + return 0 \ No newline at end of file diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.kt index 923c0d36318..693e8dab8dc 100644 --- a/j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.kt +++ b/j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.kt @@ -1,4 +1,4 @@ if (true) -return 1 + return 1 else -return 0 \ No newline at end of file + return 0 \ No newline at end of file diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.ide.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.ide.kt index 96a26560347..be2db5323dd 100644 --- a/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.ide.kt +++ b/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.ide.kt @@ -1,5 +1,4 @@ -if (1 > 0) -{ -val n = 1 -return n +if (1 > 0) { + val n = 1 + return n } \ No newline at end of file diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.kt index 93c2be105c5..dcc7018a813 100644 --- a/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.kt +++ b/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.kt @@ -1,5 +1,4 @@ -if (1 > 0) -{ -var n: Int = 1 -return n +if (1 > 0) { + var n: Int = 1 + return n } \ No newline at end of file diff --git a/j2k/tests/testData/ast/importStatement/oneImport.java b/j2k/tests/testData/ast/importStatement/oneImport.java index 7927c677822..3911700f2a2 100644 --- a/j2k/tests/testData/ast/importStatement/oneImport.java +++ b/j2k/tests/testData/ast/importStatement/oneImport.java @@ -1,2 +1,2 @@ -//element +//file import java.util.Arrays; \ No newline at end of file diff --git a/j2k/tests/testData/ast/importStatement/onlyImports.java b/j2k/tests/testData/ast/importStatement/onlyImports.java index d5c369c26e1..77ccdae0142 100644 --- a/j2k/tests/testData/ast/importStatement/onlyImports.java +++ b/j2k/tests/testData/ast/importStatement/onlyImports.java @@ -1,3 +1,3 @@ -//element +//file import java.util.Arrays; import java.util.concurrent.ArrayBlockingQueue; diff --git a/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.ide.kt b/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.ide.kt index a97a4d9ed35..178c5ccd09e 100644 --- a/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.ide.kt +++ b/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.ide.kt @@ -1,16 +1,14 @@ @test for (i in 0..max) { -val n = substring.length() -val j = i -val k = 0 -while (n-- != 0) -{ -if (searchMe.charAt(j++) != substring.charAt(k++)) -{ -continue@test -} -} -foundIt = true -break@test + val n = substring.length() + val j = i + val k = 0 + while (n-- != 0) { + if (searchMe.charAt(j++) != substring.charAt(k++)) { + continue@test + } + } + foundIt = true + break@test } System.out.println((if (foundIt) "Found it" diff --git a/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.kt b/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.kt index 0e2ffa25899..df97d29477a 100644 --- a/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.kt +++ b/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.kt @@ -1,16 +1,14 @@ @test for (i in 0..max) { -var n: Int = substring.length() -var j: Int = i -var k: Int = 0 -while (n-- != 0) -{ -if (searchMe.charAt(j++) != substring.charAt(k++)) -{ -continue@test -} -} -foundIt = true -break@test + var n: Int = substring.length() + var j: Int = i + var k: Int = 0 + while (n-- != 0) { + if (searchMe.charAt(j++) != substring.charAt(k++)) { + continue@test + } + } + foundIt = true + break@test } System.out?.println((if (foundIt) "Found it" diff --git a/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.ide.kt b/j2k/tests/testData/ast/newClassExpression/newClassWithAnonymousScope.ide.kt index 35239a1ba7f..7c22181b2aa 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") -} + override fun 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 b02de80f6f2..08c854bbbd4 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") -} + override fun run() { + System.out?.println("Run") + } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/prefixOperator/nullableIf.ide.kt b/j2k/tests/testData/ast/prefixOperator/nullableIf.ide.kt index d0a36b99c8e..0f8d7276176 100644 --- a/j2k/tests/testData/ast/prefixOperator/nullableIf.ide.kt +++ b/j2k/tests/testData/ast/prefixOperator/nullableIf.ide.kt @@ -1,3 +1,3 @@ val s = null -if (!s.isEmpty()) -{} \ No newline at end of file +if (!s.isEmpty()) { +} \ 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 4d1e55dd60b..d0f6e254a42 100644 --- a/j2k/tests/testData/ast/prefixOperator/nullableIf.kt +++ b/j2k/tests/testData/ast/prefixOperator/nullableIf.kt @@ -1,3 +1,3 @@ var s: String? = null -if (!s?.isEmpty()!!) -{} \ No newline at end of file +if (!s?.isEmpty()!!) { +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/synchronizedStatement/singleLineExample.ide.kt b/j2k/tests/testData/ast/synchronizedStatement/singleLineExample.ide.kt index 6665fbbba33..f81a9077fb5 100644 --- a/j2k/tests/testData/ast/synchronizedStatement/singleLineExample.ide.kt +++ b/j2k/tests/testData/ast/synchronizedStatement/singleLineExample.ide.kt @@ -1,3 +1,3 @@ synchronized (s) { -doSomething(s) + doSomething(s) } \ No newline at end of file diff --git a/j2k/tests/testData/ast/synchronizedStatement/singleLineExample.kt b/j2k/tests/testData/ast/synchronizedStatement/singleLineExample.kt index 6665fbbba33..f81a9077fb5 100644 --- a/j2k/tests/testData/ast/synchronizedStatement/singleLineExample.kt +++ b/j2k/tests/testData/ast/synchronizedStatement/singleLineExample.kt @@ -1,3 +1,3 @@ synchronized (s) { -doSomething(s) + doSomething(s) } \ No newline at end of file diff --git a/j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.ide.kt b/j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.ide.kt index ce5da7da296..985d275ab2b 100644 --- a/j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.ide.kt +++ b/j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.ide.kt @@ -1,14 +1,9 @@ -try -{ -callMethod(params) -} -catch (e : Exception) { -println(1) -} -catch (e : IOException) { -println(0) -} -finally -{ -println(3) +try { + callMethod(params) +} catch (e: Exception) { + println(1) +} catch (e: IOException) { + println(0) +} finally { + println(3) } \ No newline at end of file diff --git a/j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.kt b/j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.kt index ce5da7da296..985d275ab2b 100644 --- a/j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.kt +++ b/j2k/tests/testData/ast/tryStatement/commonCaseForTryStatement.kt @@ -1,14 +1,9 @@ -try -{ -callMethod(params) -} -catch (e : Exception) { -println(1) -} -catch (e : IOException) { -println(0) -} -finally -{ -println(3) +try { + callMethod(params) +} catch (e: Exception) { + println(1) +} catch (e: IOException) { + println(0) +} finally { + println(3) } \ No newline at end of file diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.ide.kt b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.ide.kt index 9b74b7d382e..76169f577e2 100644 --- a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.ide.kt +++ b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.ide.kt @@ -1,10 +1,7 @@ -try -{} -catch (e : Exception) { -println(1) -} -catch (e : IOException) { -println(0) -} -finally -{} \ No newline at end of file +try { +} catch (e: Exception) { + println(1) +} catch (e: IOException) { + println(0) +} finally { +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.kt b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.kt index 9b74b7d382e..76169f577e2 100644 --- a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.kt +++ b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithEmptyFinally.kt @@ -1,10 +1,7 @@ -try -{} -catch (e : Exception) { -println(1) -} -catch (e : IOException) { -println(0) -} -finally -{} \ No newline at end of file +try { +} catch (e: Exception) { + println(1) +} catch (e: IOException) { + println(0) +} finally { +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.ide.kt b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.ide.kt index ed8478684ca..328e7ede774 100644 --- a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.ide.kt +++ b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.ide.kt @@ -1,12 +1,8 @@ -try -{} -catch (e : Exception) { -println(1) -} -catch (e : IOException) { -println(0) -} -finally -{ -println(3) +try { +} catch (e: Exception) { + println(1) +} catch (e: IOException) { + println(0) +} finally { + println(3) } \ No newline at end of file diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.kt b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.kt index ed8478684ca..328e7ede774 100644 --- a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.kt +++ b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithFinally.kt @@ -1,12 +1,8 @@ -try -{} -catch (e : Exception) { -println(1) -} -catch (e : IOException) { -println(0) -} -finally -{ -println(3) +try { +} catch (e: Exception) { + println(1) +} catch (e: IOException) { + println(0) +} finally { + println(3) } \ No newline at end of file diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.ide.kt b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.ide.kt index 5cb15169daa..cf32e20abc2 100644 --- a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.ide.kt +++ b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.ide.kt @@ -1,8 +1,6 @@ -try -{} -catch (e : Exception) { -println(1) -} -catch (e : IOException) { -println(0) +try { +} catch (e: Exception) { + println(1) +} catch (e: IOException) { + println(0) } \ No newline at end of file diff --git a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.kt b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.kt index 5cb15169daa..cf32e20abc2 100644 --- a/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.kt +++ b/j2k/tests/testData/ast/tryStatement/emptyTryWithTwoCatchesWithoutFinally.kt @@ -1,8 +1,6 @@ -try -{} -catch (e : Exception) { -println(1) -} -catch (e : IOException) { -println(0) +try { +} catch (e: Exception) { + println(1) +} catch (e: IOException) { + println(0) } \ No newline at end of file diff --git a/j2k/tests/testData/ast/whileStatement/whileWithBlock.ide.kt b/j2k/tests/testData/ast/whileStatement/whileWithBlock.ide.kt index e2211cc3a81..01995926e71 100644 --- a/j2k/tests/testData/ast/whileStatement/whileWithBlock.ide.kt +++ b/j2k/tests/testData/ast/whileStatement/whileWithBlock.ide.kt @@ -1,5 +1,4 @@ -while (a > b) -{ -val i = 1 -i = i + 1 +while (a > b) { + val i = 1 + i = i + 1 } \ 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 be03003893b..f88a69acbce 100644 --- a/j2k/tests/testData/ast/whileStatement/whileWithBlock.kt +++ b/j2k/tests/testData/ast/whileStatement/whileWithBlock.kt @@ -1,5 +1,4 @@ -while (a > b) -{ -var i: Int = 1 -i = i + 1 +while (a > b) { + var i: Int = 1 + i = i + 1 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.ide.kt b/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.ide.kt index 38cc1444190..2f3daa10853 100644 --- a/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.ide.kt +++ b/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.ide.kt @@ -1,2 +1,2 @@ -while (true) -{} \ No newline at end of file +while (true) { +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.kt b/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.kt index 38cc1444190..2f3daa10853 100644 --- a/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.kt +++ b/j2k/tests/testData/ast/whileStatement/whileWithEmptyBlock.kt @@ -1,2 +1,2 @@ -while (true) -{} \ No newline at end of file +while (true) { +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/whileStatement/whileWithExpression.ide.kt b/j2k/tests/testData/ast/whileStatement/whileWithExpression.ide.kt index fd2a7536a52..2d8af0c7945 100644 --- a/j2k/tests/testData/ast/whileStatement/whileWithExpression.ide.kt +++ b/j2k/tests/testData/ast/whileStatement/whileWithExpression.ide.kt @@ -1,2 +1,2 @@ while (true) -i = i + 1 \ No newline at end of file + i = i + 1 \ No newline at end of file diff --git a/j2k/tests/testData/ast/whileStatement/whileWithExpression.kt b/j2k/tests/testData/ast/whileStatement/whileWithExpression.kt index fd2a7536a52..2d8af0c7945 100644 --- a/j2k/tests/testData/ast/whileStatement/whileWithExpression.kt +++ b/j2k/tests/testData/ast/whileStatement/whileWithExpression.kt @@ -1,2 +1,2 @@ while (true) -i = i + 1 \ No newline at end of file + i = i + 1 \ No newline at end of file diff --git a/j2k/tests/testData/ast/whileStatement/whileWithReturn.ide.kt b/j2k/tests/testData/ast/whileStatement/whileWithReturn.ide.kt index ec1e88ceed8..2fe2ef09188 100644 --- a/j2k/tests/testData/ast/whileStatement/whileWithReturn.ide.kt +++ b/j2k/tests/testData/ast/whileStatement/whileWithReturn.ide.kt @@ -1,2 +1,2 @@ while (true) -return 1 \ No newline at end of file + return 1 \ No newline at end of file diff --git a/j2k/tests/testData/ast/whileStatement/whileWithReturn.kt b/j2k/tests/testData/ast/whileStatement/whileWithReturn.kt index ec1e88ceed8..2fe2ef09188 100644 --- a/j2k/tests/testData/ast/whileStatement/whileWithReturn.kt +++ b/j2k/tests/testData/ast/whileStatement/whileWithReturn.kt @@ -1,2 +1,2 @@ while (true) -return 1 \ No newline at end of file + return 1 \ No newline at end of file