fix(grit): fix matching multiple args #3797
Merged
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.
Summary
We had an issue with matching function arguments in Grit queries, that prevented metavariables from matching multiple arguments. In short, the metavariable was consumed by the
JsFormalParameter
and stored inside one of its slots. This wasn't a problem if you only tried to match a single argument with no other syntax, but if you wanted the metavariable to match anything more, it wouldn't work.To fix it, I made sure
JsMetavariable
can be accepted in our grammar next toJsFormalParameter
and updated the JS parser so it's accepted there.I also extended our list handling in the bindings a bit to be more in line with how Grit's reference implementation does it. The change in
GritBinding::singleton()
seems it's actually necessary, but some of the others may not be. It's probably better this way, but we don't have the test coverage yet to say for sure 😅Test Plan
Added a test case.