Remove RemoteDocumentContext now that it's essentially useless by davidwengier · Pull Request #84330 · dotnet/roslyn

davidwengier · 2026-06-29T23:44:14Z

Follow up to the previous document cleanup PR, RemoteDocumentContext is just a DocumentUri and a RemoteDocumentSnapshot, and a bunch of methods that call through to RemoteDocumentSnapshot and cache results (which RemoteDocumentSnapshot also does), but with different names.

This PR moves the Uri property over to RemoteDocumentSnapshot, moves all calls to anything in RemoteDocumentContext onto the Snapshot property, and then finally removes RemoteDocumentContext entirely.

This was all just abstractions to enable the old language server and cohosting to exist at the same time, and have code spread across layers, so its all pretty mechanical cleanup. Commit-at-a-time review will tell the story in pieces, but not sure it's strictly necessary. Only a couple of manual commits at the end to do some obvious cleanup.

As before, if the feature branch merges before this, this can just be retargeted at main, it's not strictly "sonic".

It was only ever constructed from calling GetURI anyway

… everywhere

…dit mapping code

Copilot

Pull request overview

This change removes the RemoteDocumentContext wrapper from the Razor remote services layer by moving the host DocumentUri onto RemoteDocumentSnapshot and updating service APIs/callers to operate directly on RemoteDocumentSnapshot (and, for workspace-edit mapping, on Solution).

Changes:

Add RemoteDocumentSnapshot.Uri and update remote services/resolvers to use RemoteDocumentSnapshot instead of RemoteDocumentContext.
Change IRazorEditService.MapWorkspaceEditAsync to take a Solution and adjust callers/tests accordingly.
Delete RemoteDocumentContext and simplify/remove pass-through members that duplicated snapshot caching.

Reviewed changes

