Correct a trailing comma bug in parameter list

openrewrite · Oct 18, 2024 · 0ce2316 · 0ce2316
1 parent 07da017
commit 0ce2316
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/rewrite/rewrite/python/_parser_visitor.py b/rewrite/rewrite/python/_parser_visitor.py
@@ -85,7 +85,7 @@ def visit_arguments(self, node, with_close_paren: bool = True) -> List[JRightPad
             for i, kwonlyarg in enumerate(node.kwonlyargs):
                 args.append(self.__pad_list_element(
                     self.map_arg(kwonlyarg, node.kw_defaults[i], kwarg=False),
-                    i == len(node.kwonlyargs) - 1,
+                    not node.kwarg and i == len(node.kwonlyargs) - 1,
                     end_delim=')' if with_close_paren else None
                 ))
 

diff --git a/rewrite/tests/python/all/method_declaration_test.py b/rewrite/tests/python/all/method_declaration_test.py
@@ -74,6 +74,18 @@ def foo(foo, *, bar) :
     )
 
 
+def test_all():
+    # language=python
+    rewrite_run(
+        python(
+            """\
+            def retry_until_timeout(cb_fn, *args, timeout=4, **kwargs):
+                pass
+            """
+        )
+    )
+
+
 def test_trailing_comma_on_kwonly_arg():
     # language=python
     rewrite_run(