From 0e6e0e6df13ea1cdac26c1d9b18663589cbc9028 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Wed, 5 Dec 2018 14:23:44 +0300 Subject: [PATCH] New J2K: Stop printing multiline lambdas in a case of single statement inside --- j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt b/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt index 06dd590b366..800dbbd77b3 100644 --- a/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt +++ b/j2k/newSrc/org/jetbrains/kotlin/j2k/NewCodeBuilder.kt @@ -704,7 +704,9 @@ class NewCodeBuilder { } override fun visitLambdaExpression(lambdaExpression: JKLambdaExpression) { - printer.par(CURVED_MULTILINE) { + printer.par(CURVED) { + if (lambdaExpression.statement.statements.size > 1) + printer.println() lambdaExpression.parameters.firstOrNull()?.accept(this) lambdaExpression.parameters.asSequence().drop(1).forEach { printer.printWithNoIndent(", "); it.accept(this) } if (lambdaExpression.parameters.isNotEmpty()) { @@ -717,6 +719,8 @@ class NewCodeBuilder { } else { statement.accept(this) } + if (lambdaExpression.statement.statements.size > 1) + printer.println() } }