mirror of
https://github.com/astral-sh/ruff.git
synced 2025-11-20 04:29:47 +00:00
Revert "try only dangling"
This reverts commit 4c8540ede798f544a895225b541f46552649fd7b.
This commit is contained in:
parent
1cf5eff9f4
commit
f49fda317e
3 changed files with 25 additions and 24 deletions
|
|
@ -1861,12 +1861,17 @@ fn handle_unary_op_comment<'a>(
|
|||
| SimpleTokenKind::Plus
|
||||
| SimpleTokenKind::Minus
|
||||
)));
|
||||
let lparen = tokenizer.find(|token| token.kind == SimpleTokenKind::LParen);
|
||||
if lparen.is_none()
|
||||
let lparen_start = tokenizer
|
||||
.find(|token| token.kind == SimpleTokenKind::LParen)
|
||||
.map(|lparen| lparen.start());
|
||||
let up_to = lparen_start.unwrap_or(unary_op.operand.start());
|
||||
if lparen_start.is_none()
|
||||
&& comment.end() < unary_op.operand.start()
|
||||
&& comment.line_position().is_end_of_line()
|
||||
{
|
||||
CommentPlacement::dangling(unary_op, comment)
|
||||
} else if comment.end() < up_to {
|
||||
CommentPlacement::leading(unary_op, comment)
|
||||
} else {
|
||||
CommentPlacement::Default(comment)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -254,35 +254,31 @@ if +(
|
|||
pass
|
||||
|
||||
if (
|
||||
not
|
||||
# comment
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
not aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
|
||||
):
|
||||
pass
|
||||
|
||||
|
||||
if (
|
||||
~
|
||||
# comment
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
~aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
|
||||
):
|
||||
pass
|
||||
|
||||
if (
|
||||
-
|
||||
# comment
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
|
||||
):
|
||||
pass
|
||||
|
||||
|
||||
if (
|
||||
+
|
||||
# comment
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
|
||||
):
|
||||
pass
|
||||
|
|
@ -291,8 +287,8 @@ if (
|
|||
|
||||
if (
|
||||
# unary comment
|
||||
not # operand comment
|
||||
(
|
||||
# operand comment
|
||||
not (
|
||||
# comment
|
||||
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||||
+ bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
|
||||
|
|
@ -367,9 +363,8 @@ if (
|
|||
pass
|
||||
|
||||
if (
|
||||
not
|
||||
# comment
|
||||
a
|
||||
not a
|
||||
):
|
||||
pass
|
||||
|
||||
|
|
@ -389,9 +384,9 @@ if True:
|
|||
# Regression test for: https://github.com/astral-sh/ruff/issues/7448
|
||||
x = (
|
||||
# a
|
||||
not # b
|
||||
# b
|
||||
# c
|
||||
( # d
|
||||
not ( # d
|
||||
# e
|
||||
True
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
---
|
||||
source: crates/ruff_python_formatter/tests/fixtures.rs
|
||||
input_file: crates/ruff_python_formatter/resources/test/fixtures/ruff/parentheses/expression_parentheses_comments.py
|
||||
snapshot_kind: text
|
||||
---
|
||||
## Input
|
||||
```python
|
||||
|
|
@ -178,13 +179,13 @@ nested_parentheses4 = [
|
|||
|
||||
x = (
|
||||
# unary comment
|
||||
not # in-between comment
|
||||
(
|
||||
# in-between comment
|
||||
not (
|
||||
# leading inner
|
||||
"a"
|
||||
),
|
||||
not # in-between comment
|
||||
(
|
||||
# in-between comment
|
||||
not (
|
||||
# leading inner
|
||||
"b"
|
||||
),
|
||||
|
|
@ -193,8 +194,8 @@ x = (
|
|||
"c"
|
||||
),
|
||||
# 1
|
||||
not # 2
|
||||
( # 3
|
||||
# 2
|
||||
not ( # 3
|
||||
# 4
|
||||
"d"
|
||||
),
|
||||
|
|
@ -202,8 +203,8 @@ x = (
|
|||
|
||||
if (
|
||||
# unary comment
|
||||
not # in-between comment
|
||||
(
|
||||
# in-between comment
|
||||
not (
|
||||
# leading inner
|
||||
1
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue