Fix parsing of instantiation expressions with template literals #332
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
Fixes tree-sitter#329 The issue was that template call expressions only allowed primary_expression or new_expression as the function, but instantiation expressions like `sql<Type[]>`template`` were not supported. This change adds $.instantiation_expression to the allowed function types for template calls, enabling proper parsing of patterns like: - sql<never[]>`'[]'` - tag<string>`Hello ${name}` - func<Type[]>`SELECT * FROM table` Testing shows this resolves the parsing inconsistency where removing certain lines would cause the entire file to fail parsing.
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
Fixes #329
The parser was inconsistently handling code containing instantiation expressions followed by template literals (e.g.,
sql<never[]>`'[]'`). Removing certain lines from the code would cause the entire file to fail parsing, while keeping those lines would result in successful parsing with only minor warnings.Root Cause
The issue was in the
call_expressionrule for template calls in/common/define-grammar.js. The template call rule only allowedprimary_expressionornew_expressionas the function, butsql<never[]>is aninstantiation_expression, which wasn't included in the allowed choices.Solution
Modified the template call rule to include
$.instantiation_expression: