commit f74657cbbe11c51f8b2b4810daa7c84ca6c6a552
author cushon <cushon@google.com> Tue Aug 22 20:31:57 2017 -0700
committer Liam Miller-Cushon <cushon@google.com> Wed Aug 23 09:21:50 2017 -0700
tree 86f7111aa1bcd65b7b1fe70e2c8faeeaac199ae5
parent c31bb191022d549eb612d02129f6fbb70e9d55fe

Be agnostic order of 'requires' and 'transitive'

modifiers on requires directives.

See #75

MOE_MIGRATED_REVID=166152386

core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java

diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
index e10368f..58995e0 100644
--- 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 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(";");

core/src/test/resources/com/google/googlejavaformat/java/testdata/M3.input

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
new file mode 100644
index 0000000..c5d2966
--- /dev/null
+++ 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;
+}
\ No newline at end of file

core/src/test/resources/com/google/googlejavaformat/java/testdata/M3.output

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
new file mode 100644
index 0000000..563ef46
--- /dev/null
+++ 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;
+}