@@ -2542,18 +2542,20 @@ private void visitToDeclare(
       String equals,
       Optional<String> trailing) {
     sync(node);
+    TypeWithDims extractedDims = DimensionHelpers.extractDims(node.getType(), SortedDims.YES);
+    Optional<TypeWithDims> typeWithDims = Optional.of(extractedDims);
     declareOne(
         kind,
         annotationsDirection,
         Optional.of(node.getModifiers()),
-        node.getType(),
+        extractedDims.node,
         node.getName(),
         "",
         equals,
         initializer,
         trailing,
         /* receiverExpression= */ Optional.empty(),
-        /* typeWithDims= */ Optional.empty());
+        typeWithDims);
   }
 
   /** Does not omit the leading '<', which should be associated with the type name. */
 
@@ -0,0 +1,9 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface MyTypeAnno {}
+
+public class GjfFailure {
+  void m(int a @MyTypeAnno []) {}
+}
@@ -0,0 +1,9 @@
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+@Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})
+@interface MyTypeAnno {}
+
+public class GjfFailure {
+  void m(int a @MyTypeAnno []) {}
+}