Fix bug with implicit concatenated string preceded by comment

astral-sh · Oct 23, 2024 · f3256b8 · f3256b8
1 parent 4096009
commit f3256b8
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/...on_formatter/resources/test/fixtures/ruff/expression/join_implicit_concatenated_string.py b/...on_formatter/resources/test/fixtures/ruff/expression/join_implicit_concatenated_string.py
@@ -280,3 +280,13 @@ def byte_string_in_docstring_position():
 
 def f_string_in_docstring_position():
     f"  don't trim the" "f-string literal "
+
+
+##############################################################################
+# Regressions
+##############################################################################
+
+LEEEEEEEEEEEEEEEEEEEEEEFT = RRRRRRRRIIIIIIIIIIIIGGGGGHHHT | {
+    "entityNameeeeeeeeeeeeeeeeee",  # comment must be long enough to
+    "some long implicit concatenated string" "that should join"
+}
diff --git a/crates/ruff_python_formatter/src/expression/expr_string_literal.rs b/crates/ruff_python_formatter/src/expression/expr_string_literal.rs
@@ -40,9 +40,8 @@ impl FormatNodeRule<ExprStringLiteral> for FormatExprStringLiteral {
                     }
                 }
 
-                in_parentheses_only_group(&FormatImplicitConcatenatedString::new(item))
+                in_parentheses_only_group(&FormatImplicitConcatenatedString::new(item)).fmt(f)
             }
-            .fmt(f),
         }
     }
 }

diff --git a/crates/ruff_python_formatter/src/string/implicit.rs b/crates/ruff_python_formatter/src/string/implicit.rs
@@ -92,7 +92,6 @@ impl Format<PyFormatContext<'_>> for FormatImplicitConcatenatedStringExpanded<'_
 
             let part_comments = comments.leading_dangling_trailing(&part);
             joiner.entry(&format_args![
-                line_suffix_boundary(),
                 leading_comments(part_comments.leading),
                 format_part,
                 trailing_comments(part_comments.trailing)

diff --git a/...on_formatter/tests/snapshots/format@expression__join_implicit_concatenated_string.py.snap b/...on_formatter/tests/snapshots/format@expression__join_implicit_concatenated_string.py.snap
@@ -286,6 +286,16 @@ def byte_string_in_docstring_position():
 
 def f_string_in_docstring_position():
     f"  don't trim the" "f-string literal "
+
+
+##############################################################################
+# Regressions
+##############################################################################
+
+LEEEEEEEEEEEEEEEEEEEEEEFT = RRRRRRRRIIIIIIIIIIIIGGGGGHHHT | {
+    "entityNameeeeeeeeeeeeeeeeee",  # comment must be long enough to
+    "some long implicit concatenated string" "that should join"
+}
 ```
 
 ## Outputs
@@ -651,4 +661,14 @@ def byte_string_in_docstring_position():
 
 def f_string_in_docstring_position():
     f"  don't trim thef-string literal "
+
+
+##############################################################################
+# Regressions
+##############################################################################
+
+LEEEEEEEEEEEEEEEEEEEEEEFT = RRRRRRRRIIIIIIIIIIIIGGGGGHHHT | {
+    "entityNameeeeeeeeeeeeeeeeee",  # comment must be long enough to
+    "some long implicit concatenated stringthat should join",
+}
 ```
-Original file line number
+Diff line change
@@ Expand Up @@
                         }
                     }
-                    in_parentheses_only_group(&FormatImplicitConcatenatedString::new(item))
+                    in_parentheses_only_group(&FormatImplicitConcatenatedString::new(item)).fmt(f)
                 }
-                .fmt(f),
             }
         }
     }
@@ Expand Down @@