Fix record field and jsx props punned when with attributes #2824
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
Signed-off-by: Pedro B S Lisboa <[email protected]>
Signed-off-by: Pedro B S Lisboa <[email protected]>
anmonteiro
reviewed
Jan 25, 2025
| @@ -5239,7 +5243,8 @@ let createFormatter () = | |||
| let value_has_jsx = jsxAttrs != [] in | |||
| let nextAttr = | |||
| match expression.pexp_desc with | |||
| | Pexp_ident ident when isPunnedJsxArg lbl ident -> | |||
| | Pexp_ident ident | |||
| when isPunnedJsxArg lbl ident expression.pexp_attributes -> | |||
There was a problem hiding this comment.
you should use stdAttrs from the call to partitionAttributes above here.
anmonteiro
reviewed
Jan 25, 2025
| @@ -5260,7 +5265,9 @@ let createFormatter () = | |||
| let value_has_jsx = jsxAttrs != [] in | |||
| let nextAttr = | |||
| match expression.pexp_desc with | |||
| | Pexp_ident ident when isPunnedJsxArg lbl ident -> atom lbl | |||
| | Pexp_ident ident | |||
| when isPunnedJsxArg lbl ident expression.pexp_attributes -> | |||
anmonteiro
reviewed
Jan 25, 2025
| (* don't turn {bar: Foo.bar, baz: 1} into {bar, baz: 1}, naturally *) | ||
| | Pexp_ident { txt = Lident value; _ }, true, true | ||
| when Longident.last_exn li.txt = value -> | ||
| when Longident.last_exn li.txt = value && e.pexp_attributes = [] |
There was a problem hiding this comment.
I think we may need to partition attributes here too
anmonteiro
reviewed
Jan 25, 2025
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.
Issue #2822
Description
This PR adds validation for records fields and jsx props to avoid pun them when the have attributes