Adjust line comment indentation inside statement switches

Follow-up to 3affd63 Fixes #876 PiperOrigin-RevId: 644190687
google · Jun 18, 2024 · f7543b2 · f7543b2
1 parent 3affd63
commit f7543b2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/core/src/main/java/com/google/googlejavaformat/java/java17/Java17InputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/java17/Java17InputAstVisitor.java
@@ -19,7 +19,6 @@
 
 import com.google.common.base.Verify;
 import com.google.common.collect.ImmutableList;
-import com.google.googlejavaformat.Indent;
 import com.google.googlejavaformat.OpsBuilder;
 import com.google.googlejavaformat.OpsBuilder.BlankLineWanted;
 import com.google.googlejavaformat.java.JavaInputAstVisitor;
@@ -233,11 +232,10 @@ public Void visitCase(CaseTree node, Void unused) {
                 && !node.getBody().getKind().equals(Tree.Kind.BLOCK)
             ? plusFour
             : ZERO);
-    Indent commentIndent = node.getCaseKind().equals(CaseTree.CaseKind.RULE) ? ZERO : plusTwo;
     if (isDefault) {
-      token("default", commentIndent);
+      token("default", ZERO);
     } else {
-      token("case", commentIndent);
+      token("case", ZERO);
       builder.open(labels.size() > 1 ? plusFour : ZERO);
       builder.space();
       boolean afterFirstToken = false;

diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/SwitchComment.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/SwitchComment.output
@@ -16,7 +16,7 @@ class T {
   void g(String v) {
     int x =
         switch (v) {
-            // this is a line comment about "zero"
+          // this is a line comment about "zero"
           case "zero":
             return 0;
           case "one":