Merged
Conversation
MichaReiser
reviewed
Aug 17, 2023
Member
MichaReiser
left a comment
MichaReiser
left a comment
There was a problem hiding this comment.
Thank you.
I'm not sure how well we can test this just now with most of the pattern formatting missing, but could we add a few test cases that have comments between the pattern and the name?
Contributor
PR Check ResultsBenchmarkLinuxWindows |
lkh42t
force-pushed
the
format-pattern-match-as
branch
from
2b6a0ec to
9aace89
Compare
konstin
approved these changes
Aug 21, 2023
dhruvmanila
reviewed
Aug 22, 2023
Comment on lines
+308
to
+317
| match pattern_comments: | ||
| case ( | ||
| # 1 | ||
| pattern as name # 2 | ||
| # 3 | ||
| # 4 | ||
| # 5 # 6 | ||
| # 7 | ||
| ): | ||
| pass |
Member
There was a problem hiding this comment.
This might need to be handled in a different way as there seems to be 2 entries created for PatternMatchAs node comments where the first entry contains 1, 6, 7 and the second contains 2, 3, 4, 5.
{
Node {
kind: PatternMatchAs,
range: 55..120,
source: `pattern # 2⏎`,
}: {
"leading": [
SourceComment {
text: "# 1",
position: OwnLine,
formatted: true,
},
],
"dangling": [],
"trailing": [
SourceComment {
text: "# 6",
position: EndOfLine,
formatted: true,
},
SourceComment {
text: "# 7",
position: OwnLine,
formatted: true,
},
],
},
Node {
kind: PatternMatchAs,
range: 55..62,
source: `pattern`,
}: {
"leading": [],
"dangling": [],
"trailing": [
SourceComment {
text: "# 2",
position: EndOfLine,
formatted: true,
},
SourceComment {
text: "# 3",
position: OwnLine,
formatted: true,
},
SourceComment {
text: "# 4",
position: EndOfLine,
formatted: true,
},
SourceComment {
text: "# 5",
position: OwnLine,
formatted: true,
},
],
},
}
Member
There was a problem hiding this comment.
We'll need a custom handler in placement.rs for MatchAs that assigns all comments that come after the start of the name to the MatchAs clause.
Can you add a test case with a comment between the as and the name
match pattern_comments:
case (
pattern
# 1
as # 2
# 3
name #4
# 5
):
pass
MichaReiser
reviewed
Aug 22, 2023
| .. | ||
| }) | ||
| ) { | ||
| parenthesized("(", &pattern.format(), ")").fmt(f)?; |
Member
There was a problem hiding this comment.
I expect that Black's logic is to preserve parentheses around nested patterns. But we can track this in a separate issue
charliermarsh
force-pushed
the
format-pattern-match-as
branch
from
5970b9a to
74d776e
Compare
charliermarsh
added a commit
that referenced
this pull request
Aug 23, 2023
## Summary Follows up on #6652 (comment) with some modifications to the `PatternMatchAs` comment handling. Specifically, any comments between the `as` and the end are now formatted as dangling, and we now insert some newlines in the appropriate places. ## Test Plan `cargo test`
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
5 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
Add formatting for
PatternMatchAs.This closes #6641.
Test Plan
Add tests for comments.