Fix handling of type-annotated varargs

ingop · cushon · commit 5174180befef · 2018-05-24T12:04:48.000-07:00
MOE_MIGRATED_REVID=197703737
diff --git a/core/src/main/java/com/google/googlejavaformat/OpsBuilder.java b/core/src/main/java/com/google/googlejavaformat/OpsBuilder.java
@@ -266,9 +266,15 @@ public final void close() {
 
   /** Return the text of the next {@link Input.Token}, or absent if there is none. */
   public final Optional<String> peekToken() {
+    return peekToken(0);
+  }
+
+  /** Return the text of an upcoming {@link Input.Token}, or absent if there is none. */
+  public final Optional<String> peekToken(int skip) {
     ImmutableList<? extends Input.Token> tokens = input.getTokens();
-    return tokenI < tokens.size()
-        ? Optional.of(tokens.get(tokenI).getTok().getOriginalText())
+    int idx = tokenI + skip;
+    return idx < tokens.size()
+        ? Optional.of(tokens.get(idx).getTok().getOriginalText())
         : Optional.absent();
   }
 
diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
@@ -3324,6 +3324,9 @@ private void maybeAddDims(
           lastWasAnnotation = false;
           break;
         case ".":
+          if (!builder.peekToken().get().equals(".") || !builder.peekToken(1).get().equals(".")) {
+            return;
+          }
           if (lastWasAnnotation) {
             builder.breakToFill(" ");
           } else {
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/i282.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/i282.input
@@ -6,4 +6,6 @@ public class ArrayVsVarargs {
   void i(String @B... arg) {}
   void j(String @C [] @D [] arg) {}
   void k(String @E [] @F... arg) {}
+
+  Class<?> c = byte[].class;
 }
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/i282.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/i282.output
@@ -11,4 +11,6 @@ public class ArrayVsVarargs {
   void j(String @C [] @D [] arg) {}
 
   void k(String @E [] @F ... arg) {}
+
+  Class<?> c = byte[].class;
 }

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,6 @@ public class ArrayVsVarargs {`
`6`	`6`	`void i(String @B... arg) {}`
`7`	`7`	`void j(String @C [] @D [] arg) {}`
`8`	`8`	`void k(String @E [] @F... arg) {}`
	`9`	`+`
	`10`	`+ Class<?> c = byte[].class;`
`9`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,6 @@ public class ArrayVsVarargs {`
`11`	`11`	`void j(String @C [] @D [] arg) {}`
`12`	`12`
`13`	`13`	`void k(String @E [] @F ... arg) {}`
	`14`	`+`
	`15`	`+ Class<?> c = byte[].class;`
`14`	`16`	`}`