openrewrite-migrate-python 0.16.0.dev20261005084151__tar.gz → 0.16.0.dev20261005095013__tar.gz

{openrewrite_migrate_python-0.16.0.dev20261005084151 → openrewrite_migrate_python-0.16.0.dev20261005095013}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrewrite-migrate-python
-Version: 0.16.0.dev20261005084151
+Version: 0.16.0.dev20261005095013
 Summary: OpenRewrite recipes for migrating Python codebases to newer Python versions.
 Author-email: "Moderne Inc." <support@moderne.io>
 License: Moderne Proprietary

{openrewrite_migrate_python-0.16.0.dev20261005084151 → openrewrite_migrate_python-0.16.0.dev20261005095013}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "openrewrite-migrate-python"
 description = "OpenRewrite recipes for migrating Python codebases to newer Python versions."
-version = "0.16.0.dev20261005084151"  # Updated dynamically during release
+version = "0.16.0.dev20261005095013"  # Updated dynamically during release
 authors = [{ name = "Moderne Inc.", email = "support@moderne.io" }]
 license = { text = "Moderne Proprietary" }
 readme = "README.md"

{openrewrite_migrate_python-0.16.0.dev20261005084151 → openrewrite_migrate_python-0.16.0.dev20261005095013}/src/openrewrite_code_quality_python/codequality/_reindent.py

@@ -6,7 +6,9 @@ to a shallower nesting level means rewriting every line it spans.
 
 from typing import Optional, TypeVar
 
+from rewrite.java.markers import TrailingComma
 from rewrite.java.support_types import Space
+from rewrite.markers import Marker
 from rewrite.python.visitor import PythonVisitor
 
 T = TypeVar("T")
@@ -65,6 +67,20 @@ class _Reindent(PythonVisitor[None]):
             return space
         return Space(_comments=comments, _whitespace=whitespace)
 
