Handle blank lines when classifying reference spans - #85031
Merged
dibarbet merged 1 commit intoAug 26, 2026
Conversation
Fall back to the source line start when a reference is reported on a line without non-whitespace content. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
|
Azure Pipelines: Successfully started running 2 pipeline(s). There may be pipelines that require an authorized user to comment /azp run to run. |
|
Azure Pipelines: Successfully started running 2 pipeline(s). There may be pipelines that require an authorized user to comment /azp run to run. |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates Roslyn’s reference-span classification logic to safely handle cases where a reported reference span lands on a line with no non-whitespace content (e.g., blank/whitespace-only lines), preventing a crash while producing a reasonable fallback span.
Changes:
- Update
GetLineSpanForReferenceto handleGetFirstNonWhitespacePosition()returningnullby falling back tosourceLine.Start. - Add a focused regression unit test that exercises classification when the reference is on a blank first line.
Show a summary per file
| File | Description |
|---|---|
| src/Features/Core/Portable/ClassifiedSpansAndHighlightSpanFactory.cs | Avoids null dereference when widening a reference span on blank/whitespace-only lines by falling back to the line start. |
| src/Features/Test/Classification/ClassifiedSpansAndHighlightSpanFactoryTests.cs | Adds a regression test ensuring classification on a blank line returns empty classified spans and a default highlight span (and does not throw). |
Review details
- Files reviewed: 2/2 changed files
- Comments generated: 0
- Review effort level: Lite
akhera99
approved these changes
Aug 25, 2026
dibarbet
enabled auto-merge
August 25, 2026 23:25
JoeRobich
approved these changes
Aug 26, 2026
This was referenced Aug 27, 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.
Summary
Test plan
dotnet test .\src\Features\Test\Microsoft.CodeAnalysis.Features.UnitTests.csproj --filter "FullyQualifiedName=Microsoft.CodeAnalysis.UnitTests.Classification.ClassifiedSpansAndHighlightSpanFactoryTests.ClassifyAsync_ReferenceOnBlankLine" --no-restore --verbosity minimaldotnet build .\src\Features\Core\Portable\Microsoft.CodeAnalysis.Features.csproj --no-restore --verbosity minimalFixes dotnet/vscode-csharp#9482
Microsoft Reviewers: Open in CodeFlow