typescript: Fix type import highlighting when alias is not present#47190
Merged
KyleBarton merged 1 commit intozed-industries:mainfrom Jan 29, 2026
Merged
Conversation
… not present
The existing tree-sitter queries for type imports required both name and
alias fields to match. This caused `import type { Foo }` and
`import { type Foo }` to fall back to the generic identifier/variable
highlighting instead of being colored as types.
Split the patterns to handle name and alias captures independently.
|
We require contributors to sign our Contributor License Agreement, and we don't have @purepear on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'. |
Contributor
Author
|
@cla-bot check |
|
We require contributors to sign our Contributor License Agreement, and we don't have @purepear on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'. |
|
The cla-bot has been summoned, and re-checked this pull request! |
Contributor
Author
|
@cla-bot check |
|
The cla-bot has been summoned, and re-checked this pull request! |
Collaborator
|
@purepear thanks, looks good! |
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
2 participants
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
The existing tree-sitter queries for type imports required both name and alias fields to match. This caused
import type { Foo }andimport { type Foo }to fall back to the generic identifier/variable highlighting instead of being colored as types.import type { Foo }→ NOT matched (no alias)import { type Foo }→ NOT matched (no alias)import type { Foo as Bar }→ Matched ✓import { type Foo as Bar }→ Matched ✓Solution
Split the patterns to handle name and alias captures independently.
## DisclaimerDEBUGGING AND IMPLEMENTATION WAS DONE WITH AI ASSISTANCE.THE FIX HAS NOT BEEN TESTED - I HAVE NOT COMPILED FROM SOURCERelease Notes: