fix(printer): properly break and indent lambda with comments

closes jhipster#581
jtkiesel · Sep 6, 2023 · b1d9303 · b1d9303
1 parent a7f9a5f
commit b1d9303
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 14 deletions.
diff --git a/packages/prettier-plugin-java/src/utils/printSingleLambdaInvocation.ts b/packages/prettier-plugin-java/src/utils/printSingleLambdaInvocation.ts
@@ -2,7 +2,7 @@ import { ArgumentListCstNode, IToken } from "java-parser";
 import { builders } from "prettier/doc";
 import { isSingleArgumentLambdaExpressionWithBlock } from "./expressions-utils";
 import { printTokenWithComments } from "../printers/comments/format-comments";
-import { concat, dedent, indent } from "../printers/prettier-builder";
+import { concat, dedent } from "../printers/prettier-builder";
 import { putIntoBraces } from "../printers/printer-utils";
 
 const { softline, ifBreak } = builders;
@@ -18,14 +18,13 @@ export default function printSingleLambdaInvocation(
     isInsideMethodInvocationSuffix: true
   });
 
-  const formattedRBrace = isSingleArgumentLambdaExpressionWithBlock(
-    argumentListCtx
-  )
-    ? ifBreak(
-        indent(concat([softline, rBrace])),
-        printTokenWithComments(rBrace),
-        { groupId: lambdaParametersGroupId }
-      )
-    : indent(concat([softline, rBrace]));
-  return dedent(putIntoBraces(argumentList, "", lBrace, formattedRBrace));
+  if (isSingleArgumentLambdaExpressionWithBlock(argumentListCtx)) {
+    const formattedRBrace = ifBreak(
+      concat([softline, rBrace]),
+      printTokenWithComments(rBrace),
+      { groupId: lambdaParametersGroupId }
+    );
+    return putIntoBraces(dedent(argumentList), "", lBrace, formattedRBrace);
+  }
+  return putIntoBraces(argumentList, softline, lBrace, rBrace);
 }
diff --git a/packages/prettier-plugin-java/test/unit-test/lambda/_input.java b/packages/prettier-plugin-java/test/unit-test/lambda/_input.java
@@ -151,6 +151,26 @@ public void testConstructor() {
           }
       );
     }
+
+    void lambdaWithLeadingComments() {
+        System.out.println(
+            List.of(1, 2, 3).stream().map(
+                // a very long comment which explains the beatifullness of multiplication by 2
+                // yes this is very important
+                v -> v * 2
+            ).collect(Collectors.summingInt(v -> v))
+        );
+    }
+
+    void lambdaWithTrailingComments() {
+        System.out.println(
+            List.of(1, 2, 3).stream().map(
+                v -> v * 2
+                // a very long comment which explains the beatifullness of multiplication by 2
+                // yes this is very important
+            ).collect(Collectors.summingInt(v -> v))
+        );
+    }
 }
 
 class T {

diff --git a/packages/prettier-plugin-java/test/unit-test/lambda/_output.java b/packages/prettier-plugin-java/test/unit-test/lambda/_output.java
@@ -46,9 +46,10 @@ public void onlyOneMethodInBody() {
   }
 
   public void lambdaWithoutBracesWhichBreak() {
-    call(x ->
-      foo.isVeryVeryVeryLongConditionTrue() &&
-      foo.isAnotherVeryVeryLongConditionTrue()
+    call(
+      x ->
+        foo.isVeryVeryVeryLongConditionTrue() &&
+        foo.isAnotherVeryVeryLongConditionTrue()
     );
   }
 
@@ -143,6 +144,34 @@ public void testConstructor() {
       }
     );
   }
+
+  void lambdaWithLeadingComments() {
+    System.out.println(
+      List
+        .of(1, 2, 3)
+        .stream()
+        .map(
+          // a very long comment which explains the beatifullness of multiplication by 2
+          // yes this is very important
+          v -> v * 2
+        )
+        .collect(Collectors.summingInt(v -> v))
+    );
+  }
+
+  void lambdaWithTrailingComments() {
+    System.out.println(
+      List
+        .of(1, 2, 3)
+        .stream()
+        .map(
+          v -> v * 2
+          // a very long comment which explains the beatifullness of multiplication by 2
+          // yes this is very important
+        )
+        .collect(Collectors.summingInt(v -> v))
+    );
+  }
 }
 
 class T {