fix: annotations following type arguments

Author: amaanq

grammar.js

@@ -383,8 +383,14 @@ module.exports = grammar({
 
     _unqualified_object_creation_expression: $ => prec.right(seq(
       'new',
-      repeat($._annotation),
-      field('type_arguments', optional($.type_arguments)),
+      choice(
+        seq(
+          repeat($._annotation),
+          field('type_arguments', $.type_arguments),
+          repeat($._annotation),
+        ),
+        repeat($._annotation),
+      ),
       field('type', $._simple_type),
       field('arguments', $.argument_list),
       optional($.class_body)

test/corpus/declarations.txt

@@ -1158,3 +1158,41 @@ void main() {
     (identifier)
     (formal_parameters)
     (block)))
+
+================================================================================
+Annotation following type arguments
+================================================================================
+
+public class A {
+  public B() {
+    return new <@BG Inner> @BH Inner<@BI Inner>(null);
+  }
+}
+
+---
+
+(program
+  (class_declaration
+    (modifiers)
+    (identifier)
+    (class_body
+      (constructor_declaration
+        (modifiers)
+        (identifier)
+        (formal_parameters)
+        (constructor_body
+          (return_statement
+            (object_creation_expression
+              (type_arguments
+                (annotated_type
+                  (marker_annotation (identifier))
+                  (type_identifier)))
+              (marker_annotation (identifier))
+              (generic_type
+                (type_identifier)
+                (type_arguments
+                  (annotated_type
+                    (marker_annotation (identifier))
+                    (type_identifier))))
+              (argument_list
+                (null_literal)))))))))