feat(engine): add pair value container and key-name affinity matching - #91
Merged
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.
Problem
pairsfield to declare key-value pair container types across grammars.What Changed
pairslist field toRulesininternal/treesitter/rules.goand configured key-value pair containers across rules files for C, C++, Go, Java, JavaScript, JSON, Lua, PHP, Python, Ruby, Rust, TSX, TypeScript, and Zig.matchPairValuesininternal/engine/matcher.goright after top-down and declaration matching. So when two key-value pairs are matched, their value children get connected automatically if their node types match and neither value node was mapped yet.matchPairValueswith key-name affinity matching so unmapped pairs fall back to matching by key label identity (getKeyLabel) and parent scope context (getParentPairKey).getKeyLabelininternal/engine/utils.goso key label extraction is shared across matchers.TestMatchPairValuesandTestMatchPairKeyNameAffinityininternal/engine/matcher_test.goand updated integration baseline test data fixtures.Visual Comparison
tests/testdata/json_schemastore_hugo_theme_config/Before
After