fix: break between non-block if/else statements

jtkiesel · Jan 9, 2024 · d0ff4d1 · d0ff4d1
1 parent 1f7f1d7
commit d0ff4d1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/packages/prettier-plugin-java/src/printers/blocks-and-statements.ts b/packages/prettier-plugin-java/src/printers/blocks-and-statements.ts
@@ -205,7 +205,9 @@ export class BlocksAndStatementPrettierVisitor extends BaseCstPrettierPrinter {
 
       const elseOnSameLine =
         hasTrailingLineComments(ctx.statement[0]) ||
-        hasLeadingLineComments(ctx.Else[0])
+        hasLeadingLineComments(ctx.Else[0]) ||
+        !ctx.statement[0].children.statementWithoutTrailingSubstatement?.[0]
+          .children.block
           ? hardline
           : " ";
 

diff --git a/packages/prettier-plugin-java/test/unit-test/empty_statement/_output.java b/packages/prettier-plugin-java/test/unit-test/empty_statement/_output.java
@@ -37,23 +37,27 @@ public void forEachWithEmptyStatement(List<String> list) {
   }
 
   public void ifElseWithEmptyStatements() {
-    if (test); else {
+    if (test);
+    else {
       System.out.println("one");
     }
 
     if (test) {
       System.out.println("two");
     } else;
 
-    if (test); else;
+    if (test);
+    else;
   }
 
   public void ifElseWithEmptyStatementsWithComments() {
-    if (test) /*test*/; else {
+    if (test) /*test*/;
+    else {
       System.out.println("one");
     }
 
-    if (test); /*test*/else {
+    if (test);
+    /*test*/else {
       System.out.println("one");
     }
 
@@ -65,9 +69,11 @@ public void ifElseWithEmptyStatementsWithComments() {
       System.out.println("two");
     } else;/*test*/
 
-    if (test); /*test*/else;/*test*/
+    if (test);
+    /*test*/else;/*test*/
 
-    if (test) /*test*/; else /*test*/;
+    if (test) /*test*/;
+    else /*test*/;
   }
 
   public void simpleWhileWithEmptyStatement(boolean one) {

diff --git a/packages/prettier-plugin-java/test/unit-test/sealed/_output.java b/packages/prettier-plugin-java/test/unit-test/sealed/_output.java
@@ -46,11 +46,9 @@ default Shape rotate(double angle) {
   }
 
   default String areaMessage() {
-    if (this instanceof Circle) return "Circle: " + area(); else if (
-      this instanceof Rectangle
-    ) return "Rectangle: " + area(); else if (
-      this instanceof RightTriangle
-    ) return "Triangle: " + area();
+    if (this instanceof Circle) return "Circle: " + area();
+    else if (this instanceof Rectangle) return "Rectangle: " + area();
+    else if (this instanceof RightTriangle) return "Triangle: " + area();
     // :(
     throw new IllegalArgumentException();
   }