Add test argumentTrailingComma and fix

openrewrite · Nov 7, 2023 · 6c37fea · 6c37fea
1 parent 5e9ae7d
commit 6c37fea
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/src/main/java/org/openrewrite/kotlin/internal/KotlinTreeParserVisitor.java b/src/main/java/org/openrewrite/kotlin/internal/KotlinTreeParserVisitor.java
@@ -2430,7 +2430,6 @@ private J visitNamedFunction0(KtNamedFunction function, ExecutionContext data) {
         Set<PsiElement> prefixConsumedSet = new HashSet<>();
         prefixConsumedSet.add(prefixConsumed);
 
-
         if (function.getTypeParameterList() != null) {
             typeParameters = new J.TypeParameters(
                     randomId(),
@@ -2474,11 +2473,7 @@ private J visitNamedFunction0(KtNamedFunction function, ExecutionContext data) {
                     ), Markers.EMPTY
             );
         } else {
-            List<JRightPadded<Statement>> rps = new ArrayList<>();
-            for (KtParameter param : ktParameters) {
-                rps.add(padRight(convertToStatement(param.accept(this, data)), endFixAndSuffix(param)));
-            }
-            params = JContainer.build(prefix(function.getValueParameterList()), rps, Markers.EMPTY);
+            params = JContainer.build(prefix(function.getValueParameterList()), mapParameters(function.getValueParameterList(), data), Markers.EMPTY);
         }
 
         if (function.getReceiverTypeReference() != null) {
@@ -2514,7 +2509,6 @@ private J visitNamedFunction0(KtNamedFunction function, ExecutionContext data) {
             newStatements.add(JRightPadded.build(implicitParam));
             newStatements.addAll(params.getPadding().getElements());
             params = params.getPadding().withElements(newStatements);
-
         }
 
         if (function.getTypeReference() != null) {

diff --git a/src/test/java/org/openrewrite/kotlin/tree/MethodDeclarationTest.java b/src/test/java/org/openrewrite/kotlin/tree/MethodDeclarationTest.java
@@ -363,4 +363,28 @@ fun method2() {
           )
         );
     }
+
+    @Test
+    void argumentTrailingComma() {
+        rewriteRun(
+          kotlin(
+            """
+              inline fun <reified T, R> default(paramName: String): R? {
+                  return null
+              }
+
+              class PersonProjection {
+                  operator fun invoke() = this
+              }
+
+              public fun person(
+                  a1: String? = default<PersonProjection, String?>("a1"),
+                  a2: String,
+                  _projection: PersonProjection.() -> PersonProjection, // Trailing Comma here
+              ) {
+              }
+              """
+          )
+        );
+    }
 }