diff --git a/j2k/src/org/jetbrains/jet/j2k/Converter.kt b/j2k/src/org/jetbrains/jet/j2k/Converter.kt index 9cc2ab96d22..96a94230038 100644 --- a/j2k/src/org/jetbrains/jet/j2k/Converter.kt +++ b/j2k/src/org/jetbrains/jet/j2k/Converter.kt @@ -348,7 +348,7 @@ public class Converter(val project: Project, val settings: ConverterSettings) { } dispatcher.expressionVisitor = ExpressionVisitor(this, typeConverter, usageReplacementMap) try { - Block(convertStatements(body.getStatements().filter{ !statementsToRemove.contains(it) }), false) + convertBlock(body, false, { !statementsToRemove.contains(it) }) } finally { dispatcher.expressionVisitor = ExpressionVisitor(this, typeConverter, mapOf()) @@ -404,14 +404,12 @@ public class Converter(val project: Project, val settings: ConverterSettings) { return null } - public fun convertBlock(block: PsiCodeBlock?): Block { + public fun convertBlock(block: PsiCodeBlock?, notEmpty: Boolean = true, statementFilter: (PsiStatement) -> Boolean = {true}): Block { if (block == null) return Block.Empty - return Block(convertStatements(block.getChildren().toList()), true) - } - - public fun convertStatements(statements: List): StatementList { - return StatementList(statements.map { if (it is PsiStatement) convertStatement(it) else convertElement(it) }) + val filteredChildren = block.getChildren().filter { it !is PsiStatement || statementFilter(it) } + val statementList = StatementList(filteredChildren.map { if (it is PsiStatement) convertStatement(it) else convertElement(it) }) + return Block(statementList, notEmpty) } public fun convertStatement(statement: PsiStatement?): Statement { diff --git a/j2k/src/org/jetbrains/jet/j2k/Utils.kt b/j2k/src/org/jetbrains/jet/j2k/Utils.kt index 4931c2dbd9d..d887d22b105 100644 --- a/j2k/src/org/jetbrains/jet/j2k/Utils.kt +++ b/j2k/src/org/jetbrains/jet/j2k/Utils.kt @@ -78,3 +78,17 @@ fun isQualifierEmptyOrThis(ref: PsiReferenceExpression): Boolean { val qualifier = ref.getQualifierExpression() return qualifier == null || (qualifier is PsiThisExpression && qualifier.getQualifier() == null) } + +fun PsiElement.isInSingleLine(): Boolean { + if (this is PsiWhiteSpace) { + val text = getText()!! + return text.indexOf('\n') < 0 && text.indexOf('\r') < 0 + } + + var child = getFirstChild() + while (child != null) { + if (!child!!.isInSingleLine()) return false + child = child!!.getNextSibling() + } + return true +} \ No newline at end of file diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Block.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Block.kt index 1454b5c63ca..807e51a27f0 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/Block.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/Block.kt @@ -27,7 +27,6 @@ fun Block(statements: List, notEmpty: Boolean = false): Block { } class Block(val statementList: StatementList, val notEmpty: Boolean = false) : Statement() { - val statements: List = statementList.statements @@ -43,6 +42,6 @@ class Block(val statementList: StatementList, val notEmpty: Boolean = false) : S } class object { - val Empty = Block(StatementList(ArrayList())) + val Empty = Block(StatementList(listOf())) } } diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Statements.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Statements.kt index bf697c54cd0..3e1e786d122 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/Statements.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/Statements.kt @@ -46,48 +46,61 @@ class ReturnStatement(val expression: Expression) : Statement() { class IfStatement( val condition: Expression, val thenStatement: Element, - val elseStatement: Element + val elseStatement: Element, + singleLine: Boolean ) : Expression() { - override fun toKotlin(): String { - val result: String = "if (" + condition.toKotlin() + ")\n" + thenStatement.toKotlin() - if (!elseStatement.isEmpty) { - return result + "\nelse\n" + elseStatement.toKotlin() - } + private val br = if (singleLine) " " else "\n" + override fun toKotlin(): String { + val result = "if (" + condition.toKotlin() + ")$br" + thenStatement.toKotlin() + if (!elseStatement.isEmpty) { + return "$result${br}else$br${elseStatement.toKotlin()}" + } return result } } // Loops -------------------------------------------------------------------------------------------------- -open class WhileStatement(val condition: Expression, val body: Element) : Statement() { - override fun toKotlin() = "while (" + condition.toKotlin() + ")\n" + body.toKotlin() +class WhileStatement(val condition: Expression, val body: Element, singleLine: Boolean) : Statement() { + private val br = if (singleLine) " " else "\n" + + override fun toKotlin() = "while (" + condition.toKotlin() + ")$br" + body.toKotlin() } -class DoWhileStatement(condition: Expression, body: Element) : WhileStatement(condition, body) { - override fun toKotlin() = "do\n" + body.toKotlin() + "\nwhile (" + condition.toKotlin() + ")" +class DoWhileStatement(val condition: Expression, val body: Element, singleLine: Boolean) : Statement() { + private val br = if (singleLine) " " else "\n" + + override fun toKotlin() = "do$br" + body.toKotlin() + "${br}while (" + condition.toKotlin() + ")" } class ForeachStatement( val variable: Parameter, val expression: Expression, - val body: Element + val body: Element, + singleLine: Boolean ) : Statement() { - override fun toKotlin() = "for (" + variable.identifier.toKotlin() + " in " + expression.toKotlin() + ")\n" + body.toKotlin() + + private val br = if (singleLine) " " else "\n" + + override fun toKotlin() = "for (" + variable.identifier.toKotlin() + " in " + expression.toKotlin() + ")$br" + body.toKotlin() } class ForeachWithRangeStatement(val identifier: Identifier, - val start: Expression, - val end: Expression, - val body: Element) : Statement() { - override fun toKotlin() = "for (" + identifier.toKotlin() + " in " + start.toKotlin() + ".." + end.toKotlin() + ") " + body.toKotlin() + val start: Expression, + val end: Expression, + val body: Element, + singleLine: Boolean) : Statement() { + private val br = if (singleLine) " " else "\n" + + override fun toKotlin() = "for (" + identifier.toKotlin() + " in " + start.toKotlin() + ".." + end.toKotlin() + ")$br" + body.toKotlin() } -open class BreakStatement(val label: Identifier = Identifier.Empty) : Statement() { +class BreakStatement(val label: Identifier = Identifier.Empty) : Statement() { override fun toKotlin() = "break" + label.withPrefix("@") } -open class ContinueStatement(val label: Identifier = Identifier.Empty) : Statement() { +class ContinueStatement(val label: Identifier = Identifier.Empty) : Statement() { override fun toKotlin() = "continue" + label.withPrefix("@") } @@ -142,7 +155,8 @@ class SynchronizedStatement(val expression: Expression, val block: Block) : Stat override fun toKotlin() = "synchronized (" + expression.toKotlin() + ") " + block.toKotlin() } -class StatementList(elements: List) : WhiteSpaceSeparatedElementList(elements, WhiteSpace.NewLine) { +class StatementList(elements: List) + : WhiteSpaceSeparatedElementList(elements, WhiteSpace.NewLine) { val statements: List get() = elements.filterIsInstance(javaClass()) } \ No newline at end of file diff --git a/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt b/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt index 7d6e8358dc2..c8e06909f38 100644 --- a/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt +++ b/j2k/src/org/jetbrains/jet/j2k/visitors/ExpressionVisitor.kt @@ -103,7 +103,8 @@ class ExpressionVisitor(private val converter: Converter, converter.convertExpression(condition) result = IfStatement(expr, converter.convertExpression(expression.getThenExpression()), - converter.convertExpression(expression.getElseExpression())) + converter.convertExpression(expression.getElseExpression()), + expression.isInSingleLine()) } override fun visitExpressionList(list: PsiExpressionList) { diff --git a/j2k/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.kt b/j2k/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.kt index ff380df91f4..a0e5e85d440 100644 --- a/j2k/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.kt +++ b/j2k/src/org/jetbrains/jet/j2k/visitors/StatementVisitor.kt @@ -22,6 +22,7 @@ import org.jetbrains.jet.j2k.ast.* import org.jetbrains.jet.j2k.countWriteAccesses import java.util.ArrayList import org.jetbrains.jet.j2k.hasWriteAccesses +import org.jetbrains.jet.j2k.isInSingleLine class StatementVisitor(public val converter: Converter) : JavaElementVisitor() { public var result: Statement = Statement.Empty @@ -64,7 +65,7 @@ class StatementVisitor(public val converter: Converter) : JavaElementVisitor() { converter.convertExpression(condition, condition.getType()) else converter.convertExpression(condition) - result = DoWhileStatement(expression, converter.convertStatement(statement.getBody())) + result = DoWhileStatement(expression, converter.convertStatement(statement.getBody()), statement.isInSingleLine()) } override fun visitExpressionStatement(statement: PsiExpressionStatement) { @@ -106,7 +107,8 @@ class StatementVisitor(public val converter: Converter) : JavaElementVisitor() { result = ForeachWithRangeStatement(Identifier(loopVar.getName()!!), converter.convertExpression(loopVar.getInitializer()), endExpression, - converter.convertStatement(body)) + converter.convertStatement(body), + statement.isInSingleLine()) } else { var forStatements = ArrayList() @@ -114,11 +116,9 @@ class StatementVisitor(public val converter: Converter) : JavaElementVisitor() { val bodyAndUpdate = listOf(converter.convertStatement(body), Block(listOf(converter.convertStatement(update)))) forStatements.add(WhileStatement( - if (condition == null) - LiteralExpression("true") - else - converter.convertExpression(condition), - Block(bodyAndUpdate))) + if (condition == null) LiteralExpression("true") else converter.convertExpression(condition), + Block(bodyAndUpdate), + statement.isInSingleLine())) result = Block(forStatements) } } @@ -133,15 +133,17 @@ class StatementVisitor(public val converter: Converter) : JavaElementVisitor() { } result = ForeachStatement(converter.convertParameter(statement.getIterationParameter()), iterator, - converter.convertStatement(statement.getBody())) + converter.convertStatement(statement.getBody()), + statement.isInSingleLine()) } override fun visitIfStatement(statement: PsiIfStatement) { val condition = statement.getCondition() val expression = converter.convertExpression(condition, PsiType.BOOLEAN) result = IfStatement(expression, - converter.convertStatement(statement.getThenBranch()), - converter.convertStatement(statement.getElseBranch())) + converter.convertStatement(statement.getThenBranch()), + converter.convertStatement(statement.getElseBranch()), + statement.isInSingleLine()) } override fun visitLabeledStatement(statement: PsiLabeledStatement) { @@ -172,7 +174,6 @@ class StatementVisitor(public val converter: Converter) : JavaElementVisitor() { var i = 0 var hasDefaultCase: Boolean = false for (ls in cases) { - // TODO assert {(ls?.size()).sure() > 0} if (ls.size() > 0) { var label = ls[0] as PsiSwitchLabelStatement hasDefaultCase = hasDefaultCase || label.isDefaultCase() @@ -181,14 +182,18 @@ class StatementVisitor(public val converter: Converter) : JavaElementVisitor() { if (ls.size() > 1) { pendingLabels.add(converter.convertStatement(label)) val slice: List = ls.subList(1, (ls.size())) + + fun convertStatements(elements: List): List + = elements.map { if (it is PsiStatement) converter.convertStatement(it) else null }.filterNotNull() + if (!containsBreak(slice)) { - val statements = ArrayList(converter.convertStatements(slice).statements) - statements.addAll(converter.convertStatements(getAllToNextBreak(allSwitchStatements, i + ls.size())).statements) + val statements = ArrayList(convertStatements(slice)) + statements.addAll(convertStatements(getAllToNextBreak(allSwitchStatements, i + ls.size()))) result.add(CaseContainer(pendingLabels, statements)) pendingLabels = ArrayList() } else { - result.add(CaseContainer(pendingLabels, converter.convertStatements(slice).statements)) + result.add(CaseContainer(pendingLabels, convertStatements(slice))) pendingLabels = ArrayList() } } @@ -225,12 +230,12 @@ class StatementVisitor(public val converter: Converter) : JavaElementVisitor() { } override fun visitWhileStatement(statement: PsiWhileStatement) { - var condition: PsiExpression? = statement.getCondition() - val expression: Expression = (if (condition != null && condition?.getType() != null) - converter.convertExpression(condition, condition?.getType()) + val condition = statement.getCondition() + val expression = if (condition?.getType() != null) + converter.convertExpression(condition, condition!!.getType()) else - converter.convertExpression(condition)) - result = WhileStatement(expression, converter.convertStatement(statement.getBody())) + converter.convertExpression(condition) + result = WhileStatement(expression, converter.convertStatement(statement.getBody()), statement.isInSingleLine()) } override fun visitReturnStatement(statement: PsiReturnStatement) { diff --git a/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterTestGenerated.java b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterTestGenerated.java index 78ab6c8ae7a..ad6d08d33fd 100644 --- a/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterTestGenerated.java +++ b/j2k/tests/test/org/jetbrains/jet/j2k/test/JavaToKotlinConverterTestGenerated.java @@ -712,9 +712,14 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/conditionalExpression"), Pattern.compile("^(.+)\\.java$"), true); } - @TestMetadata("simpleConditionalExpression.java") - public void testSimpleConditionalExpression() throws Exception { - doTest("j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.java"); + @TestMetadata("multiline.java") + public void testMultiline() throws Exception { + doTest("j2k/tests/testData/ast/conditionalExpression/multiline.java"); + } + + @TestMetadata("simple.java") + public void testSimple() throws Exception { + doTest("j2k/tests/testData/ast/conditionalExpression/simple.java"); } } @@ -1316,24 +1321,29 @@ public class JavaToKotlinConverterTestGenerated extends AbstractJavaToKotlinConv JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("j2k/tests/testData/ast/ifStatement"), Pattern.compile("^(.+)\\.java$"), true); } - @TestMetadata("ifStatementWithEmptyBlocks.java") - public void testIfStatementWithEmptyBlocks() throws Exception { - doTest("j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.java"); + @TestMetadata("multiLine.java") + public void testMultiLine() throws Exception { + doTest("j2k/tests/testData/ast/ifStatement/multiLine.java"); } - @TestMetadata("ifStatementWithMultilineBlocks.java") - public void testIfStatementWithMultilineBlocks() throws Exception { - doTest("j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.java"); + @TestMetadata("singleLine.java") + public void testSingleLine() throws Exception { + doTest("j2k/tests/testData/ast/ifStatement/singleLine.java"); } - @TestMetadata("ifStatementWithOneLineBlocks.java") - public void testIfStatementWithOneLineBlocks() throws Exception { - doTest("j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.java"); + @TestMetadata("withBlocks.java") + public void testWithBlocks() throws Exception { + doTest("j2k/tests/testData/ast/ifStatement/withBlocks.java"); } - @TestMetadata("ifStatementWithoutElse.java") - public void testIfStatementWithoutElse() throws Exception { - doTest("j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.java"); + @TestMetadata("withEmptyBlocks.java") + public void testWithEmptyBlocks() throws Exception { + doTest("j2k/tests/testData/ast/ifStatement/withEmptyBlocks.java"); + } + + @TestMetadata("withoutElse.java") + public void testWithoutElse() throws Exception { + doTest("j2k/tests/testData/ast/ifStatement/withoutElse.java"); } } diff --git a/j2k/tests/testData/ast/conditionalExpression/multiline.java b/j2k/tests/testData/ast/conditionalExpression/multiline.java new file mode 100644 index 00000000000..f0062f2b44d --- /dev/null +++ b/j2k/tests/testData/ast/conditionalExpression/multiline.java @@ -0,0 +1,7 @@ +//method +void foo(boolean b) { + if (b) + System.out.println("true") + else + System.out.println("false") +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/conditionalExpression/multiline.kt b/j2k/tests/testData/ast/conditionalExpression/multiline.kt new file mode 100644 index 00000000000..48c79a321ad --- /dev/null +++ b/j2k/tests/testData/ast/conditionalExpression/multiline.kt @@ -0,0 +1,6 @@ +fun foo(b: Boolean) { + if (b) + System.out.println("true") + else + System.out.println("false") +} \ No newline at end of file diff --git a/j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.java b/j2k/tests/testData/ast/conditionalExpression/simple.java similarity index 100% rename from j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.java rename to j2k/tests/testData/ast/conditionalExpression/simple.java diff --git a/j2k/tests/testData/ast/conditionalExpression/simple.kt b/j2k/tests/testData/ast/conditionalExpression/simple.kt new file mode 100644 index 00000000000..9b67d59a19e --- /dev/null +++ b/j2k/tests/testData/ast/conditionalExpression/simple.kt @@ -0,0 +1 @@ +if (a.isEmpty()) 0 else 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 deleted file mode 100644 index 59ac6adaa73..00000000000 --- a/j2k/tests/testData/ast/conditionalExpression/simpleConditionalExpression.kt +++ /dev/null @@ -1,4 +0,0 @@ -if (a.isEmpty()) - 0 -else - 1 \ 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 cae40e3d98f..d34b7d3b89a 100644 --- a/j2k/tests/testData/ast/doWhileStatement/whileWithExpression.kt +++ b/j2k/tests/testData/ast/doWhileStatement/whileWithExpression.kt @@ -1,3 +1 @@ -do - i = i + 1 -while (true) \ No newline at end of file +do i = i + 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 3f495449470..0a084daa9c3 100644 --- a/j2k/tests/testData/ast/doWhileStatement/whileWithReturn.kt +++ b/j2k/tests/testData/ast/doWhileStatement/whileWithReturn.kt @@ -1,3 +1 @@ -do - return 1 -while (true) \ No newline at end of file +do return 1 while (true) \ 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 6e73d85bff7..45c01adf304 100644 --- a/j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.kt +++ b/j2k/tests/testData/ast/foreachStatement/enhancedForWithExpression.kt @@ -1,2 +1 @@ -for (n in list) - i++ \ No newline at end of file +for (n in list) i++ \ 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 94e85bb493e..c32b2454852 100644 --- a/j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.kt +++ b/j2k/tests/testData/ast/foreachStatement/enhancedForWithReturn.kt @@ -1,2 +1 @@ -for (n in list) - return n \ No newline at end of file +for (n in list) return n \ No newline at end of file diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.kt b/j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.kt deleted file mode 100644 index 693e8dab8dc..00000000000 --- a/j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.kt +++ /dev/null @@ -1,4 +0,0 @@ -if (true) - return 1 -else - return 0 \ No newline at end of file diff --git a/j2k/tests/testData/ast/ifStatement/multiLine.java b/j2k/tests/testData/ast/ifStatement/multiLine.java new file mode 100644 index 00000000000..3f666defa53 --- /dev/null +++ b/j2k/tests/testData/ast/ifStatement/multiLine.java @@ -0,0 +1,3 @@ +//statement +if (true) + return 1; \ No newline at end of file diff --git a/j2k/tests/testData/ast/ifStatement/multiLine.kt b/j2k/tests/testData/ast/ifStatement/multiLine.kt new file mode 100644 index 00000000000..958e4a4e3ed --- /dev/null +++ b/j2k/tests/testData/ast/ifStatement/multiLine.kt @@ -0,0 +1,2 @@ +if (true) + return 1 \ No newline at end of file diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.java b/j2k/tests/testData/ast/ifStatement/singleLine.java similarity index 100% rename from j2k/tests/testData/ast/ifStatement/ifStatementWithOneLineBlocks.java rename to j2k/tests/testData/ast/ifStatement/singleLine.java diff --git a/j2k/tests/testData/ast/ifStatement/singleLine.kt b/j2k/tests/testData/ast/ifStatement/singleLine.kt new file mode 100644 index 00000000000..accedf2cfbb --- /dev/null +++ b/j2k/tests/testData/ast/ifStatement/singleLine.kt @@ -0,0 +1 @@ +if (true) return 1 else return 0 \ No newline at end of file diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.java b/j2k/tests/testData/ast/ifStatement/withBlocks.java similarity index 100% rename from j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.java rename to j2k/tests/testData/ast/ifStatement/withBlocks.java diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.kt b/j2k/tests/testData/ast/ifStatement/withBlocks.kt similarity index 100% rename from j2k/tests/testData/ast/ifStatement/ifStatementWithMultilineBlocks.kt rename to j2k/tests/testData/ast/ifStatement/withBlocks.kt diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.java b/j2k/tests/testData/ast/ifStatement/withEmptyBlocks.java similarity index 100% rename from j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.java rename to j2k/tests/testData/ast/ifStatement/withEmptyBlocks.java diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.kt b/j2k/tests/testData/ast/ifStatement/withEmptyBlocks.kt similarity index 100% rename from j2k/tests/testData/ast/ifStatement/ifStatementWithEmptyBlocks.kt rename to j2k/tests/testData/ast/ifStatement/withEmptyBlocks.kt diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.java b/j2k/tests/testData/ast/ifStatement/withoutElse.java similarity index 100% rename from j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.java rename to j2k/tests/testData/ast/ifStatement/withoutElse.java diff --git a/j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.kt b/j2k/tests/testData/ast/ifStatement/withoutElse.kt similarity index 100% rename from j2k/tests/testData/ast/ifStatement/ifStatementWithoutElse.kt rename to j2k/tests/testData/ast/ifStatement/withoutElse.kt diff --git a/j2k/tests/testData/ast/issues/kt-824.kt b/j2k/tests/testData/ast/issues/kt-824.kt index 5082c0d15d5..564d50a4afd 100644 --- a/j2k/tests/testData/ast/issues/kt-824.kt +++ b/j2k/tests/testData/ast/issues/kt-824.kt @@ -15,10 +15,7 @@ class Test() { if (One.myContainer.myBoolean) System.out.println("Ok") - val s = if (One.myContainer.myBoolean) - "YES" - else - "NO" + val s = if (One.myContainer.myBoolean) "YES" else "NO" while (One.myContainer.myBoolean) System.out.println("Ok") diff --git a/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.kt b/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.kt index 84447d4dc02..2c063babc68 100644 --- a/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.kt +++ b/j2k/tests/testData/ast/labelStatement/complicatedExampleFromJavaTutorial.kt @@ -10,7 +10,4 @@ foundIt = true break@test } -System.out.println(if (foundIt) - "Found it" -else - "Didn't find it") \ No newline at end of file +System.out.println(if (foundIt) "Found it" else "Didn't find it") \ No newline at end of file diff --git a/j2k/tests/testData/ast/nullability/MethodInvokedWithTernaryNullArg.kt b/j2k/tests/testData/ast/nullability/MethodInvokedWithTernaryNullArg.kt index 89b40e797be..273dedfd954 100644 --- a/j2k/tests/testData/ast/nullability/MethodInvokedWithTernaryNullArg.kt +++ b/j2k/tests/testData/ast/nullability/MethodInvokedWithTernaryNullArg.kt @@ -3,9 +3,6 @@ class C() { } fun bar(b: Boolean) { - foo(if (b) - "a" - else - null) + foo(if (b) "a" else null) } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull4.kt b/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull4.kt index 0e3bcc4f627..ec4eb61547b 100644 --- a/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull4.kt +++ b/j2k/tests/testData/ast/nullability/MethodResultComparedWithNull4.kt @@ -5,8 +5,7 @@ trait I { class C() { fun foo(i: I, b: Boolean) { val result = i.getString() - if (b) - result = null + if (b) result = null if (result != null) { print(result) } diff --git a/j2k/tests/testData/ast/nullability/MethodReturnsTernaryNull.kt b/j2k/tests/testData/ast/nullability/MethodReturnsTernaryNull.kt index 6884408e8ef..c808c4b8a1d 100644 --- a/j2k/tests/testData/ast/nullability/MethodReturnsTernaryNull.kt +++ b/j2k/tests/testData/ast/nullability/MethodReturnsTernaryNull.kt @@ -1,8 +1,5 @@ class C() { fun foo(b: Boolean): String? { - return if (b) - "abc" - else - null + return if (b) "abc" else null } } \ No newline at end of file diff --git a/j2k/tests/testData/ast/nullability/NullableMethodDotAccess.kt b/j2k/tests/testData/ast/nullability/NullableMethodDotAccess.kt index 7ad01bb24c9..efc5e709736 100644 --- a/j2k/tests/testData/ast/nullability/NullableMethodDotAccess.kt +++ b/j2k/tests/testData/ast/nullability/NullableMethodDotAccess.kt @@ -1,9 +1,6 @@ class C() { fun getString(b: Boolean): String? { - return if (b) - "a" - else - null + return if (b) "a" else null } fun foo(): Int { diff --git a/j2k/tests/testData/ast/nullability/NullableVariableDotAccess.kt b/j2k/tests/testData/ast/nullability/NullableVariableDotAccess.kt index 3ff962a6c18..93b77147fd1 100644 --- a/j2k/tests/testData/ast/nullability/NullableVariableDotAccess.kt +++ b/j2k/tests/testData/ast/nullability/NullableVariableDotAccess.kt @@ -1,7 +1,5 @@ fun foo(s: String?, b: Boolean): Int { - if (s == null) - System.out.println("null") - if (b) - return s?.length()!! + if (s == null) System.out.println("null") + if (b) return s?.length()!! return 10 } \ No newline at end of file diff --git a/j2k/tests/testData/ast/nullability/VariableInitializedWithTernaryNull.kt b/j2k/tests/testData/ast/nullability/VariableInitializedWithTernaryNull.kt index 0e9771abc75..caa9571090f 100644 --- a/j2k/tests/testData/ast/nullability/VariableInitializedWithTernaryNull.kt +++ b/j2k/tests/testData/ast/nullability/VariableInitializedWithTernaryNull.kt @@ -1,7 +1,4 @@ // !specifyLocalVariableTypeByDefault: true fun foo(b: Boolean) { - val s: String? = (if (b) - "abc" - else - null) + val s: String? = (if (b) "abc" else null) } \ 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 c461d53dc4c..7a00100c269 100644 --- a/j2k/tests/testData/ast/objectLiteral/MyFrame.kt +++ b/j2k/tests/testData/ast/objectLiteral/MyFrame.kt @@ -11,7 +11,9 @@ public class Client() : Frame() { override fun windowClosing() { } } + addWindowListener(a) + addWindowListener(object : WindowAdapter() { override fun windowClosing() { } diff --git a/j2k/tests/testData/ast/switch/comlicatedFallDown.kt b/j2k/tests/testData/ast/switch/comlicatedFallDown.kt index 64f45d06a8c..4e8de7e649d 100644 --- a/j2k/tests/testData/ast/switch/comlicatedFallDown.kt +++ b/j2k/tests/testData/ast/switch/comlicatedFallDown.kt @@ -84,7 +84,8 @@ public class SwitchDemo() { } public fun main(args: Array) { - for (i in 1..12) test(i) + for (i in 1..12) + test(i) } } } diff --git a/j2k/tests/testData/ast/whileStatement/whileWithExpression.kt b/j2k/tests/testData/ast/whileStatement/whileWithExpression.kt index 2d8af0c7945..812da3eae13 100644 --- a/j2k/tests/testData/ast/whileStatement/whileWithExpression.kt +++ b/j2k/tests/testData/ast/whileStatement/whileWithExpression.kt @@ -1,2 +1 @@ -while (true) - i = i + 1 \ No newline at end of file +while (true) i = i + 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 2fe2ef09188..f2140ce5f17 100644 --- a/j2k/tests/testData/ast/whileStatement/whileWithReturn.kt +++ b/j2k/tests/testData/ast/whileStatement/whileWithReturn.kt @@ -1,2 +1 @@ -while (true) - return 1 \ No newline at end of file +while (true) return 1 \ No newline at end of file