SemanticTokensVisitor: _range field doesn't need to be nullable

DustinCampbell · DustinCampbell · commit a7569f236fe1 · 2025-05-16T06:34:11.000-07:00
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/SemanticTokens/SemanticTokensVisitor.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/SemanticTokens/SemanticTokensVisitor.cs
@@ -16,13 +16,13 @@ internal sealed class SemanticTokensVisitor : SyntaxWalker
 {
     private readonly ImmutableArray<SemanticRange>.Builder _semanticRanges;
     private readonly RazorCodeDocument _razorCodeDocument;
-    private readonly TextSpan? _range;
+    private readonly TextSpan _range;
     private readonly ISemanticTokensLegendService _semanticTokensLegend;
     private readonly bool _colorCodeBackground;
 
     private bool _addRazorCodeModifier;
 
-    private SemanticTokensVisitor(ImmutableArray<SemanticRange>.Builder semanticRanges, RazorCodeDocument razorCodeDocument, TextSpan? range, ISemanticTokensLegendService semanticTokensLegend, bool colorCodeBackground)
+    private SemanticTokensVisitor(ImmutableArray<SemanticRange>.Builder semanticRanges, RazorCodeDocument razorCodeDocument, TextSpan range, ISemanticTokensLegendService semanticTokensLegend, bool colorCodeBackground)
     {
         _semanticRanges = semanticRanges;
         _razorCodeDocument = razorCodeDocument;
@@ -52,7 +52,7 @@ private void Visit(SyntaxList<RazorSyntaxNode> syntaxNodes)
 
     private bool IsInRange(TextSpan span)
     {
-        return _range is TextSpan range && range.OverlapsWith(span);
+        return _range.OverlapsWith(span);
     }
 
     public override void Visit(SyntaxNode? node)

Original file line number	Diff line number	Diff line change
`@@ -16,13 +16,13 @@ internal sealed class SemanticTokensVisitor : SyntaxWalker`
`16`	`16`	`{`
`17`	`17`	`private readonly ImmutableArray<SemanticRange>.Builder _semanticRanges;`
`18`	`18`	`private readonly RazorCodeDocument _razorCodeDocument;`
`19`		`- private readonly TextSpan? _range;`
	`19`	`+ private readonly TextSpan _range;`
`20`	`20`	`private readonly ISemanticTokensLegendService _semanticTokensLegend;`
`21`	`21`	`private readonly bool _colorCodeBackground;`
`22`	`22`
`23`	`23`	`private bool _addRazorCodeModifier;`
`24`	`24`
`25`		`- private SemanticTokensVisitor(ImmutableArray<SemanticRange>.Builder semanticRanges, RazorCodeDocument razorCodeDocument, TextSpan? range, ISemanticTokensLegendService semanticTokensLegend, bool colorCodeBackground)`
	`25`	`+ private SemanticTokensVisitor(ImmutableArray<SemanticRange>.Builder semanticRanges, RazorCodeDocument razorCodeDocument, TextSpan range, ISemanticTokensLegendService semanticTokensLegend, bool colorCodeBackground)`
`26`	`26`	`{`
`27`	`27`	`_semanticRanges = semanticRanges;`
`28`	`28`	`_razorCodeDocument = razorCodeDocument;`
`@@ -52,7 +52,7 @@ private void Visit(SyntaxList<RazorSyntaxNode> syntaxNodes)`
`52`	`52`
`53`	`53`	`private bool IsInRange(TextSpan span)`
`54`	`54`	`{`
`55`		`- return _range is TextSpan range && range.OverlapsWith(span);`
	`55`	`+ return _range.OverlapsWith(span);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public override void Visit(SyntaxNode? node)`