Correct whitespace handling for with item with parens

openrewrite · Nov 14, 2024 · 2710b03 · 2710b03
1 parent 263d33e
commit 2710b03
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/rewrite/rewrite/python/_parser_visitor.py b/rewrite/rewrite/python/_parser_visitor.py
@@ -469,11 +469,9 @@ def visit_With(self, node):
 
         if parenthesized and self._parentheses_stack and self._parentheses_stack[-1] is parens_handler:
             self._cursor += 1
-            self._parentheses_stack.pop()
-            resources_container = JContainer(
-                items_prefix,
-                resources,
-                Markers.EMPTY
+            resources_container = self._parentheses_stack.pop()[0](
+                JContainer(items_prefix, resources, Markers.EMPTY),
+                Space.EMPTY
             )
         else:
             resources_container = JContainer(

diff --git a/rewrite/tests/python/all/with_test.py b/rewrite/tests/python/all/with_test.py
@@ -32,7 +32,8 @@ def test_with_parens():
     rewrite_run(
         python(
             """\
-            with (open('/dev/null') as x):
+            with (
+                open('/dev/null') as x):
                 pass
             """
         )
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,8 @@ def test_with_parens(): @@
         rewrite_run(
             python(
                 """\
-                with (open('/dev/null') as x):
+                with (
+                    open('/dev/null') as x):
                     pass
                 """
             )
@@ Expand Down @@