Introduce AST nodes for PatternMatchClass arguments#6881
Merged
charliermarsh merged 1 commit intomainfrom Aug 26, 2023
Merged
Conversation
charliermarsh
commented
Aug 25, 2023
| CommentPlacement::Default(comment) | ||
| } | ||
|
|
||
| CommentPlacement::Default(comment) |
Member
Author
There was a problem hiding this comment.
This gets dramatically simplified.
Member
Author
There was a problem hiding this comment.
Anything that deletes code is a "dramatic simplification" for me
charliermarsh
force-pushed
the
charlie/pattern-ast
branch
from
28e9b61 to
d6f2d14
Compare
charliermarsh
commented
Aug 25, 2023
| use crate::FormatNodeRule; | ||
|
|
||
| #[derive(Default)] | ||
| pub struct FormatPatternArguments; |
Member
Author
There was a problem hiding this comment.
This is very, very similar to arguments.rs, but it's difficult to share much code.
charliermarsh
commented
Aug 25, 2023
| } | ||
| } | ||
| OptionalParentheses::Never | ||
| } |
Member
Author
There was a problem hiding this comment.
This specific logic is way simpler now -- we only care if there are dangling comments, not where they are, since these are dangling comments between Point2D and its arguments.
Member
Author
|
Adding these AST nodes does require a bunch of boilerplate, but I think it's worth it for the improved representation. |
charliermarsh
force-pushed
the
charlie/pattern-ast
branch
from
d6f2d14 to
0ccb998
Compare
charliermarsh
force-pushed
the
charlie/pattern-ast
branch
from
0ccb998 to
9d3ad6a
Compare
Contributor
PR Check ResultsEcosystem✅ ecosystem check detected no changes. |
charliermarsh
force-pushed
the
charlie/pattern-ast
branch
from
9d3ad6a to
6b3ecfb
Compare
MichaReiser
approved these changes
Aug 26, 2023
Member
MichaReiser
left a comment
MichaReiser
left a comment
There was a problem hiding this comment.
Can you verify that the following continues to parse successfully (maybe add a test?)
match a:
case Point2D((0), 0, x=(1), y=2):
...| CommentPlacement::Default(comment) | ||
| } | ||
|
|
||
| CommentPlacement::Default(comment) |
charliermarsh
force-pushed
the
charlie/pattern-ast
branch
from
6b3ecfb to
3b31526
Compare
CodSpeed Performance ReportMerging #6881 will create unknown performance changesComparing Summary
Benchmarks breakdown
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This PR introduces two new AST nodes to improve the representation of
PatternMatchClass. As a reminder,PatternMatchClasslooks like this:Historically, this was represented as a vector of patterns (for the
0, 0portion) and parallel vectors of keyword names (forxandy) and values (for1and2). 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,PatternArgumentswould be(0, 0, x=1, y=2).Secondly, we now have a
PatternKeywordnode forx=1andy=2. This is much more similar to the howKeywordis represented withinArgumentsfor call expressions.Closes #6866.
Closes #6880.