Improve empty declaration handling

cushon · cushon · commit 61c8c9b0efbb · 2016-02-19T16:51:52.000-08:00
Ten empty declarations should be enough for anyone, but I forgot lookahead was supported when I did 8a25d00 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=115090341
diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
@@ -339,8 +339,6 @@ private static final ImmutableList<Op> forceBreakList(Optional<BreakTag> breakTa
   private static final int MAX_FILLED_INFIX_LINES = 1;
   private static final int MAX_LINES_FOR_FORMAL_LIST = 1;
 
-  private static final int MAX_EMPTY_DECLS = 10;
-
   /**
    * The {@code Visitor} constructor.
    * @param builder the {@link OpsBuilder}
@@ -412,10 +410,10 @@ public boolean visit(CompilationUnit node) {
     return false;
   }
 
-  /** Skips over extra semi-colon at the top-level, or in a class member declaration lists. */
+  /** Skips over extra semi-colons at the top-level, or in a class member declaration lists. */
   private void dropEmptyDeclarations() {
-    for (int times = 0; times < MAX_EMPTY_DECLS; times++) {
-      builder.guessToken(";");
+    while (builder.peekToken().equals(Optional.of(";"))) {
+      token(";");
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -339,8 +339,6 @@ private static final ImmutableList<Op> forceBreakList(Optional<BreakTag> breakTa`
`339`	`339`	`private static final int MAX_FILLED_INFIX_LINES = 1;`
`340`	`340`	`private static final int MAX_LINES_FOR_FORMAL_LIST = 1;`
`341`	`341`
`342`		`- private static final int MAX_EMPTY_DECLS = 10;`
`343`		`-`
`344`	`342`	`/**`
`345`	`343`	`* The {@code Visitor} constructor.`
`346`	`344`	`* @param builder the {@link OpsBuilder}`
`@@ -412,10 +410,10 @@ public boolean visit(CompilationUnit node) {`
`412`	`410`	`return false;`
`413`	`411`	`}`
`414`	`412`
`415`		`- /** Skips over extra semi-colon at the top-level, or in a class member declaration lists. */`
	`413`	`+ /** Skips over extra semi-colons at the top-level, or in a class member declaration lists. */`
`416`	`414`	`private void dropEmptyDeclarations() {`
`417`		`- for (int times = 0; times < MAX_EMPTY_DECLS; times++) {`
`418`		`- builder.guessToken(";");`
	`415`	`+ while (builder.peekToken().equals(Optional.of(";"))) {`
	`416`	`+ token(";");`
`419`	`417`	`}`
`420`	`418`	`}`
`421`	`419`