Copilot reviewed 76 out of 76 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
src/Razor/src/Razor/test/Microsoft.CodeAnalysis.Remote.Razor.UnitTests/CodeActions/HtmlCodeActionResolverTest.cs	Update test to pass `RemoteDocumentSnapshot` and new `MapWorkspaceEditAsync(Solution, …)` shape
src/Razor/src/Razor/test/Microsoft.CodeAnalysis.Remote.Razor.UnitTests/CodeActions/HtmlCodeActionProviderTest.cs	Update test mocks for `MapWorkspaceEditAsync(Solution, …)`
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/WrapWithTag/RemoteWrapWithTagService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/UriPresentation/RemoteUriPresentationService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/TypeHierarchy/RemoteTypeHierarchyService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/SpellCheck/SpellCheckService.cs	Replace context-based access with snapshot-generated output/text access
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/SpellCheck/RemoteSpellCheckService.cs	Update remote service delegate signature to snapshot
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/SpellCheck/ISpellCheckService.cs	Update interface to accept `RemoteDocumentSnapshot`
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/SpellCheck/ICSharpSpellCheckRangeProvider.cs	Update interface to accept `RemoteDocumentSnapshot`
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/SpellCheck/CSharpSpellCheckRangeProvider.cs	Update implementation to accept snapshot directly
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/SignatureHelp/RemoteSignatureHelpService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/SemanticTokens/RemoteSemanticTokensService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/SemanticTokens/RazorSemanticTokensInfoService.cs	Switch token computation/logging to snapshot and `Uri`
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/SemanticTokens/IRazorSemanticTokenInfoService.cs	Update interface to accept `RemoteDocumentSnapshot`
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/SelectionRanges/RemoteSelectionRangeService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Rename/RenameService.cs	Switch service API surface from context to snapshot
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Rename/RemoteRenameService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Rename/IRenameService.cs	Update interface to accept `RemoteDocumentSnapshot`
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RemoveAndSortUsings/RemoteRemoveAndSortUsingsService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RazorDocumentServiceBase.cs	Change base helper to create/flow `RemoteDocumentSnapshot` instead of context
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/RemoteDocumentSnapshotExtensions.cs	Update to use `ProjectSnapshot` property naming
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/RemoteDocumentSnapshot.cs	Add `Uri` to snapshot; remove redundant pass-through/caching members
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/RemoteDocumentContext.cs	Deleted obsolete wrapper type
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/NestedFiles/RemoteAddNestedFileService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/LinkedEditingRange/RemoteLinkedEditingRangeService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/InlineCompletion/RemoteInlineCompletionService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/InlayHints/RemoteInlayHintService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/HtmlDocuments/RemoteHtmlDocumentService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Hover/RemoteHoverService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/GoToImplementation/RemoteGoToImplementationService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/GoToDefinition/RemoteGoToDefinitionService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/GoToDefinition/DefinitionService.cs	Update to use `ProjectSnapshot` property naming
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Formatting/RemoteFormattingService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Formatting/RazorFormattingService.cs	Switch formatting service API to accept snapshot and use `snapshot.Uri`
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Formatting/IRazorFormattingService.cs	Update interface to accept `RemoteDocumentSnapshot`
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/FoldingRanges/RemoteFoldingRangeService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/FindAllReferences/RemoteFindAllReferencesService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/DocumentSymbols/RemoteDocumentSymbolService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/DocumentMapping/RazorEditService_WorkspaceEdit.cs	Change workspace-edit mapping API to accept `Solution`
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/DocumentMapping/IRazorEditService.cs	Update interface signature for workspace-edit mapping
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/DocumentHighlight/RemoteDocumentHighlightService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Diagnostics/RemoteDiagnosticsService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Diagnostics/RazorDiagnosticHelper.cs	Update to use `ProjectSnapshot` property naming
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/DevTools/RemoteDevToolsService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Debugging/RemoteDebugInfoService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Debugging/RemoteDataTipRangeService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Completion/RemoteCompletionService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Completion/CSharpCompletionItemFormatter.cs	Switch formatter to use snapshot (`Uri`, text/output) instead of context
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeLens/RemoteCodeLensService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/RoslynCodeActionHelpers.cs	Switch helper API from context to snapshot
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/RemoteCodeActionsService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/Razor/WrapAttributesCodeActionResolver.cs	Switch resolver signature to accept snapshot and use `snapshot.Uri`
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/Razor/SortAndConsolidateUsingsCodeActionResolver.cs	Switch resolver signature to accept snapshot and use `snapshot.Uri`
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/Razor/SimplifyTagToSelfClosingCodeActionResolver.cs	Switch resolver signature to accept snapshot and use `snapshot.Uri`
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/Razor/SimplifyFullyQualifiedComponentCodeActionResolver.cs	Switch resolver signature to accept snapshot and use `snapshot.Uri`
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/Razor/RemoveUnnecessaryDirectivesCodeActionResolver.cs	Switch resolver signature to accept snapshot and use `snapshot.Uri`
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/Razor/PromoteUsingCodeActionResolver.cs	Switch resolver signature to accept snapshot and use `snapshot.Uri`
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/Razor/IRoslynCodeActionHelpers.cs	Update interface signature to accept snapshot
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/Razor/IRazorCodeActionResolver.cs	Update interface signature to accept snapshot
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/Razor/GenerateEventHandlerCodeActionResolver.cs	Switch resolver signature to accept snapshot and use `snapshot.Uri`
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/Razor/ExtractToCssCodeActionResolver.cs	Switch resolver signature to accept snapshot and use `snapshot.Uri`
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/Razor/ExtractToComponentCodeActionResolver.cs	Switch resolver signature to accept snapshot and use `snapshot.Uri`
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/Razor/ExtractToCodeBehindCodeActionResolver.cs	Switch resolver signature to accept snapshot and use `snapshot.Uri`
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/Razor/CreateComponentCodeActionResolver.cs	Switch resolver signature to accept snapshot and use `snapshot.Uri`
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/Razor/ComponentAccessibilityCodeActionProvider.cs	Update to use `ProjectSnapshot` property naming
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/Razor/AddUsingsCodeActionResolver.cs	Switch resolver signature to accept snapshot and use `snapshot.Uri`
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/ICodeActionResolveService.cs	Update interface signature to accept snapshot
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/Html/IHtmlCodeActionResolver.cs	Update interface signature to accept snapshot
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/Html/HtmlCodeActionResolver.cs	Update resolver signature to accept snapshot
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/Html/HtmlCodeActionHelpers.cs	Pass `Solution` into `MapWorkspaceEditAsync`
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/CSharp/ICSharpCodeActionResolver.cs	Update interface signature to accept snapshot
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/CSharp/CSharpCodeActionResolver.cs	Update resolver signature to accept snapshot
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/CodeActionResolveService.cs	Switch resolve pipeline from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CallHierarchy/RemoteCallHierarchyService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/AutoInsert/RemoteAutoInsertService.cs	Switch service plumbing from context to snapshot APIs
src/Razor/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/Formatting/DocumentFormattingBenchmark.cs	Update benchmark setup to store snapshot instead of context

