Merge pull request #440 from clementdessoude/fix/space-before-comma-m…

…ultiple-value-switch fix: space before comma in multi-value switch expression case label
jhipster · Nov 27, 2020 · d2f8f14 · d2f8f14
2 parents 0980a79 + 9bf0bfc
commit d2f8f14
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 6 deletions.
diff --git a/packages/prettier-plugin-java/src/printers/blocks-and-statements.js b/packages/prettier-plugin-java/src/printers/blocks-and-statements.js
@@ -229,10 +229,21 @@ class BlocksAndStatementPrettierVisitor {
   switchLabel(ctx) {
     if (ctx.Case) {
       const caseConstants = this.mapVisit(ctx.caseConstant);
-      return rejectAndConcat([
-        concat([ctx.Case[0], " "]),
-        rejectAndJoin(" ,", caseConstants)
-      ]);
+
+      const commas = ctx.Comma
+        ? ctx.Comma.map(elt => {
+            return concat([elt, line]);
+          })
+        : [];
+
+      return group(
+        indent(
+          rejectAndConcat([
+            concat([ctx.Case[0], " "]),
+            rejectAndJoinSeps(commas, caseConstants)
+          ])
+        )
+      );
     }
 
     return concat([ctx.Default[0]]);

diff --git a/packages/prettier-plugin-java/test/unit-test/switch/_input.java b/packages/prettier-plugin-java/test/unit-test/switch/_input.java
@@ -75,4 +75,22 @@ public Location getAdjacentLocation(Direction direction) {
         return this;
     }
   }
+
+  public void multipleCaseConstants(TestEnum testEnum) {
+    switch (testEnum) {
+      case FOO -> System.out.println("Foo!");
+        case BAR, BAZ -> System.out.println("Not Foo!");
+      case BAR, BAZ, BAZ, BAZ, BAZ, BAZ, BAZ, BAZ, BAZ, BAZ, BAZ, BAZ, BAZ, BAZ, BAZ, BAZ, BAZ, BAZ, BAZ, BAZ -> System.out.println("Not Foo!");
+
+    }
+  }
+
+  public void caseConstantsWithComments(TestEnum testEnum) {
+    switch (testEnum) {
+        case BAR /* foo */, BAZ -> System.out.println("Not Foo!");
+        case BAR /* foo */, /* bar */ BAZ -> System.out.println("Not Foo!");
+        case BAR, /* bar */ BAZ -> System.out.println("Not Foo!");
+
+    }
+  }
 }
diff --git a/packages/prettier-plugin-java/test/unit-test/switch/_output.java b/packages/prettier-plugin-java/test/unit-test/switch/_output.java
@@ -81,4 +81,39 @@ public Location getAdjacentLocation(Direction direction) {
         return this;
     }
   }
+
+  public void multipleCaseConstants(TestEnum testEnum) {
+    switch (testEnum) {
+      case FOO -> System.out.println("Foo!");
+      case BAR, BAZ -> System.out.println("Not Foo!");
+      case BAR,
+        BAZ,
+        BAZ,
+        BAZ,
+        BAZ,
+        BAZ,
+        BAZ,
+        BAZ,
+        BAZ,
+        BAZ,
+        BAZ,
+        BAZ,
+        BAZ,
+        BAZ,
+        BAZ,
+        BAZ,
+        BAZ,
+        BAZ,
+        BAZ,
+        BAZ -> System.out.println("Not Foo!");
+    }
+  }
+
+  public void caseConstantsWithComments(TestEnum testEnum) {
+    switch (testEnum) {
+      case BAR/* foo */, BAZ -> System.out.println("Not Foo!");
+      case BAR/* foo */, /* bar */BAZ -> System.out.println("Not Foo!");
+      case BAR, /* bar */BAZ -> System.out.println("Not Foo!");
+    }
+  }
 }
diff --git a/packages/prettier-plugin-java/test/unit-test/yield-statement/_output.java b/packages/prettier-plugin-java/test/unit-test/yield-statement/_output.java
@@ -12,7 +12,7 @@ enum Day {
 
   public int calculate(Day d) {
     switch (d) {
-      case SATURDAY ,SUNDAY -> d.ordinal();
+      case SATURDAY, SUNDAY -> d.ordinal();
       default -> {
         int len = d.toString().length();
         yield len * len;
@@ -23,7 +23,7 @@ public int calculate(Day d) {
 
   public int calculate(Day d) {
     return switch (d) {
-      case SATURDAY ,SUNDAY -> d.ordinal();
+      case SATURDAY, SUNDAY -> d.ordinal();
       default -> {
         int len = d.toString().length();
         yield len * len;