Skip to content

Commit f74657c

Browse files
committed
Be agnostic order of 'requires' and 'transitive'
modifiers on requires directives. See #75 MOE_MIGRATED_REVID=166152386
1 parent c31bb19 commit f74657c

File tree

3 files changed

+22
-7
lines changed

3 files changed

+22
-7
lines changed

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

+10-7
Original file line numberDiff line numberDiff line change
@@ -2403,13 +2403,16 @@ public Void visitProvides(ProvidesTree node, Void unused) {
24032403
public Void visitRequires(RequiresTree node, Void unused) {
24042404
token("requires");
24052405
builder.space();
2406-
if (builder.peekToken().equals(Optional.of("static"))) {
2407-
token("static");
2408-
builder.space();
2409-
}
2410-
if (builder.peekToken().equals(Optional.of("transitive"))) {
2411-
token("transitive");
2412-
builder.space();
2406+
while (true) {
2407+
if (builder.peekToken().equals(Optional.of("static"))) {
2408+
token("static");
2409+
builder.space();
2410+
} else if (builder.peekToken().equals(Optional.of("transitive"))) {
2411+
token("transitive");
2412+
builder.space();
2413+
} else {
2414+
break;
2415+
}
24132416
}
24142417
scan(node.getModuleName(), null);
24152418
token(";");
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
@Deprecated
2+
module moduletags {
3+
requires transitive static moduleA;
4+
5+
exports testpkgmdltags;
6+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
@Deprecated
2+
module moduletags {
3+
requires transitive static moduleA;
4+
5+
exports testpkgmdltags;
6+
}

0 commit comments

Comments
 (0)