mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-07-24 13:33:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

move comments from expressions in f-strings out (#6481)

Browse source
This commit is contained in:
David Szotten 2023-08-11 08:22:30 +01:00 • committed by GitHub
parent 2cedb401bd
commit f091b46497
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/ruff_python_formatter/resources/test/fixtures/ruff/expression/fstring.py vendored
View file

@ -24,3 +24,12 @@ result_f = (
r' \[Previous line repeated (\d+) more times\]' '\n'
'RecursionError: maximum recursion depth exceeded\n'
)
# Regression for fstring dropping comments that were accidentally attached to
# an expression inside a formatted value
(
f'{1}'
# comment
''
)

1
crates/ruff_python_formatter/src/comments/placement.rs
View file

@ -80,6 +80,7 @@ pub(super) fn place_comment<'a>(
CommentPlacement::Default(comment)
}
}
AnyNodeRef::ExprFString(fstring) => CommentPlacement::dangling(fstring, comment),
AnyNodeRef::ExprList(_)
| AnyNodeRef::ExprSet(_)
| AnyNodeRef::ExprGeneratorExp(_)

18
crates/ruff_python_formatter/tests/snapshots/format@expression__fstring.py.snap
View file

@ -30,6 +30,15 @@ result_f = (
r' \[Previous line repeated (\d+) more times\]' '\n'
'RecursionError: maximum recursion depth exceeded\n'
)
# Regression for fstring dropping comments that were accidentally attached to
# an expression inside a formatted value
(
f'{1}'
# comment
''
)
```
## Output
@ -58,6 +67,15 @@ result_f = (
"\n"
"RecursionError: maximum recursion depth exceeded\n"
)
# Regression for fstring dropping comments that were accidentally attached to
# an expression inside a formatted value
(
f"{1}"
# comment
""
)
```