Tolerate extra semi-colons in import lists

even if they're own their own line (which g-j-f does if it runs with import cleanup disabled). PiperOrigin-RevId: 337192414

Author: cushon

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

@@ -346,6 +346,10 @@ private ImportsAndIndex scanImports(int i) throws FormatterException {
  i++;
  }
  }
+ while (tokenAt(i).equals(";")) {
+ // Extra semicolons are not allowed by the JLS but are accepted by javac.
+ i++;
+ }
  imports.add(new Import(importedName, trailing.toString(), isStatic));
  // Remember the position just after the import we just saw, before skipping blank lines.
  // If the next thing after the blank lines is not another import then we don't want to

core/src/test/java/com/google/googlejavaformat/java/ImportOrdererTest.java

@@ -800,6 +800,27 @@ public static Collection<Object[]> parameters() {
  "public class Blim {}",
  },
  },
+ {
+ {
+ "package p;",
+ "",
+ "import java.lang.Bar;",
+ "import java.lang.Baz;",
+ ";",
+ "import java.lang.Foo;",
+ "",
+ "interface Test {}",
+ },
+ {
+ "package p;",
+ "",
+ "import java.lang.Bar;",
+ "import java.lang.Baz;",
+ "import java.lang.Foo;",
+ "",
+ "interface Test {}",
+ }
+ }
  };
  ImmutableList.Builder<Object[]> builder = ImmutableList.builder();
  Arrays.stream(inputsOutputs).forEach(input -> builder.add(createRow(input)));