Filter enclosing syntactic tokens during semantic token merging#2711
Open
somiljain2006 wants to merge 2 commits into
Open
Filter enclosing syntactic tokens during semantic token merging#2711somiljain2006 wants to merge 2 commits into
somiljain2006 wants to merge 2 commits into
Conversation
somiljain2006
requested review from
ahoppen,
hamishknight and
rintaro
as code owners
Contributor
Author
Member
|
@somiljain2006 You don’t need to ping us for a review a few hours after you opened the PR. We get notifications for PRs when they are opened and will review them when we get to them. |
ahoppen
reviewed
Jul 8, 2026
Contributor
Author
Sorry I wasn't sure whether mentioning reviewers was the preferred workflow. I'll avoid pinging for reviews from now on and will wait for the normal review process. Thanks for the clarification. |
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.
Fixes #2708
Update SyntaxHighlightingTokens.mergingTokens to treat containing ranges as overlapping during token merging, allowing more specific semantic tokens to replace enclosing syntactic tokens instead of only removing tokens with identical ranges. This avoids retaining redundant syntactic tokens, such as the attribute modifier covering
@TaskLocalwhen a semantic macro token already exists for TaskLocal, while preserving the existing behavior for unrelated tokens. Add a regression test covering attached macro highlighting.