fix: merge attributes before passing them upstream #87
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
rzhao271
force-pushed
the
rzhao271/jsx-merge-fix
branch
from
45775b7 to
685da1e
Compare
connor4312
approved these changes
Jun 22, 2023
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Ref downstream PR microsoft/vscode#185607
Emmet added some new object properties, but the upstream merging algorithm makes it so that if a user only defines some keys to customize, the other keys within that same property are erased.
This PR works around the issue by merging the properties with the upstream defaults, and then passing in that entire object upstream so that the default object gets overridden with the larger object.