Cyclic0007/ruff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc. follow-ups to single-element tuple patterns (#7698)

Browse Source 
Just changes to internal comments and tests.

See comments in https://github.com/astral-sh/ruff/pull/7683.
This commit is contained in:
Charlie Marsh
2023-09-28 14:49:13 -04:00
committed by GitHub
parent 1c02fcd7ce
commit 46b85ab0a9
3 changed files with 140 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
crates/ruff_python_formatter/resources/test/fixtures/ruff/statement/match.py vendored
View File

@@ -522,3 +522,45 @@ match pattern:
case a, b,:
pass
case (a, # comment
):
pass
case (a, b # comment
):
pass
case (a, b, # comment
):
pass
case ( # comment
a,
):
pass
case ( # comment
a, b
):
pass
case ( # comment
a, b,
):
pass
case (
# comment
a,):
pass
case (
# comment
a, b):
pass
case (
# comment
a, b,):
pass

3
crates/ruff_python_formatter/src/pattern/pattern_match_sequence.rs
View File

@@ -22,7 +22,8 @@ impl FormatNodeRule<PatternMatchSequence> for FormatPatternMatchSequence {
let sequence_type = SequenceType::from_pattern(item, f.context().source());
match (patterns.as_slice(), sequence_type) {
// If the sequence is empty, the parentheses with any dangling comments.
// If the sequence is empty, format the empty parentheses, along with any dangling
// comments.
([], SequenceType::Tuple | SequenceType::TupleNoParens) => {
return empty_parenthesized("(", dangling, ")").fmt(f)
}

96
crates/ruff_python_formatter/tests/snapshots/format@statement__match.py.snap
View File

@@ -528,6 +528,48 @@ match pattern:
case a, b,:
pass
case (a, # comment
):
pass
case (a, b # comment
):
pass
case (a, b, # comment
):
pass
case ( # comment
a,
):
pass
case ( # comment
a, b
):
pass
case ( # comment
a, b,
):
pass
case (
# comment
a,):
pass
case (
# comment
a, b):
pass
case (
# comment
a, b,):
pass
```
## Output
@@ -1086,6 +1128,60 @@ match pattern:
b,
):
pass
case (
a, # comment
):
pass
case (
a,
b, # comment
):
pass
case (
a,
b, # comment
):
pass
case ( # comment
a,
):
pass
case ( # comment
a,
b,
):
pass
case ( # comment
a,
b,
):
pass
case (
# comment
a,
):
pass
case (
# comment
a,
b,
):
pass
case (
# comment
a,
b,
):
pass
```