fix: fix stable reformating when wrapping return statements (#294)

jhipster · Nov 18, 2019 · 51dff6c · 51dff6c
1 parent 1502d33
commit 51dff6c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/packages/prettier-plugin-java/src/printers/expressions.js b/packages/prettier-plugin-java/src/printers/expressions.js
@@ -229,9 +229,11 @@ class ExpressionsPrettierVisitor {
           indent(
             concat([
               softline,
-              rejectAndJoinSeps(
-                sortedBinaryOperators.map(elt => concat([" ", elt, line])),
-                segmentsSplittedByBinaryOperator
+              group(
+                rejectAndJoinSeps(
+                  sortedBinaryOperators.map(elt => concat([" ", elt, line])),
+                  segmentsSplittedByBinaryOperator
+                )
               )
             ])
           ),

diff --git a/packages/prettier-plugin-java/test/unit-test/return/_input.java b/packages/prettier-plugin-java/test/unit-test/return/_input.java
@@ -36,4 +36,8 @@ Object returnSomethingWhichBreakAndAlreadyInParenthesis() {
     );
   }
 
+  // Bug fix #290
+  public boolean shouldBreakInOneLine(Example that) {
+    return oneVeryLongPrimaryExpression && andYetAnotherVeryVeryLongPrimaryExpression;
+  }
 }
diff --git a/packages/prettier-plugin-java/test/unit-test/return/_output.java b/packages/prettier-plugin-java/test/unit-test/return/_output.java
@@ -43,4 +43,11 @@ Object returnSomethingWhichBreakAndAlreadyInParenthesis() {
       seventhVariable
     );
   }
+
+  // Bug fix #290
+  public boolean shouldBreakInOneLine(Example that) {
+    return (
+      oneVeryLongPrimaryExpression && andYetAnotherVeryVeryLongPrimaryExpression
+    );
+  }
 }