davidwengier · 2026-06-30T00:03:47Z

Oops. Looks like my last minute rebase might have dropped a commit.

ToddGrun · 2026-06-30T20:52:45Z

    /// Apply the edit to the specified document, get Roslyn to simplify it, and return the simplified edit
    /// </summary>
-    /// <param name="documentContext">The Razor document context for the edit</param>
+    /// <param name="documentSnapshot">The Razor document context for the edit</param>


The Razor document context for the edit<

nit: needs updating

Did this as the first commit of #84351

ToddGrun

davidwengier added 11 commits June 30, 2026 09:40

Move Uri property from DocumentContext to DocumentSnapshot

61fd275

It was only ever constructed from calling GetURI anyway

Remove unused (and almost unused) methods

b1c8ce2

Remove GetSourceTextAsync method and local storage

cdfd8ce

Remove GetSolutionSnapshot method

88e4c62

Remove GetCodeDocumentAsync method

e2b8c7b

Remove TextDocument property

7b191da

Remove RemoteDocumentContext entirely, and use RemoteDocumentSnapshot…

a76ed9c

… everywhere

Minor manual cleanup after mechanical change

644de83

Use solution as a more sensible parameter type inside the workspace e…

f7c2397

…dit mapping code

Remove unused members

96c0dcd

Remove duplicated property

d374bcc

Copilot AI review requested due to automatic review settings June 29, 2026 23:44

davidwengier requested a review from a team as a code owner June 29, 2026 23:44

Copilot started reviewing on behalf of davidwengier June 29, 2026 23:44 View session

Copilot AI reviewed Jun 29, 2026

View reviewed changes

Fix build issues and inadvertant changes

b12f0e5

dotnet-policy-service Bot added the Area-Razor label Jun 30, 2026

ToddGrun reviewed Jun 30, 2026

View reviewed changes

ToddGrun approved these changes Jun 30, 2026

View reviewed changes

davidwengier merged commit 3d36d22 into dotnet:features/sonic Jun 30, 2026
25 checks passed

davidwengier deleted the MoreDocumentCleanup branch June 30, 2026 21:47

dotnet-maestro Bot mentioned this pull request Aug 7, 2026

[main] Source code updates from dotnet/roslyn dotnet/dotnet#8179

Merged

dibarbet mentioned this pull request Aug 8, 2026

Update roslyn to 5.11.0-1.26407.4 dibarbet/vscode-csharp#19

Closed

davidwengier mentioned this pull request Aug 9, 2026

Update roslyn to 5.11.0-1.26405.8 dotnet/vscode-csharp#9656

Merged

dotnet-bot mentioned this pull request Aug 13, 2026

[Automated] PRs inserted in VS build main-12112.60 #84875

Closed

davidwengier mentioned this pull request Aug 24, 2026

Update roslyn to 5.11.0-1.26424.9 dotnet/vscode-csharp#9701

Merged

Navigation Menu

Uh oh!

Remove RemoteDocumentContext now that it's essentially useless - #84330

Remove RemoteDocumentContext now that it's essentially useless#84330
davidwengier merged 12 commits into
dotnet:features/sonicfrom
davidwengier:MoreDocumentCleanup

davidwengier commented Jun 29, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

davidwengier commented Jun 30, 2026

Uh oh!

ToddGrun Jun 30, 2026

Uh oh!

davidwengier Jul 1, 2026

Uh oh!

ToddGrun left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

davidwengier commented Jun 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

davidwengier commented Jun 30, 2026

Uh oh!

ToddGrun Jun 30, 2026

Choose a reason for hiding this comment

Uh oh!

davidwengier Jul 1, 2026

Choose a reason for hiding this comment

Uh oh!

ToddGrun left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

davidwengier commented Jun 29, 2026 •

edited

Loading