Refuse to merge a forwarding node in addChild instead of dropping its redirect#164
Open
WouterGritter wants to merge 1 commit into
Open
Conversation
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
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.
CommandNode#addChildmerges onto an existing same-named child by carrying over only the command and grandchildren:The incoming node's
redirect,modifierandforksarefinal, so they're not merged, they're silently dropped. Registering a redirecting/forking literal under a name that's already present therefore yields a node that quietly loses its forwarding behavior (or, the reverse, grandchildren get merged onto an existing redirect leaf which the builder itself forbids viathen()).A genuine field-level merge isn't viable:
requirementdefaults to a freshs -> truelambda on every builder and can't be compared, so an equality-based conflict check would also break the legitimate grandchild-merge case (testAddChildMergesGrandchildren).redirect/modifier/forksare different; they default tonull/null/falseand are only set deliberately throughforward(), and the builder already treats forwarding and children as mutually exclusive (then()andforward()both throw).So
addChildnow fails fast when a merge would involve a forwarding node on either side, mirroring those existing builder guards, instead of silently discarding the config:Adding a redirect/fork as a brand-new child (the normal case) is unchanged.