language: Improve highlight map resolution#52183
Merged
MrSubidubi merged 9 commits intomainfrom Mar 25, 2026
Merged
Conversation
Co-authored-by: MrSubidubi <dev@bahn.sh> Co-authored-by: Gaauwe Rombouts <mail@grombouts.nl>
Co-authored-by: MrSubidubi <dev@bahn.sh> Co-authored-by: Gaauwe Rombouts <mail@grombouts.nl>
Co-authored-by: Gaauwe Rombouts <mail@grombouts.nl> Co-authored-by: MrSubidubi <dev@bahn.sh>
Co-authored-by: Gaauwe Rombouts <mail@grombouts.nl> Co-authored-by: MrSubidubi <dev@bahn.sh>
📏 PR Size: 520 lines changed (Size L)Please note: this PR exceeds the 400 LOC soft limit.
|
osiewicz
approved these changes
Mar 25, 2026
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.
This PR refactors the highlight map capture name resolution to be faster and more predictable. Speficically,
function.call.whatever.jsxwill now be matched by onlyfunction,function.call,function.call.whateverandfunction.call.whatever.jsx). This matches the behavior VSCode hasThis substantially improves the performance for resolving capture names against themes. With the benchmark added here for creating the HighlightMap, we see quite some improvements:
For large themes and many capture names, the revised approach is much faster.
With that in place, we can also add better fallbacks whenever we change tokens, since e.g. a change from
@variableto@preprocwould previously cause tokens to not be highlighted at all, whereas now we can add fallbacks for such cases more efficiently. I'll add this later on to this PR.Self-Review Checklist
Release Notes:
will now be matched by onlyfunction,function.call,function.call.decoratorandfunction.call.decorator.jsx` with the most specific capture always taking precedence.