fix: inject Pos/EndPos/Tokens into Capture and TextUnmarshaler values - #470
Open
Pastalikek65 wants to merge 1 commit into
Open
fix: inject Pos/EndPos/Tokens into Capture and TextUnmarshaler values#470Pastalikek65 wants to merge 1 commit into
Pastalikek65 wants to merge 1 commit into
Conversation
User-defined capture targets that implement Capture or TextUnmarshaler never had their Pos/EndPos/Tokens fields populated, unlike struct nodes parsed via @@. Populate them at set time, mirroring strct.maybeInject*. Fixes alecthomas#132.
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
1 participant
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.
Closes #132
Pos/EndPos/Tokensare injected automatically for struct nodes parsed via@@, but user-defined capture targets implementingCaptureorencoding.TextUnmarshalernever had them populated — thePos lexer.Positionfield stayed zero (verified on master with@Ident @Ident).Changes:
nodes.go: newapplyCapturePositionhelper populatesPos,EndPosandTokenson capture targets (guarding non-struct types such astype count int), called from theCaptureandTextUnmarshalerbranches ofsetField, and per-element for[]Captureslices.parser_test.go:TestCaptureStructPositioncoveringPos,EndPosandTokenson aCapturestruct.EndPosis computed as the last captured token's position advanced by its length (byte offset, rune column) — an approximation of the next-token position the struct path uses; it doesn't account for embedded newlines in captured values.