Properly group assignment targets

crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/assign.py

@@ -8,3 +8,7 @@
 
 # Break the last element
 a = asdf = fjhalsdljfalflaflapamsakjsdhflakjdslfjhalsdljfalflaflapamsakjsdhflakjdslfjhalsdljfal = 1
+
+aa = [
+    bakjdshflkjahdslkfjlasfdahjlfds
+] = dddd = ddd = fkjaödkjaföjfahlfdalfhaöfaöfhaöfha = g = 3

crates/ruff_python_formatter/src/expression/mod.rs

@@ -443,6 +443,10 @@ impl<'input> PreorderVisitor<'input> for CanOmitOptionalParenthesesVisitor<'inpu
 }
 
 fn has_parentheses(expr: &Expr, source: &str) -> bool {
+    has_own_parentheses(expr) || is_expression_parenthesized(AnyNodeRef::from(expr), source)
+}
+
+pub(crate) const fn has_own_parentheses(expr: &Expr) -> bool {
     matches!(
         expr,
         Expr::Dict(_)
@@ -454,7 +458,7 @@ fn has_parentheses(expr: &Expr, source: &str) -> bool {
             | Expr::DictComp(_)
             | Expr::Call(_)
             | Expr::Subscript(_)
-    ) || is_expression_parenthesized(AnyNodeRef::from(expr), source)
+    )
 }
 
 #[derive(Debug, Copy, Clone, Ord, PartialOrd, Eq, PartialEq)]

crates/ruff_python_formatter/src/statement/stmt_assign.rs

@@ -1,16 +1,13 @@
-use rustpython_parser::ast::StmtAssign;
+use rustpython_parser::ast::{Expr, StmtAssign};
 
-use ruff_formatter::write;
+use ruff_formatter::{format_args, write, FormatError};
 
-use crate::expression::maybe_parenthesize_expression;
-use crate::expression::parentheses::Parenthesize;
+use crate::context::NodeLevel;
+use crate::expression::parentheses::{Parentheses, Parenthesize};
+use crate::expression::{has_own_parentheses, maybe_parenthesize_expression};
 use crate::prelude::*;
 use crate::FormatNodeRule;
 
-// Note: This currently does wrap but not the black way so the types below likely need to be
-// replaced entirely
-//
-
 #[derive(Default)]
 pub struct FormatStmtAssign;
 
@@ -23,9 +20,18 @@ impl FormatNodeRule<StmtAssign> for FormatStmtAssign {
             type_comment: _,
         } = item;
 
-        for target in targets {
-            write!(f, [target.format(), space(), text("="), space()])?;
-        }
+        let (first, rest) = targets.split_first().ok_or(FormatError::SyntaxError)?;
+
+        write!(
+            f,
+            [
+                first.format(),
+                space(),
+                text("="),
+                space(),
+                FormatTargets { targets: rest }
+            ]
+        )?;
 
         write!(
             f,
@@ -37,3 +43,59 @@ impl FormatNodeRule<StmtAssign> for FormatStmtAssign {
         )
     }
 }
+
+struct FormatTargets<'a> {
+    targets: &'a [Expr],
+}
+
+impl Format<PyFormatContext<'_>> for FormatTargets<'_> {
+    fn fmt(&self, f: &mut Formatter<PyFormatContext<'_>>) -> FormatResult<()> {
+        if let Some((first, rest)) = self.targets.split_first() {
+            let needs_parentheses =
+                !has_own_parentheses(first) || f.context().comments().has_leading_comments(first);
+
+            let group_id = if needs_parentheses {
+                None
+            } else {
+                Some(f.group_id("assignment_parentheses"))
+            };
+
+            let saved_level = f.context().node_level();
+            f.context_mut()
+                .set_node_level(NodeLevel::Expression(group_id));
+
+            let format_first = format_with(|f: &mut PyFormatter| {
+                let result = if needs_parentheses {
+                    write!(
+                        f,
+                        [
+                            if_group_breaks(&text("(")),
+                            soft_block_indent(&first.format().with_options(Parentheses::Never)),
+                            if_group_breaks(&text(")"))
+                        ]
+                    )
+                } else {
+                    first.format().with_options(Parentheses::Never).fmt(f)
+                };
+
+                f.context_mut().set_node_level(saved_level);
+
+                result
+            });
+
+            let result = group(&format_args![
+                format_first,
+                space(),
+                text("="),
+                space(),
+                FormatTargets { targets: rest }
+            ])
+            .with_group_id(group_id)
+            .fmt(f);
+
+            result
+        } else {
+            Ok(())
+        }
+    }
+}

crates/ruff_python_formatter/tests/snapshots/format@statement__assign.py.snap

@@ -14,18 +14,34 @@ a2 = (
 
 # Break the last element
 a = asdf = fjhalsdljfalflaflapamsakjsdhflakjdslfjhalsdljfalflaflapamsakjsdhflakjdslfjhalsdljfal = 1
+
+aa = [
+    bakjdshflkjahdslkfjlasfdahjlfds
+] = dddd = ddd = fkjaödkjaföjfahlfdalfhaöfaöfhaöfha = g = 3
 ```
 
 ## Output
 ```py
 # break left hand side
-a1akjdshflkjahdslkfjlasfdahjlfds = bakjdshflkjahdslkfjlasfdahjlfds = cakjdshflkjahdslkfjlasfdahjlfds = kjaödkjaföjfahlfdalfhaöfaöfhaöfha = fkjaödkjaföjfahlfdalfhaöfaöfhaöfha = g = 3
+a1akjdshflkjahdslkfjlasfdahjlfds = (
+    bakjdshflkjahdslkfjlasfdahjlfds
+) = (
+    cakjdshflkjahdslkfjlasfdahjlfds
+) = kjaödkjaföjfahlfdalfhaöfaöfhaöfha = fkjaödkjaföjfahlfdalfhaöfaöfhaöfha = g = 3
 
 # join left hand side
-a2 = (b2) = 2
+a2 = b2 = 2
 
 # Break the last element
-a = asdf = fjhalsdljfalflaflapamsakjsdhflakjdslfjhalsdljfalflaflapamsakjsdhflakjdslfjhalsdljfal = 1
+a = (
+    asdf
+) = (
+    fjhalsdljfalflaflapamsakjsdhflakjdslfjhalsdljfalflaflapamsakjsdhflakjdslfjhalsdljfal
+) = 1
+
+aa = [
+    bakjdshflkjahdslkfjlasfdahjlfds
+] = dddd = ddd = fkjaödkjaföjfahlfdalfhaöfaöfhaöfha = g = 3
 ```