+    def visit_marker(self, marker: Marker, p: None) -> Marker:
+        # The line break before the bracket closing a trailing-comma list
+        # lives on the comma.
+        if isinstance(marker, TrailingComma):
+            suffix = self.visit_space(marker.suffix, p)
+            if suffix is not marker.suffix:
+                return marker.replace(_suffix=suffix)
+        return marker
+
+
+def reindent_space(space: Space, old_base: str, new_base: str) -> Space:
+    """:func:`reindent` for trivia that has no tree to travel with."""
+    return _Reindent(old_base, new_base).visit_space(space, None)
+
 
 def reindent(tree: T, old_base: str, new_base: str) -> T:
     """Re-base every line in *tree* that is indented at least to *old_base*.

{openrewrite_migrate_python-0.16.0.dev20261005084151 → openrewrite_migrate_python-0.16.0.dev20261005095013}/src/openrewrite_code_quality_python/codequality/collapsible_if_statements.py

@@ -18,7 +18,7 @@ from rewrite.marketplace import Python
 from rewrite.markers import Markers
 from rewrite.python.tree import StatementExpression
 from rewrite.python.visitor import PythonVisitor
-from rewrite.java.support_types import JLeftPadded, JRightPadded, Space
+from rewrite.java.support_types import Comment, JLeftPadded, JRightPadded, Space
 from rewrite.java.tree import (
     Assignment,
     Binary as JBinary,
@@ -26,6 +26,7 @@ from rewrite.java.tree import (
     ControlParentheses,
     Expression,
     If,
+    J,
     Lambda,
     Parentheses,
     Ternary,
@@ -33,10 +34,13 @@ from rewrite.java.tree import (
 from rewrite.utils import random_id
 
 from openrewrite_code_quality_python.codequality._reindent import (
-    inherited_prefix,
     line_indent,
     reindent,
+    reindent_space,
 )
+from openrewrite_code_quality_python.codequality._trivia import concat, split_line
+
+_HOISTED_COMMENTS = "collapsible_if_statements.hoisted_comments"
 
 _CodeQuality = [
     *Python,
@@ -56,6 +60,14 @@ def _binds_looser_than_and(expr: Expression) -> bool:
     return isinstance(expr, (Ternary, Lambda, Assignment, StatementExpression))
 
 
+def _with_comments_above(prefix: Space, comments: List[Comment]) -> Space:
+    """*prefix* with *comments* on their own lines just before the token it
+    leads into. Each comment's suffix must already end at that token's indent."""
+    if not comments:
+        return prefix
+    return Space(_comments=[*prefix.comments, *comments], _whitespace=prefix.whitespace)
+
+
 def _operand(expr: Expression, prefix: Space) -> Expression:
     """Prepare *expr* as an operand of the merged ``and``, parenthesizing it
     when its own operator would otherwise be captured."""
@@ -119,6 +131,13 @@ class CollapsibleIfStatements(Recipe):
 
     def editor(self) -> TreeVisitor[Any, ExecutionContext]:
         class Visitor(PythonVisitor[ExecutionContext]):
+            def visit_else(self, else_: If.Else, p: ExecutionContext) -> J:
+                visited = super().visit_else(else_, p)
+                hoisted = self.cursor.get_message(_HOISTED_COMMENTS, [])
+                if not isinstance(visited, If.Else) or not hoisted:
+                    return visited
+                return visited.replace(_prefix=_with_comments_above(visited.prefix, hoisted))
+
             def visit_if(
                 self, if_: If, p: ExecutionContext
             ) -> Optional[If]:
@@ -164,6 +183,31 @@ class CollapsibleIfStatements(Recipe):
                 ):
                     return if_
 
+                # An `elif` starts its line at the `elif` keyword, which the
+                # enclosing `Else` holds.
+                parent = self.cursor.parent_tree_cursor()
+                under_elif = isinstance(parent.value, If.Else)
+                outer_indent = line_indent(
+                    parent.value.prefix if isinstance(parent.value, If.Else) else if_.prefix
+                )
+                split = split_line(inner.prefix)
+                if (
+                    outer_indent is None
+                    or not header_indent.startswith(outer_indent)
+                    or split is None
+                ):
+                    return if_
+                # The outer header's trailing comment stays on the merged
+                # header. Comments on their own line before the inner `if`
+                # describe its condition, so they go above the merged header
+                # without the blank lines around them.
+                header_trailer, inner_leader = split
+                hoisted = reindent_space(
+                    Space(_comments=inner_leader.comments, _whitespace=""),
+                    header_indent,
+                    outer_indent,
+                ).comments
+
                 combined = JBinary(
                     _id=random_id(),
                     _prefix=if_.if_condition.tree.prefix,
@@ -174,7 +218,10 @@ class CollapsibleIfStatements(Recipe):
                         _element=JBinary.Type.And,
                         _markers=Markers.EMPTY,
                     ),
-                    _right=_operand(inner.if_condition.tree, Space.SINGLE_SPACE),
+                    _right=_operand(
+                        reindent(inner.if_condition.tree, header_indent, outer_indent),
+                        Space.SINGLE_SPACE,
+                    ),
                     _type=None,
                 )
 
@@ -198,13 +245,18 @@ class CollapsibleIfStatements(Recipe):
                     _statements=[
                         first.replace(
                             _element=first.element.replace(
-                                _prefix=inherited_prefix(inner.prefix, first.element.prefix)
+                                _prefix=concat(header_trailer, first.element.prefix)
                             )
                         ),
                         *inner_body._statements[1:],
                     ]
                 )
 
+                if under_elif:
+                    parent.put_message(_HOISTED_COMMENTS, hoisted)
+                else:
+                    if_ = if_.replace(_prefix=_with_comments_above(if_.prefix, hoisted))
+
                 return if_.replace(
                     _if_condition=new_condition,
                 ).padding.replace(

{openrewrite_migrate_python-0.16.0.dev20261005084151 → openrewrite_migrate_python-0.16.0.dev20261005095013}/src/openrewrite_migrate_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openrewrite-migrate-python
-Version: 0.16.0.dev20261005084151
+Version: 0.16.0.dev20261005095013
 Summary: OpenRewrite recipes for migrating Python codebases to newer Python versions.
 Author-email: "Moderne Inc." <support@moderne.io>
 License: Moderne Proprietary