fix: no break in single-block switch case

jhipster · Jan 16, 2024 · ad86a80 · ad86a80
1 parent 983a09d
commit ad86a80
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 2 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
@@ -265,13 +265,20 @@ export class BlocksAndStatementPrettierVisitor extends BaseCstPrettierPrinter {
 
   switchBlockStatementGroup(ctx: SwitchBlockStatementGroupCtx) {
     const switchLabel = this.visit(ctx.switchLabel);
-
     const blockStatements = this.visit(ctx.blockStatements);
 
+    const statements = ctx.blockStatements?.[0].children.blockStatement;
+    const hasSingleStatementBlock =
+      statements?.length === 1 &&
+      statements[0].children.statement?.[0].children
+        .statementWithoutTrailingSubstatement?.[0].children.block !== undefined;
+
     return concat([
       switchLabel,
       ctx.Colon[0],
-      blockStatements && indent([hardline, blockStatements])
+      hasSingleStatementBlock
+        ? concat([" ", blockStatements])
+        : blockStatements && indent([hardline, blockStatements])
     ]);
   }
 

diff --git a/packages/prettier-plugin-java/test/unit-test/switch/_input.java b/packages/prettier-plugin-java/test/unit-test/switch/_input.java
@@ -48,6 +48,16 @@ public String shouldWrapEvenForSmallSwitchCases() {
     switch (answer) { case "YES": return "YES"; default: return "NO"; }
   }
 
+  void switchCaseWithBlock() {
+    switch (a) {
+      case 1: {}
+      case 2: { b(); }
+      case 3: { c(); } { d(); }
+      case 4: e(); { f(); }
+      case 5: { g(); } h();
+    }
+  }
+
   // Switch rules
   static void howManyAgain(int k) {
         switch (k) {

diff --git a/packages/prettier-plugin-java/test/unit-test/switch/_output.java b/packages/prettier-plugin-java/test/unit-test/switch/_output.java
@@ -53,6 +53,32 @@ public String shouldWrapEvenForSmallSwitchCases() {
     }
   }
 
+  void switchCaseWithBlock() {
+    switch (a) {
+      case 1: {}
+      case 2: {
+        b();
+      }
+      case 3:
+        {
+          c();
+        }
+        {
+          d();
+        }
+      case 4:
+        e();
+        {
+          f();
+        }
+      case 5:
+        {
+          g();
+        }
+        h();
+    }
+  }
+
   // Switch rules
   static void howManyAgain(int k) {
     switch (k) {