Tweak breaking groups for comprehensions (#6321)

## Summary

Fixes some comprehension formatting by avoiding creating the group for
the comprehension itself (so that if it breaks, all parts break on their
own lines, e.g. the `for` and the `if` clauses).

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

## Test Plan

Bunch of new fixtures.
This commit is contained in:
Charlie Marsh
2023-08-04 10:00:54 -04:00
committed by GitHub
parent 99baad12d8
commit 4d47dfd6c0
10 changed files with 166 additions and 9 deletions

View File

@@ -93,3 +93,19 @@ selected_choices = {
x, aaaayaaaayaaaayaaaayaaaayaaaayaaaayaaaayaaaayaaaayaaaayaaaayaaaayaaaay) in z
}
a = {
k: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
for f in bbbbbbbbbbbbbbb
if f not in ccccccccccc
}
a = {
k: [1, 2, 3,]
for f in bbbbbbbbbbbbbbb
if f not in ccccccccccc
}
aaaaaaaaaaaaaaaaaaaaa = {
k: o for o in self.registry.values if o.__class__ is not ModelAdmin
}

View File

@@ -31,3 +31,19 @@ len(
a for b in c
# trailing
)
a = (
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
for f in bbbbbbbbbbbbbbb
if f not in ccccccccccc
)
a = (
[1, 2, 3,]
for f in bbbbbbbbbbbbbbb
if f not in ccccccccccc
)
aaaaaaaaaaaaaaaaaaaaa = (
o for o in self.registry.values if o.__class__ is not ModelAdmin
)

View File

@@ -56,4 +56,20 @@ selected_choices = [
# Tuples with BinOp
[i for i in (aaaaaaaaaaaaaaaaaaaaaa + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccc)]
[(aaaaaaaaaaaaaaaaaaaaaa + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccc) for i in b]
[(aaaaaaaaaaaaaaaaaaaaaa + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, ccccccccccccccccccccc) for i in b]
a = [
aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
for f in bbbbbbbbbbbbbbb
if f not in ccccccccccc
]
a = [
[1, 2, 3,]
for f in bbbbbbbbbbbbbbb
if f not in ccccccccccc
]
aaaaaaaaaaaaaaaaaaaaa = [
o for o in self.registry.values if o.__class__ is not ModelAdmin
]