try a different approach

add more variations on issue test case
Revert "try only dangling"
2025-11-13 10:09:37 -05:00 · 2025-11-13 09:37:15 -05:00 · 2025-11-12 15:33:48 -05:00 · 2025-11-12 15:33:48 -05:00 · 2025-11-12 15:33:48 -05:00 · 2025-11-12 15:33:48 -05:00
3 changed files with 55 additions and 3 deletions
--- a/crates/ruff_python_formatter/resources/test/fixtures/ruff/expression/unary.py
+++ b/crates/ruff_python_formatter/resources/test/fixtures/ruff/expression/unary.py
@@ -193,3 +193,19 @@ def foo():
        not (aaaaaaaaaaaaaaaaaaaaa[bbbbbbbb, ccccccc]) and dddddddddd < eeeeeeeeeeeeeee
    ):
        pass
+
+# Regression tests for https://github.com/astral-sh/ruff/issues/19226
+if '' and (not #
+0):
+    pass
+
+if '' and (not #
+(0)
+):
+    pass
+
+if '' and (not
+	(  #
+	0
+)):
+    pass
--- a/crates/ruff_python_formatter/src/expression/binary_like.rs
+++ b/crates/ruff_python_formatter/src/expression/binary_like.rs
@@ -836,7 +836,8 @@ impl<'a> Operand<'a> {
                let leading = comments.leading(*expression);
                if is_expression_parenthesized((*expression).into(), comments.ranges(), source) {
                    leading.iter().any(|comment| {
-                        !comment.is_formatted()
+                        comment.end() <= expression.start()
+                            && !comment.is_formatted()
                            && matches!(
                                SimpleTokenizer::new(
                                    source,
@@ -922,7 +923,8 @@ impl Format<PyFormatContext<'_>> for Operand<'_> {
            let leading_before_parentheses_end = leading
                .iter()
                .rposition(|comment| {
-                    comment.is_unformatted()
+                    comment.end() <= expression.start()
+                        && comment.is_unformatted()
                        && matches!(
                            SimpleTokenizer::new(
                                f.context().source(),
--- a/crates/ruff_python_formatter/tests/snapshots/format@expression__unary.py.snap
+++ b/crates/ruff_python_formatter/tests/snapshots/format@expression__unary.py.snap
@@ -1,7 +1,6 @@
 ---
 source: crates/ruff_python_formatter/tests/fixtures.rs
 input_file: crates/ruff_python_formatter/resources/test/fixtures/ruff/expression/unary.py
-snapshot_kind: text
 ---
 ## Input
 ```python
@@ -200,6 +199,22 @@ def foo():
        not (aaaaaaaaaaaaaaaaaaaaa[bbbbbbbb, ccccccc]) and dddddddddd < eeeeeeeeeeeeeee
    ):
        pass
+
+# Regression tests for https://github.com/astral-sh/ruff/issues/19226
+if '' and (not #
+0):
+    pass
+
+if '' and (not #
+(0)
+):
+    pass
+
+if '' and (not
+	(  #
+	0
+)):
+    pass
 ```

 ## Output
@@ -415,4 +430,23 @@ def foo():
        not (aaaaaaaaaaaaaaaaaaaaa[bbbbbbbb, ccccccc]) and dddddddddd < eeeeeeeeeeeeeee
    ):
        pass
+
+
+# Regression tests for https://github.com/astral-sh/ruff/issues/19226
+if "" and (  #
+    not 0
+):
+    pass
+
+if "" and (  #
+    not (0)
+):
+    pass
+
+if "" and (
+    not (  #
+        0
+    )
+):
+    pass
 ```
Author	SHA1	Message	Date
Brent Westbrook	e0b0b54b25	try a different approach	2025-11-13 10:09:37 -05:00
Brent Westbrook	9bee558c3a	add more variations on issue test case	2025-11-13 09:37:15 -05:00
Brent Westbrook	f49fda317e	Revert "try only dangling" This reverts commit 4c8540ede798f544a895225b541f46552649fd7b.	2025-11-12 15:33:48 -05:00
Brent Westbrook	1cf5eff9f4	try only dangling	2025-11-12 15:33:48 -05:00
Brent Westbrook	ecccfd2a56	dangling operator comment fix leading comments	2025-11-12 15:33:48 -05:00
Brent Westbrook	a303d1aa49	leading operand comment	2025-11-12 15:33:48 -05:00
Brent Westbrook	6eebc35eec	add failing test	2025-11-12 15:33:48 -05:00
Brent Westbrook	923b4dd01e	Fix panic when formatting comments in unary expressions Summary -- This is a second attempt at fixing #19226 based on the feedback in https://github.com/astral-sh/ruff/pull/20494#issuecomment-3467920065. We currently mark the comment in an expression like this: ```py if '' and (not # 0): pass ``` as a leading comment on `not`, eventually causing a panic in `Operand::has_unparenthesized_leading_comments` because the end of the comment is greater than the start of the expression. `a1d9cb5830/crates/ruff_python_formatter/src/expression/binary_like.rs (L843)` This PR fixes the issue by instead making such a comment a dangling comment on the unary expression. In the third commit, I instead tried making the comment a leading comment on the operand, which also looks pretty reasonable to me. Making it a dangling comment seems more in line with the docs on `handle_unary_op_comments`, though. I also tried deleting the leading comment logic in favor of the new dangling logic in the fifth commit before reverting in the sixth. This looks okay to me too, but the current state of the PR seems like the least invasive fix. Test Plan -- A new, minimized test case based on the issue. I also checked that the original snippet from the report works now. Co-authored-by: Takayuki Maeda <takoyaki0316@gmail.com>	2025-11-12 15:31:49 -05:00