From dedc7903422c3424732fec55ff50f1f2e311467a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nivaldo=20Bondan=C3=A7a?= Date: Wed, 27 Mar 2024 18:35:33 -0700 Subject: [PATCH] Revert D55330950: Preserve a trailing space when lambda only has block comments Differential Revision: D55330950 Original commit changeset: ca9288b3b1b4 Original Phabricator Diff: D55330950 fbshipit-source-id: 3fb64d1aa01764d358154ac9b5747ea45d99cd04 --- .../com/facebook/ktfmt/format/KotlinInputAstVisitor.kt | 3 +-- .../test/java/com/facebook/ktfmt/format/FormatterTest.kt | 9 --------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt b/core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt index 9c3ce384..b01bdc3b 100644 --- a/core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt +++ b/core/src/main/java/com/facebook/ktfmt/format/KotlinInputAstVisitor.kt @@ -891,7 +891,6 @@ class KotlinInputAstVisitor( val valueParams = lambdaExpression.valueParameters val hasParams = valueParams.isNotEmpty() val statements = (lambdaExpression.bodyExpression ?: fail()).children - val hasComments = lambdaExpression.bodyExpression?.children()?.any { it is PsiComment } ?: false val hasStatements = statements.isNotEmpty() val hasArrow = lambdaExpression.functionLiteral.arrow != null @@ -947,7 +946,7 @@ class KotlinInputAstVisitor( } } - if (hasParams || hasArrow || hasStatements || hasComments) { + if (hasParams || hasArrow || hasStatements) { // If we had to break in the body, ensure there is a break before the closing brace builder.breakOp(Doc.FillMode.UNIFIED, " ", bracePlusZeroIndent) } diff --git a/core/src/test/java/com/facebook/ktfmt/format/FormatterTest.kt b/core/src/test/java/com/facebook/ktfmt/format/FormatterTest.kt index 7c86901f..6ab3c853 100644 --- a/core/src/test/java/com/facebook/ktfmt/format/FormatterTest.kt +++ b/core/src/test/java/com/facebook/ktfmt/format/FormatterTest.kt @@ -5903,15 +5903,6 @@ class FormatterTest { |""" .trimMargin()) - @Test - fun `lambda with only comments`() = - assertFormatted( - """ - |val a = { /* do nothing */ } - |val b = { /* do nothing */ /* also do nothing */ } - |""" - .trimMargin()) - @Test fun `chaining - many dereferences`() = assertFormatted(