Skip to content

Fix semantic tokens for fully qualified component names #12334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Copilot wants to merge 2 commits into from
Closed

Fix semantic tokens for fully qualified component names #12334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a193a3a
Initial plan
Copilot Oct 15, 2025
858aa8b
Fix fully qualified component semantic tokens
Copilot Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions ...ft.CodeAnalysis.Razor.Workspaces/SemanticTokens/AbstractRazorSemanticTokensInfoService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,19 @@ static bool TryWriteToken(
{
return false;
}

// If the previous range was from Razor and the current range is from C#,
// and the current range is contained within the previous range, skip it.
// This handles cases like fully qualified component names where Razor provides
// a single token but C# provides multiple tokens for the parts.
if (previousRange.FromRazor &&
!currentRange.FromRazor &&
previousRange.EndLine == currentRange.EndLine &&
previousRange.StartCharacter <= currentRange.StartCharacter &&
previousRange.EndCharacter >= currentRange.EndCharacter)
{
return false;
}
}
else
{
Expand Down
21 changes: 11 additions & 10 deletions src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/SemanticTokens/SemanticRange.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,17 @@ public int CompareTo(SemanticRange other)
return result;
}

// If we have ranges with the same start position, we want a Razor produced token to win over a non-Razor produced token
// This is checked before comparing end positions to ensure Razor tokens that span multiple C# tokens are processed first
if (FromRazor && !other.FromRazor)
{
return -1;
}
else if (other.FromRazor && !FromRazor)
{
return 1;
}

result = EndLine.CompareTo(other.EndLine);
if (result != 0)
{
Expand All @@ -82,16 +93,6 @@ public int CompareTo(SemanticRange other)
return result;
}

// If we have ranges that are the same, we want a Razor produced token to win over a non-Razor produced token
if (FromRazor && !other.FromRazor)
{
return -1;
}
else if (other.FromRazor && !FromRazor)
{
return 1;
}

return 0;
}

Expand Down
13 changes: 13 additions & 0 deletions ...lStudioCode.RazorExtension.Test/Endpoints/Shared/CohostSemanticTokensRangeEndpointTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,19 @@ @section MySection {
await VerifySemanticTokensAsync(input, colorBackground, miscellaneousFile, fileKind: RazorFileKind.Legacy);
}

[Theory]
[CombinatorialData]
public async Task FullyQualifiedComponent(bool colorBackground, bool miscellaneousFile)
{
var input = """
@page "/"

<Microsoft.AspNetCore.Components.Web.PageTitle>Hello</Microsoft.AspNetCore.Components.Web.PageTitle>
""";

await VerifySemanticTokensAsync(input, colorBackground, miscellaneousFile);
}

[Theory]
[CombinatorialData]
public async Task Legacy_Compatibility(bool colorBackground, bool miscellaneousFile)
Expand Down
11 changes: 11 additions & 0 deletions ...VisualStudioCode.RazorExtension.Test/TestFiles/SemanticTokens/FullyQualifiedComponent.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Line Δ, Char Δ, Length, Type, Modifier(s), Text
0 0 1 razorTransition [] [@]
0 1 4 razorDirective [] [page]
0 5 3 string [] ["/"]
2 0 1 markupTagDelimiter [] [<]
0 1 45 razorComponentElement [] [Microsoft.AspNetCore.Components.Web.PageTitle]
0 45 1 markupTagDelimiter [] [>]
0 6 1 markupTagDelimiter [] [<]
0 1 1 markupTagDelimiter [] [/]
0 1 45 razorComponentElement [] [Microsoft.AspNetCore.Components.Web.PageTitle]
0 45 1 markupTagDelimiter [] [>]
11 changes: 11 additions & 0 deletions ...ioCode.RazorExtension.Test/TestFiles/SemanticTokens/FullyQualifiedComponent_misc_file.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Line Δ, Char Δ, Length, Type, Modifier(s), Text
0 0 1 razorTransition [] [@]
0 1 4 razorDirective [] [page]
0 5 3 string [] ["/"]
2 0 1 markupTagDelimiter [] [<]
0 1 45 markupElement [] [Microsoft.AspNetCore.Components.Web.PageTitle]
0 45 1 markupTagDelimiter [] [>]
0 6 1 markupTagDelimiter [] [<]
0 1 1 markupTagDelimiter [] [/]
0 1 45 markupElement [] [Microsoft.AspNetCore.Components.Web.PageTitle]
0 45 1 markupTagDelimiter [] [>]
11 changes: 11 additions & 0 deletions ....RazorExtension.Test/TestFiles/SemanticTokens/FullyQualifiedComponent_with_background.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Line Δ, Char Δ, Length, Type, Modifier(s), Text
0 0 1 razorTransition [] [@]
0 1 4 razorDirective [] [page]
0 5 3 string [razorCode] ["/"]
2 0 1 markupTagDelimiter [] [<]
0 1 45 razorComponentElement [] [Microsoft.AspNetCore.Components.Web.PageTitle]
0 45 1 markupTagDelimiter [] [>]
0 6 1 markupTagDelimiter [] [<]
0 1 1 markupTagDelimiter [] [/]
0 1 45 razorComponentElement [] [Microsoft.AspNetCore.Components.Web.PageTitle]
0 45 1 markupTagDelimiter [] [>]
11 changes: 11 additions & 0 deletions ...nsion.Test/TestFiles/SemanticTokens/FullyQualifiedComponent_with_background_misc_file.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Line Δ, Char Δ, Length, Type, Modifier(s), Text
0 0 1 razorTransition [] [@]
0 1 4 razorDirective [] [page]
0 5 3 string [razorCode] ["/"]
2 0 1 markupTagDelimiter [] [<]
0 1 45 markupElement [] [Microsoft.AspNetCore.Components.Web.PageTitle]
0 45 1 markupTagDelimiter [] [>]
0 6 1 markupTagDelimiter [] [<]
0 1 1 markupTagDelimiter [] [/]
0 1 45 markupElement [] [Microsoft.AspNetCore.Components.Web.PageTitle]
0 45 1 markupTagDelimiter [] [>]
11 changes: 11 additions & 0 deletions ...VisualStudioCode.RazorExtension.Test/TestFiles\SemanticTokens\FullyQualifiedComponent.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Line Δ, Char Δ, Length, Type, Modifier(s), Text
0 0 1 razorTransition [] [@]
0 1 4 razorDirective [] [page]
0 5 3 string [] ["/"]
2 0 1 markupTagDelimiter [] [<]
0 1 45 razorComponentElement [] [Microsoft.AspNetCore.Components.Web.PageTitle]
0 45 1 markupTagDelimiter [] [>]
0 6 1 markupTagDelimiter [] [<]
0 1 1 markupTagDelimiter [] [/]
0 1 45 razorComponentElement [] [Microsoft.AspNetCore.Components.Web.PageTitle]
0 45 1 markupTagDelimiter [] [>]
11 changes: 11 additions & 0 deletions ...ioCode.RazorExtension.Test/TestFiles\SemanticTokens\FullyQualifiedComponent_misc_file.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Line Δ, Char Δ, Length, Type, Modifier(s), Text
0 0 1 razorTransition [] [@]
0 1 4 razorDirective [] [page]
0 5 3 string [] ["/"]
2 0 1 markupTagDelimiter [] [<]
0 1 45 markupElement [] [Microsoft.AspNetCore.Components.Web.PageTitle]
0 45 1 markupTagDelimiter [] [>]
0 6 1 markupTagDelimiter [] [<]
0 1 1 markupTagDelimiter [] [/]
0 1 45 markupElement [] [Microsoft.AspNetCore.Components.Web.PageTitle]
0 45 1 markupTagDelimiter [] [>]
11 changes: 11 additions & 0 deletions ....RazorExtension.Test/TestFiles\SemanticTokens\FullyQualifiedComponent_with_background.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Line Δ, Char Δ, Length, Type, Modifier(s), Text
0 0 1 razorTransition [] [@]
0 1 4 razorDirective [] [page]
0 5 3 string [razorCode] ["/"]
2 0 1 markupTagDelimiter [] [<]
0 1 45 razorComponentElement [] [Microsoft.AspNetCore.Components.Web.PageTitle]
0 45 1 markupTagDelimiter [] [>]
0 6 1 markupTagDelimiter [] [<]
0 1 1 markupTagDelimiter [] [/]
0 1 45 razorComponentElement [] [Microsoft.AspNetCore.Components.Web.PageTitle]
0 45 1 markupTagDelimiter [] [>]
11 changes: 11 additions & 0 deletions ...nsion.Test/TestFiles\SemanticTokens\FullyQualifiedComponent_with_background_misc_file.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Line Δ, Char Δ, Length, Type, Modifier(s), Text
0 0 1 razorTransition [] [@]
0 1 4 razorDirective [] [page]
0 5 3 string [razorCode] ["/"]
2 0 1 markupTagDelimiter [] [<]
0 1 45 markupElement [] [Microsoft.AspNetCore.Components.Web.PageTitle]
0 45 1 markupTagDelimiter [] [>]
0 6 1 markupTagDelimiter [] [<]
0 1 1 markupTagDelimiter [] [/]
0 1 45 markupElement [] [Microsoft.AspNetCore.Components.Web.PageTitle]
0 45 1 markupTagDelimiter [] [>]
Loading