Align PNC Apply Pattern with Expr #7490
Open
Conversation
This file contains 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
smores56
requested changes
Jan 9, 2025
| @@ -108,6 +110,37 @@ where | |||
| } | |||
| } | |||
|
|
|||
| pub trait FieldValue { | |||
There was a problem hiding this comment.
It's not immediately obvious to me what this does, maybe add a doc comment?
| Mapper(&'a Loc<Field>), | ||
| } | ||
|
|
||
| pub(crate) fn fmt_record_like<'a, 'b: 'a, Field, ToSpacesAround>( |
There was a problem hiding this comment.
Eventually, it might be nice to use this for other types of collections like lists. I don't think we need to make any changes right now, but food for thought for the future.
| @@ -1702,7 +1678,13 @@ fn fmt_when<'a>( | |||
|
|
|||
| buf.spaces(1); | |||
|
|
|||
| fmt_pattern(buf, &pattern.value, indent + INDENT, Parens::NotNeeded); | |||
| let lifted = pattern_lift_spaces(buf.text.bump(), &pattern.value); | |||
|
|
|||
There was a problem hiding this comment.
Is this missing a call to format lifted.after?
| @@ -1715,7 +1697,11 @@ fn fmt_when<'a>( | |||
|
|
|||
| buf.indent(indent + INDENT); | |||
| let line_indent = buf.cur_line_indent(); | |||
| buf.push_str(" ->"); | |||
| if buf.ends_with_space() || buf.ends_with_newline() { | |||
There was a problem hiding this comment.
Pro tip: you should be able to just use buf.ensure_ends_with_whitespace(), followed by buf.push_str("->")
| /// Can only occur inside of a RecordDestructure | ||
| OptionalField(&'a str, &'a Loc<Expr<'a>>), | ||
| RecordDestructure(Collection<'a, Loc<AssignedField<'a, Pattern<'a>>>>), | ||
| ExprWrapped(Expr<'a>), |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This doesn't actually solve #7486 but it aligns things so that it can be fixed. That issue is a little contentious and based on looking at the output and not liking what it looks like without considering the original source (that source is just completely artificial and not helpful).
I think that if #7470 gets merged with this, the fuzzer will be much more stable.