Fix: Properly format switch expressions (#1069)

Properly format switch expressions
palantir · Apr 5, 2024 · 1f52b40 · 1f52b40
1 parent b1db678
commit 1f52b40
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 0 deletions.
diff --git a/changelog/@unreleased/pr-1069.v2.yml b/changelog/@unreleased/pr-1069.v2.yml
@@ -0,0 +1,5 @@
+type: fix
+fix:
+  description: Properly format switch expressions
+  links:
+  - https://github.com/palantir/palantir-java-format/pull/1069
diff --git a/...e-palantir-java-format/src/test/groovy/com/palantir/javaformat/gradle/FormatDiffTest.java b/...e-palantir-java-format/src/test/groovy/com/palantir/javaformat/gradle/FormatDiffTest.java
@@ -63,6 +63,7 @@ void reformat_a_subpath_of_a_git_directory_for_only_changed_lines() throws IOExc
         runCommandInRepo("git", "init");
         runCommandInRepo("git", "config", "user.name", "Test User");
         runCommandInRepo("git", "config", "user.email", "test-user@palantir.com");
+        runCommandInRepo("git", "config", "commit.gpgsign", "false");
         runCommandInRepo("git", "commit", "--allow-empty", "-m", "Init");
 
         Path subdir = repo.resolve("subdir");

diff --git a/...-java-format/src/main/java/com/palantir/javaformat/java/java14/Java14InputAstVisitor.java b/...-java-format/src/main/java/com/palantir/javaformat/java/java14/Java14InputAstVisitor.java
@@ -303,6 +303,7 @@ public Void visitCase(CaseTree node, Void unused) {
                     scan(node.getBody(), null);
                 }
                 builder.guessToken(";");
+                builder.forcedBreak(minusTwo);
                 break;
             default:
                 throw new IllegalArgumentException(node.getCaseKind().name());

diff --git a/...va-format/src/test/resources/com/palantir/javaformat/java/testdata/ExpressionSwitch.input b/...va-format/src/test/resources/com/palantir/javaformat/java/testdata/ExpressionSwitch.input
@@ -41,4 +41,21 @@ class ExpressionSwitch {
       default -> false;
     };
   }
+
+  public void test1(int y) {
+      int x =
+              switch (y) {
+                  case 1 -> 1;
+                  case 2 -> throw new IllegalArgumentException();
+                  default -> throw new IllegalStateException();
+              };
+  }
+
+  public void test2(int y) {
+      int x;
+      x = switch (y) {
+          case 1 -> 1;
+          case 2 -> throw new IllegalArgumentException();
+          default -> throw new IllegalStateException();};
+  }
 }
diff --git a/...a-format/src/test/resources/com/palantir/javaformat/java/testdata/ExpressionSwitch.output b/...a-format/src/test/resources/com/palantir/javaformat/java/testdata/ExpressionSwitch.output
@@ -47,4 +47,22 @@ class ExpressionSwitch {
             default -> false;
         };
     }
+
+    public void test1(int y) {
+        int x =
+                switch (y) {
+                    case 1 -> 1;
+                    case 2 -> throw new IllegalArgumentException();
+                    default -> throw new IllegalStateException();
+                };
+    }
+
+    public void test2(int y) {
+        int x;
+        x = switch (y) {
+            case 1 -> 1;
+            case 2 -> throw new IllegalArgumentException();
+            default -> throw new IllegalStateException();
+        };
+    }
 }