Don't crash on type annotated varargs parameters

Fixes #95 MOE_MIGRATED_REVID=139810602
google · Nov 21, 2016 · ba12d25 · ba12d25
1 parent 3c3dcae
commit ba12d25
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
@@ -2307,13 +2307,22 @@ private void visitToDeclare(
       Optional<String> trailing) {
     sync(node);
     boolean varargs = (((JCTree.JCVariableDecl) node).mods.flags & Flags.VARARGS) == Flags.VARARGS;
+    List<? extends AnnotationTree> varargsAnnotations = ImmutableList.of();
+    Tree type = node.getType();
+    if (varargs) {
+      if (type instanceof AnnotatedTypeTree) {
+        varargsAnnotations = ((AnnotatedTypeTree) type).getAnnotations();
+        type = ((AnnotatedTypeTree) type).getUnderlyingType();
+      }
+      type = ((ArrayTypeTree) type).getType();
+    }
     declareOne(
         kind,
         annotationsDirection,
         Optional.of(node.getModifiers()),
-        varargs ? ((ArrayTypeTree) node.getType()).getType() : node.getType(),
+        type,
         VarArgsOrNot.valueOf(varargs),
-        /*varargsAnnotations=*/ ImmutableList.<AnnotationTree>of(),
+        varargsAnnotations,
         node.getName(),
         "",
         equals,
@@ -2956,7 +2965,7 @@ int declareOne(
       Optional<ModifiersTree> modifiers,
       Tree type,
       VarArgsOrNot isVarargs,
-      List<AnnotationTree> varargsAnnotations,
+      List<? extends AnnotationTree> varargsAnnotations,
       Name name,
       String op,
       String equals,

diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/i95.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/i95.input
@@ -0,0 +1,3 @@
+class I95 {
+  public void format2(Object @Nullable ... a2) {}
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/i95.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/i95.output
@@ -0,0 +1,3 @@
+class I95 {
+  public void format2(Object @Nullable ... a2) {}
+}