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

closes jhipster#581
jtkiesel · Feb 14, 2024 · 9070129 · 9070129
1 parent 820ebaf
commit 9070129
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 2 deletions.
diff --git a/packages/prettier-plugin-java/src/utils/printArgumentListWithBraces.ts b/packages/prettier-plugin-java/src/utils/printArgumentListWithBraces.ts
@@ -11,8 +11,12 @@ export default function printArgumentListWithBraces(
   rBrace: IToken,
   lBrace: IToken
 ) {
-  const argumentListCtx = argumentListNodes?.[0].children;
-  if (argumentListCtx && isArgumentListHuggable(argumentListCtx)) {
+  if (
+    argumentListNodes &&
+    !argumentListNodes[0].leadingComments &&
+    !rBrace.leadingComments &&
+    isArgumentListHuggable(argumentListNodes[0].children)
+  ) {
     const [flat, expanded] = [false, true].map(shouldBreak => {
       const argumentList = this.visit(argumentListNodes, { shouldBreak });
       return putIntoBraces(argumentList, "", 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
@@ -208,6 +208,26 @@ void argumentAfterLambdaWithBlock() {
             return f;
         }, g);
     }
+
+    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
@@ -220,6 +220,32 @@ void argumentAfterLambdaWithBlock() {
       g
     );
   }
+
+  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 {