Fix indentation of case statements on JDK 17

Fixes #643 PiperOrigin-RevId: 392966720
google · Aug 25, 2021 · 79257ed · 79257ed
1 parent 865cff0
commit 79257ed
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 1 deletion.
diff --git a/core/src/main/java/com/google/googlejavaformat/java/java14/Java14InputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/java14/Java14InputAstVisitor.java
@@ -251,7 +251,7 @@ public Void visitCase(CaseTree node, Void unused) {
       token("default", plusTwo);
     } else {
       token("case", plusTwo);
-      builder.open(plusFour);
+      builder.open(node.getExpressions().size() > 1 ? plusFour : ZERO);
       builder.space();
       boolean first = true;
       for (ExpressionTree expression : node.getExpressions()) {

diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I643.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I643.input
@@ -0,0 +1,14 @@
+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;
+
+    public static int fn(int x) {
+        switch (x) {
+        case VERBOSE_WORDY_AND_LENGTHY_ONE | VERBOSE_WORDY_AND_LENGTHY_TWO | VERBOSE_WORDY_AND_LENGTHY_FOUR:
+            return 0;
+        default:
+            return 1;
+        }
+    }
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I643.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I643.output
@@ -0,0 +1,16 @@
+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;
+
+  public static int fn(int x) {
+    switch (x) {
+      case VERBOSE_WORDY_AND_LENGTHY_ONE
+          | VERBOSE_WORDY_AND_LENGTHY_TWO
+          | VERBOSE_WORDY_AND_LENGTHY_FOUR:
+        return 0;
+      default:
+        return 1;
+    }
+  }
+}