Parser does not handle annotated varargs correctly

rewrite-java-17/src/main/java/org/openrewrite/java/isolated/ReloadableJava17ParserVisitor.java

@@ -1298,7 +1298,11 @@ public J visitAnnotatedType(AnnotatedTypeTree node, Space fmt) {
             if (node.getUnderlyingType() instanceof JCFieldAccess) {
                 return new J.AnnotatedType(randomId(), fmt, Markers.EMPTY, leadingAnnotations, annotatedTypeTree(node.getUnderlyingType(), annotationPosTable));
             } else if (node.getUnderlyingType() instanceof JCArrayTypeTree) {
-                return new J.AnnotatedType(randomId(), fmt, Markers.EMPTY, leadingAnnotations, arrayTypeTree(node, annotationPosTable));
+                J.AnnotatedType annotatedType = new J.AnnotatedType(randomId(), fmt, Markers.EMPTY, leadingAnnotations, arrayTypeTree(node, annotationPosTable));
+                if (((JCArrayTypeTree) node.getUnderlyingType()).getType() instanceof JCAnnotatedType) {
+                    visitAnnotatedType((AnnotatedTypeTree) ((JCArrayTypeTree) node.getUnderlyingType()).getType(), fmt);
+                }
+                return annotatedType;
             }
         }
         return new J.AnnotatedType(randomId(), fmt, Markers.EMPTY, leadingAnnotations, convert(node.getUnderlyingType()));

rewrite-java-test/src/test/java/org/openrewrite/java/JavaParserTest.java

@@ -214,4 +214,71 @@ class A {
           )
         );
     }
+
+    @Test
+    @Issue("https://github.com/openrewrite/rewrite/issues/3881")
+    void annotatedVargArgs() {
+        rewriteRun(
+          java(
+            """
+              import org.jspecify.annotations.NonNull;
+
+              class C1 {
+                  void m(@NonNull String @NonNull[] arrayArgs) {
+                  }
+              }
+              """
+          ),
+          java(
+            """
+              import org.jspecify.annotations.NonNull;
+
+              class C2 {
+                  void m(@NonNull String @NonNull ... varArgs) {
+                  }
+              }
+              """
+          ),
+          java(
+            """
+              import org.jspecify.annotations.NonNull;
+
+              class C3 {
+                  void m(String @NonNull[] @NonNull[] arrayArgs) {
+                  }
+              }
+              """
+          ),
+          java(
+            """
+              import org.jspecify.annotations.NonNull;
+
+              class C4 {
+                  void m(String @NonNull [ ] @NonNull ... s) {
+                  }
+              }
+              """
+          ),
+          java(
+            """
+              import org.jspecify.annotations.NonNull;
+
+              class C5 {
+                  void m(@NonNull String @NonNull[] @NonNull[] arrayArgs) {
+                  }
+              }
+              """
+          ),
+          java(
+            """
+              import org.jspecify.annotations.NonNull;
+
+              class C6 {
+                  void m(@NonNull String @NonNull [ ] @NonNull ... s) {
+                  }
+              }
+              """
+          )
+        );
+    }
 }

rewrite-java/src/main/java/org/openrewrite/java/JavaPrinter.java

@@ -428,8 +428,8 @@ protected void printStatementTerminator(Statement s, PrintOutputCapture<P> p) {
                         getCursor()
                                 .dropParentUntil(
                                         c -> c instanceof Switch ||
-                                                c instanceof SwitchExpression ||
-                                                c == Cursor.ROOT_VALUE
+                                             c instanceof SwitchExpression ||
+                                             c == Cursor.ROOT_VALUE
                                 )
                                 .getValue();
                 if (aSwitch instanceof SwitchExpression) {
@@ -848,6 +848,21 @@ public J visitVariableDeclarations(VariableDeclarations multiVariable, PrintOutp
             p.append(']');
         }
         if (multiVariable.getVarargs() != null) {
+            if (!(multiVariable.getTypeExpression() instanceof ArrayType)) {
+                // The `visit(multiVariable.getTypeExpression(), p);` statement above does not know the
+                // enclosing VariableDeclarations is a vararg therefore we have to remove unnecessary dimensions here
+                if (p.out.charAt(p.out.length() - 1) == ']') {
+                    int posToCheck = p.out.length() - 2;
+                    while (p.out.charAt(posToCheck) != '[') {
+                        if (Character.isWhitespace(p.out.charAt(posToCheck))) {
+                            posToCheck--;
+                        } else {
+                            throw new IllegalStateException("Vararg was interpreted with non empty dimensions");
+                        }
+                    }
+                    p.out.delete(posToCheck, p.out.length());
+                }
+            }
             visitSpace(multiVariable.getVarargs(), Space.Location.VARARGS, p);
             p.append("...");
         }