Fix unstable f-string formatting for expressions containing a trailing comma

crates/ruff_python_formatter/resources/test/fixtures/ruff/expression/fstring.py

@@ -719,10 +719,15 @@
 print(f"{1, 2, {3} }")
 print(f"{(1, 2, {3})}")
 
+
 # Regression tests for https://github.com/astral-sh/ruff/issues/15535
 print(f"{ {}, }")  # A single item tuple gets parenthesized
 print(f"{ {}.values(), }")
 print(f"{ {}, 1 }")  # A tuple with multiple elements doesn't get parenthesized
 print(f"{  # Tuple with multiple elements that doesn't fit on a single line gets parenthesized
     {}, 1,
 }")
+
+
+# Regression tests for https://github.com/astral-sh/ruff/issues/15536
+print(f"{ {}, 1, }")

crates/ruff_python_formatter/src/builders.rs

@@ -206,6 +206,20 @@ impl<'fmt, 'ast, 'buf> JoinCommaSeparatedBuilder<'fmt, 'ast, 'buf> {
 
     pub(crate) fn finish(&mut self) -> FormatResult<()> {
         self.result.and_then(|()| {
+            // Don't add a magic trailing comma when formatting an f-string expression
+            // that always must be flat because the `expand_parent` forces enclosing
+            // groups to expand, e.g. `print(f"{(a,)} ")` would format the f-string in
+            // flat mode but the `print` call gets expanded because of the `expand_parent`.
+            if self
+                .fmt
+                .context()
+                .f_string_state()
+                .can_contain_line_breaks()
+                == Some(false)
+            {
+                return Ok(());
+            }
+
             if let Some(last_end) = self.entries.position() {
                 let magic_trailing_comma = has_magic_trailing_comma(
                     TextRange::new(last_end, self.sequence_end),

crates/ruff_python_formatter/src/context.rs

@@ -147,6 +147,17 @@ pub(crate) enum FStringState {
     Outside,
 }
 
+impl FStringState {
+    pub(crate) fn can_contain_line_breaks(self) -> Option<bool> {
+        match self {
+            FStringState::InsideExpressionElement(context) => {
+                Some(context.can_contain_line_breaks())
+            }
+            FStringState::Outside => None,
+        }
+    }
+}
+
 /// The position of a top-level statement in the module.
 #[derive(Copy, Clone, Debug, Eq, PartialEq, Default)]
 pub(crate) enum TopLevelStatementPosition {

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

@@ -725,13 +725,18 @@ print(f"{({1, 2, 3}) - ({2})}")
 print(f"{1, 2, {3} }")
 print(f"{(1, 2, {3})}")
 
+
 # Regression tests for https://github.com/astral-sh/ruff/issues/15535
 print(f"{ {}, }")  # A single item tuple gets parenthesized
 print(f"{ {}.values(), }")
 print(f"{ {}, 1 }")  # A tuple with multiple elements doesn't get parenthesized
 print(f"{  # Tuple with multiple elements that doesn't fit on a single line gets parenthesized
     {}, 1,
 }")
+
+
+# Regression tests for https://github.com/astral-sh/ruff/issues/15536
+print(f"{ {}, 1, }")
 ```
 
 ## Outputs
@@ -1515,6 +1520,7 @@ print(f"{({1, 2, 3}) - ({2})}")
 print(f"{1, 2, {3}}")
 print(f"{(1, 2, {3})}")
 
+
 # Regression tests for https://github.com/astral-sh/ruff/issues/15535
 print(f"{({},)}")  # A single item tuple gets parenthesized
 print(f"{({}.values(),)}")
@@ -1527,6 +1533,10 @@ print(
         )
     }"
 )
+
+
+# Regression tests for https://github.com/astral-sh/ruff/issues/15536
+print(f"{ {}, 1 }")
 ```
 
 
@@ -2310,6 +2320,7 @@ print(f"{({1, 2, 3}) - ({2})}")
 print(f"{1, 2, {3}}")
 print(f"{(1, 2, {3})}")
 
+
 # Regression tests for https://github.com/astral-sh/ruff/issues/15535
 print(f"{({},)}")  # A single item tuple gets parenthesized
 print(f"{({}.values(),)}")
@@ -2322,4 +2333,8 @@ print(
         )
     }"
 )
+
+
+# Regression tests for https://github.com/astral-sh/ruff/issues/15536
+print(f"{ {}, 1 }")
 ```