feiteng
diff --git a/‎core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java‎
Lines changed: 13 additions & 0 deletions b/‎core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎core/src/test/resources/com/google/googlejavaformat/java/testdata/B21647014.input‎
Lines changed: 15 additions & 0 deletions b/‎core/src/test/resources/com/google/googlejavaformat/java/testdata/B21647014.input‎
Lines changed: 15 additions & 0 deletions
diff --git a/‎core/src/test/resources/com/google/googlejavaformat/java/testdata/B21647014.output‎
Lines changed: 13 additions & 0 deletions b/‎core/src/test/resources/com/google/googlejavaformat/java/testdata/B21647014.output‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎idea_plugin/src/main/scripts/install-idea-jars.sh‎
100755100644 b/‎idea_plugin/src/main/scripts/install-idea-jars.sh‎
100755100644
diff --git a/‎scripts/google-java-format-diff.py‎
100755100644 b/‎scripts/google-java-format-diff.py‎
100755100644
@@ -329,6 +329,8 @@ 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}
@@ -388,16 +390,25 @@ public boolean visit(CompilationUnit node) {
       if (!first) {
         builder.blankLineWanted(BlankLineWanted.YES);
       }
+      dropEmptyDeclarations();
       markForPartialFormat();
       type.accept(this);
       builder.forcedBreak();
       first = false;
     }
+    dropEmptyDeclarations();
     // set a partial format marker at EOF to make sure we can format the entire file
     markForPartialFormat();
     return false;
   }
 
+  /** Skips over extra semi-colon 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(";");
+    }
+  }
+
   /** Visitor method for {@link AnnotationTypeDeclaration}s. */
   @Override
   public boolean visit(AnnotationTypeDeclaration node) {
@@ -3166,6 +3177,7 @@ void addBodyDeclarations(
       boolean first = first0.isYes();
       boolean lastOneGotBlankLineBefore = false;
       for (BodyDeclaration bodyDeclaration : bodyDeclarations) {
+        dropEmptyDeclarations();
         builder.forcedBreak();
         boolean thisOneGetsBlankLineBefore =
             bodyDeclaration.getNodeType() != ASTNode.FIELD_DECLARATION
@@ -3184,6 +3196,7 @@ void addBodyDeclarations(
       builder.forcedBreak();
       markForPartialFormat();
       if (braces.isYes()) {
+        dropEmptyDeclarations();
         builder.blankLineWanted(BlankLineWanted.NO);
         token("}", plusTwo);
         builder.close();
 
@@ -0,0 +1,15 @@
+package test;
+
+import java.util.List;;
+
+;
+class Test {
+  ;
+  public int x = 42;;
+  ;;;
+  {
+    int x = 1;;;
+  }
+  ;
+}
+;
@@ -0,0 +1,13 @@
+package test;
+
+import java.util.List;
+
+;;class Test {;
+  public int x = 42;;;;;
+
+  {
+    int x = 1;
+    ;
+    ;
+  };
+};