Handle modifiers that start with non-

cushon · google-java-format Team · commit 621fb85a8de8 · 2022-01-24T08:15:07.000-08:00
Fixes google#696 PiperOrigin-RevId: 423819018
diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
@@ -2294,7 +2294,7 @@ private ImmutableList<AnnotationTree> visitModifiers(
                 ? forceBreakList(declarationAnnotationBreak)
                 : breakList(declarationAnnotationBreak));
       }
-      formatAnnotationOrModifier(declarationModifiers.removeFirst());
+      formatAnnotationOrModifier(declarationModifiers);
       first = false;
       lastWasAnnotation = true;
     }
@@ -2317,7 +2317,7 @@ private ImmutableList<AnnotationTree> visitModifiers(
       if (!first) {
         builder.addAll(breakFillList(Optional.empty()));
       }
-      formatAnnotationOrModifier(declarationModifiers.removeFirst());
+      formatAnnotationOrModifier(declarationModifiers);
       first = false;
     }
     builder.close();
@@ -2452,10 +2452,15 @@ DeclarationModifiersAndTypeAnnotations splitModifiers(
         modifiers.subList(0, idx + 1), typeAnnotations.build().reverse());
   }
 
-  private void formatAnnotationOrModifier(AnnotationOrModifier modifier) {
+  private void formatAnnotationOrModifier(Deque<AnnotationOrModifier> modifiers) {
+    AnnotationOrModifier modifier = modifiers.removeFirst();
     switch (modifier.getKind()) {
       case MODIFIER:
         token(modifier.modifier().getText());
+        if (modifier.modifier().getText().equals("non")) {
+          token(modifiers.removeFirst().modifier().getText());
+          token(modifiers.removeFirst().modifier().getText());
+        }
         break;
       case ANNOTATION:
         scan(modifier.annotation(), null);
@@ -2471,10 +2476,6 @@ boolean isTypeAnnotation(AnnotationTree annotationTree) {
     return typeAnnotationSimpleNames.contains(((IdentifierTree) annotationType).getName());
   }
 
-  boolean nextIsModifier() {
-    return isModifier(builder.peekToken().get());
-  }
-
   private static boolean isModifier(String token) {
     switch (token) {
       case "public":
@@ -2490,7 +2491,8 @@ private static boolean isModifier(String token) {
       case "strictfp":
       case "default":
       case "sealed":
-      case "non-sealed":
+      case "non":
+      case "-":
         return true;
       default:
         return false;
diff --git a/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java b/core/src/test/java/com/google/googlejavaformat/java/FormatterIntegrationTest.java
@@ -51,7 +51,7 @@ public class FormatterIntegrationTest {
           .putAll(14, "I477", "Records", "RSLs", "Var", "ExpressionSwitch", "I574", "I594")
           .putAll(15, "I603")
           .putAll(16, "I588")
-          .putAll(17, "I683", "I684")
+          .putAll(17, "I683", "I684", "I696")
           .build();
 
   @Parameters(name = "{index}: {0}")
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I696.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I696.input
@@ -0,0 +1,11 @@
+public abstract non-sealed class A extends SealedClass {
+}
+
+non-sealed class B extends SealedClass {
+}
+
+non-sealed @A class B extends SealedClass {
+}
+
+@A non-sealed class B extends SealedClass {
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/I696.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/I696.output
@@ -0,0 +1,8 @@
+public abstract non-sealed class A extends SealedClass {}
+
+non-sealed class B extends SealedClass {}
+
+non-sealed @A class B extends SealedClass {}
+
+@A
+non-sealed class B extends SealedClass {}
