fix: parse type arguments on tagged template call #350
+96,888
−96,530
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
A tagged template call with a generic was previously parsed as a pair of '<' and '>' binary expressions. TypeScript supports type arguments on tagged template calls (e.g. 'lorem<Ipsum>`dolor sit amet`'), so parse them properly.
sjbarag
added a commit
to sjbarag/helix
that referenced
this pull request
Nov 3, 2025
GraphQL injections previously only operated on a 'gql' tagged template
literal, but a few more options are supported by the official VSCode
'GraphQL: Syntax Highlighting' extension:
// Already supported
gql`query { foo }`;
// New
gql('query { foo }');
gql(`query { foo }`);
graphql`query { foo }`;
graphql('query { foo }');
graphql(`query { foo }`);
'#graphql query { foo }';
`#graphql query { foo }`;
/* GraphQL */ 'query { foo }';
/* GraphQL */ `query { foo }`;
Note that until a PR in tree-sitter-typescript[^1] is merged upstream
and updated here, tagged template literals with type arguments (e.g.
'gql<SomeType>`query { foo }`;') won't have a working injection.
supports helix-editor#14413
[^1]: tree-sitter/tree-sitter-typescript#350
sjbarag
added a commit
to sjbarag/helix
that referenced
this pull request
Nov 3, 2025
GraphQL injections previously only operated on a 'gql' tagged template
literal, but a few more options are supported by the official VSCode
'GraphQL: Syntax Highlighting' extension:
// Already supported
gql`query { foo }`;
// New
gql('query { foo }');
gql(`query { foo }`);
graphql`query { foo }`;
graphql('query { foo }');
graphql(`query { foo }`);
'#graphql query { foo }';
`#graphql query { foo }`;
/* GraphQL */ 'query { foo }';
/* GraphQL */ `query { foo }`;
Note that until a PR in tree-sitter-typescript[^1] is merged upstream
and updated here, tagged template literals with type arguments (e.g.
'gql<SomeType>`query { foo }`;') won't have a working injection.
supports helix-editor#14413
[^1]: tree-sitter/tree-sitter-typescript#350
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.
A tagged template call with a generic was previously parsed as a pair of '<' and '>' binary expressions. TypeScript supports type arguments on tagged template calls (e.g. 'lorem`dolor sit amet`'), so parse them properly.