mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-08-22 03:14:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Introduce AST nodes for PatternMatchClass arguments (#6881)

Browse source 
## Summary

This PR introduces two new AST nodes to improve the representation of
`PatternMatchClass`. As a reminder, `PatternMatchClass` looks like this:

```python
case Point2D(0, 0, x=1, y=2):
  ...
```

Historically, this was represented as a vector of patterns (for the `0,
0` portion) and parallel vectors of keyword names (for `x` and `y`) and
values (for `1` and `2`). This introduces a bunch of challenges for the
formatter, but importantly, it's also really different from how we
represent similar nodes, like arguments (`func(0, 0, x=1, y=2)`) or
parameters (`def func(x, y)`).

So, firstly, we now use a single node (`PatternArguments`) for the
entire parenthesized region, making it much more consistent with our
other nodes. So, above, `PatternArguments` would be `(0, 0, x=1, y=2)`.

Secondly, we now have a `PatternKeyword` node for `x=1` and `y=2`. This
is much more similar to the how `Keyword` is represented within
`Arguments` for call expressions.

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

Closes https://github.com/astral-sh/ruff/issues/6880.
This commit is contained in:
Charlie Marsh 2023-08-26 10:45:44 -04:00 • committed by GitHub
parent ed1b4122d0
commit 15b73bdb8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 25299 additions and 25824 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/ruff_python_parser/src/snapshots/ruff_python_parser__parser__tests__match.snap
View file

@ -168,9 +168,11 @@ expression: parse_ast
ctx: Load,
},
),
patterns: [],
kwd_attrs: [],
kwd_patterns: [],
arguments: PatternArguments {
range: 130..132,
patterns: [],
keywords: [],
},
},
),
MatchSingleton(

34
crates/ruff_python_parser/src/snapshots/ruff_python_parser__parser__tests__patma.snap
View file

@ -90,22 +90,24 @@ expression: parse_ast
ctx: Load,
},
),
patterns: [
MatchAs(
PatternMatchAs {
range: 150..151,
pattern: None,
name: Some(
Identifier {
id: "z",
range: 150..151,
},
),
},
),
],
kwd_attrs: [],
kwd_patterns: [],
arguments: PatternArguments {
range: 149..152,
patterns: [
MatchAs(
PatternMatchAs {
range: 150..151,
pattern: None,
name: Some(
Identifier {
id: "z",
range: 150..151,
},
),
},
),
],
keywords: [],
},
},
),
guard: None,