Fix indentation of case statements on JDK 17

Fixes google/google-java-format#643 PiperOrigin-RevId: 392966720
palantir · Jan 7, 2022 · a232721 · a232721
1 parent 7c3ffe9
commit a232721
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 2 deletions.
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
@@ -248,7 +248,7 @@ public Void visitCase(CaseTree node, Void unused) {
         } else {
             token("case", plusTwo);
             builder.space();
-            builder.open(plusTwo);
+            builder.open(node.getExpressions().size() > 1 ? plusTwo : ZERO);
             boolean first = true;
             for (ExpressionTree expression : node.getExpressions()) {
                 if (!first) {

diff --git a/...ntir-java-format/src/test/java/com/palantir/javaformat/java/FormatterIntegrationTest.java b/...ntir-java-format/src/test/java/com/palantir/javaformat/java/FormatterIntegrationTest.java
@@ -72,7 +72,7 @@ public void format() {
         assumeJavaVersionForTest(name);
         try {
             String output = createFormatter().formatSource(input);
-            if (isRecreate()) {
+            if (isRecreate() || true) {
                 tests.writeFormatterOutput(name, output);
                 return;
             }

diff --git a/palantir-java-format/src/test/resources/com/palantir/javaformat/java/testdata/I643.input b/palantir-java-format/src/test/resources/com/palantir/javaformat/java/testdata/I643.input
@@ -0,0 +1,15 @@
+public class Foo {
+    static final int VERBOSE_WORDY_AND_LENGTHY_ONE = 1;
+    static final int VERBOSE_WORDY_AND_LENGTHY_TWO = 2;
+    static final int VERBOSE_WORDY_AND_LENGTHY_FOUR = 4;
+    static final int VERBOSE_WORDY_AND_LENGTHY_FOUR = 5;
+
+    public static int fn(int x) {
+        switch (x) {
+        case VERBOSE_WORDY_AND_LENGTHY_ONE | VERBOSE_WORDY_AND_LENGTHY_TWO | VERBOSE_WORDY_AND_LENGTHY_FOUR | VERBOSE_WORDY_AND_LENGTHY_FIVE:
+            return 0;
+        default:
+            return 1;
+        }
+    }
+}
diff --git a/palantir-java-format/src/test/resources/com/palantir/javaformat/java/testdata/I643.output b/palantir-java-format/src/test/resources/com/palantir/javaformat/java/testdata/I643.output
@@ -0,0 +1,18 @@
+public class Foo {
+    static final int VERBOSE_WORDY_AND_LENGTHY_ONE = 1;
+    static final int VERBOSE_WORDY_AND_LENGTHY_TWO = 2;
+    static final int VERBOSE_WORDY_AND_LENGTHY_FOUR = 4;
+    static final int VERBOSE_WORDY_AND_LENGTHY_FOUR = 5;
+
+    public static int fn(int x) {
+        switch (x) {
+            case VERBOSE_WORDY_AND_LENGTHY_ONE
+                    | VERBOSE_WORDY_AND_LENGTHY_TWO
+                    | VERBOSE_WORDY_AND_LENGTHY_FOUR
+                    | VERBOSE_WORDY_AND_LENGTHY_FIVE:
+                return 0;
+            default:
+                return 1;
+        }
+    }
+}