Support varargs

openrewrite · Dec 27, 2024 · ce70d77 · ce70d77
1 parent 362bb54
commit ce70d77
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java b/rewrite-groovy/src/main/java/org/openrewrite/groovy/GroovyParserVisitor.java
@@ -558,6 +558,23 @@ public void visitMethod(MethodNode method) {
                 } else {
                     paramType = visitTypeTree(param.getOriginType());
                 }
+
+                Space varargs = null;
+                if (paramType instanceof J.ArrayType) {
+                    // E.g. foo(String... x)
+                    if (source.startsWith("...", cursor - 3)) {
+                        varargs = format(source, cursor - 3, cursor - 3);
+                        paramType = ((J.ArrayType) paramType).withDimension(null);
+                    }
+                    // E.g. foo(String               ... x)
+                    else if (source.startsWith("...", indexOfNextNonWhitespace(cursor, source))) {
+                        int varargStart = indexOfNextNonWhitespace(cursor, source);
+                        varargs = format(source, cursor, varargStart);
+                        paramType = ((J.ArrayType) paramType).withDimension(null);
+                        cursor = varargStart + 3;
+                    }
+                }
+
                 JRightPadded<J.VariableDeclarations.NamedVariable> paramName = JRightPadded.build(
                         new J.VariableDeclarations.NamedVariable(randomId(), EMPTY, Markers.EMPTY,
                                 new J.Identifier(randomId(), whitespace(), Markers.EMPTY, emptyList(), param.getName(), null, null),
@@ -577,7 +594,7 @@ public void visitMethod(MethodNode method) {
 
                 params.add(JRightPadded.build((Statement) new J.VariableDeclarations(randomId(), EMPTY,
                         Markers.EMPTY, paramAnnotations, emptyList(), paramType,
-                        null, emptyList(),
+                        varargs, emptyList(),
                         singletonList(paramName))).withAfter(rightPad));
             }
 

diff --git a/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/MethodDeclarationTest.java b/rewrite-groovy/src/test/java/org/openrewrite/groovy/tree/MethodDeclarationTest.java
@@ -110,6 +110,18 @@ def foo(bar, baz) {
         );
     }
 
+    @Test
+    void varargsArguments() {
+        rewriteRun(
+          groovy(
+            """
+              def foo(String... messages) {
+              }
+              """
+          )
+        );
+    }
+
     @Test
     void defaultArgumentValues() {
         rewriteRun(