Python/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff synced 2026-01-08 23:24:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

[formatter] Stabilize fix for single-with-item formatting with trailing comment (#16603)

Browse Source 
## Summary

This PR stabilizies the fix for
https://github.com/astral-sh/ruff/issues/14001

We try to only make breaking formatting changes once a year. However,
the plan was to release this fix as part of Ruff 0.9 but I somehow
missed it when promoting all other formatter changes.
I think it's worth making an exception here considering that this is a
bug fix, it improves readability, and it should be rare
(very few files in a single project). Our version policy explicitly
allows breaking formatter changes in any minor release and the idea of
only making breaking formatter changes once a year is mainly to avoid
multiple releases throughout the year that introduce large formatter
changes

Closes https://github.com/astral-sh/ruff/issues/14001

## Test Plan

Updated snapshot
This commit is contained in:
Micha Reiser
2025-03-10 19:31:35 +01:00
parent df6c850a53
commit a4b7c4ef70
3 changed files with 16 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
crates/ruff_python_formatter/tests/snapshots/format@statement__with.py.snap
View File

@@ -771,113 +771,42 @@ if True:
# Regression test for https://github.com/astral-sh/ruff/issues/14001
with (
(
open(
"some/path.txt",
"rb",
)
if True
else open("other/path.txt")
open(
"some/path.txt",
"rb",
)
if True
else open("other/path.txt")
# Bar
):
pass
with ( # trailing comment
(
open(
"some/path.txt",
"rb",
)
if True
else open("other/path.txt")
open(
"some/path.txt",
"rb",
)
if True
else open("other/path.txt")
# Bar
):
pass
with (
(
open(
"some/path.txt",
"rb",
)
if True
else open("other/path.txt")
open(
"some/path.txt",
"rb",
)
if True
else open("other/path.txt")
# Bar
):
pass
```
#### Preview changes
```diff
--- Stable
+++ Preview
@@ -377,42 +377,36 @@
# Regression test for https://github.com/astral-sh/ruff/issues/14001
with (
- (
- open(
- "some/path.txt",
- "rb",
- )
- if True
- else open("other/path.txt")
+ open(
+ "some/path.txt",
+ "rb",
)
+ if True
+ else open("other/path.txt")
# Bar
):
pass
with ( # trailing comment
- (
- open(
- "some/path.txt",
- "rb",
- )
- if True
- else open("other/path.txt")
+ open(
+ "some/path.txt",
+ "rb",
)
+ if True
+ else open("other/path.txt")
# Bar
):
pass
with (
- (
- open(
- "some/path.txt",
- "rb",
- )
- if True
- else open("other/path.txt")
+ open(
+ "some/path.txt",
+ "rb",
)
+ if True
+ else open("other/path.txt")
# Bar
):
pass
```
### Output 2
```
indent-style = space