Handle type annotations on array creation expressions with initializers

cushon · cushon · commit ca17cb5bcfb7 · 2016-11-23T17:47:36.000-08:00
Fixes google#100 MOE_MIGRATED_REVID=140082878
diff --git a/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/core/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java
@@ -426,6 +426,7 @@ public Void visitNewArray(NewArrayTree node, Void unused) {
       Deque<ExpressionTree> dimExpressions = new ArrayDeque<>(node.getDimensions());
 
       Deque<List<AnnotationTree>> annotations = new ArrayDeque<>();
+      annotations.add(ImmutableList.copyOf(node.getAnnotations()));
       annotations.addAll((List<List<AnnotationTree>>) node.getDimAnnotations());
       annotations.addAll(extractedDims.dims);
 
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/i100.input b/core/src/test/resources/com/google/googlejavaformat/java/testdata/i100.input
@@ -0,0 +1,7 @@
+public class I100 {
+  void f() {
+    Object o;
+    o = new String @A [] {"foo", "bar"};
+    o = new String @A @B [] @C [] {"foo", "bar"};
+  }
+}
diff --git a/core/src/test/resources/com/google/googlejavaformat/java/testdata/i100.output b/core/src/test/resources/com/google/googlejavaformat/java/testdata/i100.output
@@ -0,0 +1,7 @@
+public class I100 {
+  void f() {
+    Object o;
+    o = new String @A [] {"foo", "bar"};
+    o = new String @A @B [] @C [] {"foo", "bar"};
+  }
+}
