Be agnostic order of 'requires' and 'transitive'

modifiers on requires directives. See #75 MOE_MIGRATED_REVID=166152386
google · Aug 23, 2017 · f74657c · f74657c
1 parent c31bb19
commit f74657c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
@@ -2403,13 +2403,16 @@ public Void visitProvides(ProvidesTree node, Void unused) {
   public Void visitRequires(RequiresTree node, Void unused) {
     token("requires");
     builder.space();
-    if (builder.peekToken().equals(Optional.of("static"))) {
-      token("static");
-      builder.space();
-    }
-    if (builder.peekToken().equals(Optional.of("transitive"))) {
-      token("transitive");
-      builder.space();
+    while (true) {
+      if (builder.peekToken().equals(Optional.of("static"))) {
+        token("static");
+        builder.space();
+      } else if (builder.peekToken().equals(Optional.of("transitive"))) {
+        token("transitive");
+        builder.space();
+      } else {
+        break;
+      }
     }
     scan(node.getModuleName(), null);
     token(";");

diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/M3.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/M3.input
@@ -0,0 +1,6 @@
+@Deprecated
+module moduletags {
+    requires transitive static moduleA;
+
+    exports testpkgmdltags;
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/M3.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/M3.output
@@ -0,0 +1,6 @@
+@Deprecated
+module moduletags {
+  requires transitive static moduleA;
+
+  exports testpkgmdltags;
+}