Fix handling of trailing target comment (#9051)

astral-sh · Dec 8, 2023 · d0d88d9 · d0d88d9
1 parent a224f19
commit d0d88d9
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/assign.py b/crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/assign.py
@@ -67,3 +67,12 @@ def main() -> None:
                 db_request.POST["name"]
             )
         )[0]
+
+
+c = b[dddddd, aaaaaa] =  (
+    a[
+        aaaaaaa,
+        bbbbbbbbbbbbbbbbbbb
+    ]
+    # comment
+) = xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
diff --git a/crates/ruff_python_formatter/src/statement/stmt_assign.rs b/crates/ruff_python_formatter/src/statement/stmt_assign.rs
@@ -69,7 +69,7 @@ impl Format<PyFormatContext<'_>> for FormatTargets<'_> {
         if let Some((first, rest)) = self.targets.split_first() {
             let comments = f.context().comments();
 
-            let parenthesize = if comments.has_leading(first) {
+            let parenthesize = if comments.has_leading(first) || comments.has_trailing(first) {
                 ParenthesizeTarget::Always
             } else if has_own_parentheses(first, f.context()).is_some() {
                 ParenthesizeTarget::Never

diff --git a/crates/ruff_python_formatter/tests/snapshots/format@statement__assign.py.snap b/crates/ruff_python_formatter/tests/snapshots/format@statement__assign.py.snap
@@ -73,6 +73,15 @@ def main() -> None:
                 db_request.POST["name"]
             )
         )[0]
+
+
+c = b[dddddd, aaaaaa] =  (
+    a[
+        aaaaaaa,
+        bbbbbbbbbbbbbbbbbbb
+    ]
+    # comment
+) = xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ```
 
 ## Output
@@ -151,6 +160,12 @@ def main() -> None:
                 db_request.POST["name"]
             )
         )[0]
+
+
+c = b[dddddd, aaaaaa] = (
+    a[aaaaaaa, bbbbbbbbbbbbbbbbbbb]
+    # comment
+) = xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 ```