From 6f2390c74f4c76cddd00bb3ec19ea58dc0340600 Mon Sep 17 00:00:00 2001
From: David Wengier <david.wengier@microsoft.com>
Date: Fri, 13 Jun 2025 12:22:13 +1000
Subject: [PATCH 01/10] Don't hard code the complex edit command name

---
 .../Completion/Delegation/DelegatedCompletionHelper.cs       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/Delegation/DelegatedCompletionHelper.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/Delegation/DelegatedCompletionHelper.cs
index a3714ee0783..e5f2d965725 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/Delegation/DelegatedCompletionHelper.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/Delegation/DelegatedCompletionHelper.cs
@@ -10,6 +10,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Syntax;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
 using Microsoft.CodeAnalysis.Razor.Formatting;
 using Microsoft.CodeAnalysis.Razor.Logging;
@@ -285,7 +286,7 @@ public static async Task<VSInternalCompletionItem> FormatCSharpCompletionItemAsy
     {
         // In VS Code, Roslyn does resolve via a custom command. Thats fine, but we have to modify the text edit sitting within it,
         // rather than the one LSP knows about.
-        if (resolvedCompletionItem.Command is { CommandIdentifier: "roslyn.client.completionComplexEdit", Arguments: var args })
+        if (resolvedCompletionItem.Command is { CommandIdentifier: Constants.CompleteComplexEditCommand, Arguments: var args })
         {
             if (args is [TextDocumentIdentifier, TextEdit complexEdit, _, int nextCursorPosition])
             {
@@ -310,7 +311,7 @@ public static async Task<VSInternalCompletionItem> FormatCSharpCompletionItemAsy
             }
             else
             {
-                logger.LogError($"Unexpected arguments for command '{resolvedCompletionItem.Command.CommandIdentifier}': Expected: [TextDocumentIdentifier, TextEdit, _, int], Actual: {GetArgumentTypesLogString(resolvedCompletionItem)}");
+                logger.LogError($"Unexpected arguments for command '{Constants.CompleteComplexEditCommand}': Expected: [TextDocumentIdentifier, TextEdit, _, int], Actual: {GetArgumentTypesLogString(resolvedCompletionItem)}");
                 Debug.Fail("Unexpected arguments for Roslyn complex edit command. Have they changed things?");
             }
         }

From d7b2933fcdaa4884ccacfed78e85a07263584f85 Mon Sep 17 00:00:00 2001
From: David Wengier <david.wengier@microsoft.com>
Date: Fri, 13 Jun 2025 12:22:30 +1000
Subject: [PATCH 02/10] Specify formatting options instead of using string
 replacement

---
 .../CohostDocumentFormattingEndpoint.cs       |  2 +
 .../Formatting/CSharpFormatter.cs             | 21 ++++++++--
 .../Formatting/Passes/CSharpFormattingPass.cs | 15 ++++++-
 .../Passes/New/CSharpFormattingPass.cs        | 15 +++----
 .../Formatting/RazorFormattingService.cs      | 16 +++++---
 .../DocumentFormattingTest.cs                 | 39 ++++++++-----------
 .../Formatting_NetFx/FormattingTestBase.cs    | 10 ++---
 .../TestRazorFormattingService.cs             |  9 ++---
 .../Cohost/FormattingTestBase.cs              |  8 ++--
 9 files changed, 75 insertions(+), 60 deletions(-)

diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Formatting/CohostDocumentFormattingEndpoint.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Formatting/CohostDocumentFormattingEndpoint.cs
index 2143bde024a..1f3c9545a44 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Formatting/CohostDocumentFormattingEndpoint.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Formatting/CohostDocumentFormattingEndpoint.cs
@@ -79,6 +79,8 @@ public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilitie
 
         var options = RazorFormattingOptions.From(request.Options, _clientSettingsManager.GetClientSettings().AdvancedSettings.CodeBlockBraceOnNextLine);
 
+        
+
         _logger.LogDebug($"Calling OOP with the {htmlChanges.Length} html edits, so it can fill in the rest");
         var remoteResult = await _remoteServiceInvoker.TryInvokeAsync<IRemoteFormattingService, ImmutableArray<TextChange>>(
             razorDocument.Project.Solution,
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/CSharpFormatter.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/CSharpFormatter.cs
index 136409550a4..c848d92b529 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/CSharpFormatter.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/CSharpFormatter.cs
@@ -11,6 +11,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
 using Microsoft.CodeAnalysis.Text;
@@ -23,14 +24,20 @@ internal sealed class CSharpFormatter(IDocumentMappingService documentMappingSer
 
     private readonly IDocumentMappingService _documentMappingService = documentMappingService;
 
-    public async Task<ImmutableArray<TextChange>> FormatAsync(HostWorkspaceServices hostWorkspaceServices, Document csharpDocument, FormattingContext context, LinePositionSpan spanToFormat, CancellationToken cancellationToken)
+    public async Task<ImmutableArray<TextChange>> FormatAsync(
+        HostWorkspaceServices hostWorkspaceServices,
+        Document csharpDocument,
+        FormattingContext context,
+        LinePositionSpan spanToFormat,
+        RazorCSharpSyntaxFormattingOptions? formattingOptionsOverride,
+        CancellationToken cancellationToken)
     {
         if (!_documentMappingService.TryMapToGeneratedDocumentRange(context.CodeDocument.GetRequiredCSharpDocument(), spanToFormat, out var projectedSpan))
         {
             return [];
         }
 
-        var edits = await GetFormattingEditsAsync(hostWorkspaceServices, csharpDocument, projectedSpan, context.Options.ToIndentationOptions(), cancellationToken).ConfigureAwait(false);
+        var edits = await GetFormattingEditsAsync(hostWorkspaceServices, csharpDocument, projectedSpan, context.Options.ToIndentationOptions(), formattingOptionsOverride, cancellationToken).ConfigureAwait(false);
         var mappedEdits = MapEditsToHostDocument(context.CodeDocument, edits);
         return mappedEdits;
     }
@@ -56,14 +63,20 @@ private ImmutableArray<TextChange> MapEditsToHostDocument(RazorCodeDocument code
         return actualEdits.ToImmutableArray();
     }
 
-    private static async Task<ImmutableArray<TextChange>> GetFormattingEditsAsync(HostWorkspaceServices hostWorkspaceServices, Document csharpDocument, LinePositionSpan projectedSpan, RazorIndentationOptions indentationOptions, CancellationToken cancellationToken)
+    private static async Task<ImmutableArray<TextChange>> GetFormattingEditsAsync(
+        HostWorkspaceServices hostWorkspaceServices,
+        Document csharpDocument,
+        LinePositionSpan projectedSpan,
+        RazorIndentationOptions indentationOptions,
+        RazorCSharpSyntaxFormattingOptions? formattingOptionsOverride,
+        CancellationToken cancellationToken)
     {
         var root = await csharpDocument.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
         var csharpSourceText = await csharpDocument.GetTextAsync(cancellationToken).ConfigureAwait(false);
         var spanToFormat = csharpSourceText.GetTextSpan(projectedSpan);
         Assumes.NotNull(root);
 
-        var changes = RazorCSharpFormattingInteractionService.GetFormattedTextChanges(hostWorkspaceServices, root, spanToFormat, indentationOptions, cancellationToken);
+        var changes = RazorCSharpFormattingInteractionService.GetFormattedTextChanges(hostWorkspaceServices, root, spanToFormat, indentationOptions, formattingOptionsOverride, cancellationToken);
         return changes.ToImmutableArray();
     }
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpFormattingPass.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpFormattingPass.cs
index 6e53d1211ef..afc82ac6435 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpFormattingPass.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpFormattingPass.cs
@@ -7,6 +7,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.PooledObjects;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
 using Microsoft.CodeAnalysis.Razor.Logging;
@@ -27,6 +28,8 @@ internal sealed class CSharpFormattingPass(
     private readonly CSharpFormatter _csharpFormatter = new(documentMappingService);
     private readonly ILogger _logger = loggerFactory.GetOrCreateLogger<CSharpFormattingPass>();
 
+    private RazorCSharpSyntaxFormattingOptions? _csharpSyntaxFormattingOptionsOverride;
+
     protected async override Task<ImmutableArray<TextChange>> ExecuteCoreAsync(FormattingContext context, RoslynWorkspaceHelper roslynWorkspaceHelper, ImmutableArray<TextChange> changes, CancellationToken cancellationToken)
     {
         // Apply previous edits if any.
@@ -87,10 +90,20 @@ private async Task<ImmutableArray<TextChange>> FormatCSharpAsync(FormattingConte
             // These should already be remapped.
             var spanToFormat = sourceText.GetLinePositionSpan(span);
 
-            var changes = await _csharpFormatter.FormatAsync(hostWorkspaceServices, csharpDocument, context, spanToFormat, cancellationToken).ConfigureAwait(false);
+            var changes = await _csharpFormatter.FormatAsync(hostWorkspaceServices, csharpDocument, context, spanToFormat, _csharpSyntaxFormattingOptionsOverride, cancellationToken).ConfigureAwait(false);
             csharpChanges.AddRange(changes.Where(e => spanToFormat.Contains(sourceText.GetLinePositionSpan(e.Span))));
         }
 
         return csharpChanges.ToImmutable();
     }
+
+    internal TestAccessor GetTestAccessor() => new TestAccessor(this);
+
+    internal readonly struct TestAccessor(CSharpFormattingPass instance)
+    {
+        public void SetCSharpSyntaxFormattingOptionsOverride(RazorCSharpSyntaxFormattingOptions? optionsOverride)
+        {
+            instance._csharpSyntaxFormattingOptionsOverride = optionsOverride;
+        }
+    }
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/New/CSharpFormattingPass.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/New/CSharpFormattingPass.cs
index f26246d3d5b..74ae444cdb7 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/New/CSharpFormattingPass.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/New/CSharpFormattingPass.cs
@@ -10,6 +10,7 @@
 using Microsoft.AspNetCore.Razor.PooledObjects;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
 using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.CodeAnalysis.Text;
@@ -21,7 +22,7 @@ internal sealed partial class CSharpFormattingPass(IHostServicesProvider hostSer
     private readonly ILogger _logger = loggerFactory.GetOrCreateLogger<CSharpFormattingPass>();
     private readonly IHostServicesProvider _hostServicesProvider = hostServicesProvider;
 
-    private Func<SourceText, SourceText>? _formattedCSharpDocumentModifierFunc = null;
+    private RazorCSharpSyntaxFormattingOptions? _csharpSyntaxFormattingOptionsOverride;
 
     public async Task<ImmutableArray<TextChange>> ExecuteAsync(FormattingContext context, ImmutableArray<TextChange> changes, CancellationToken cancellationToken)
     {
@@ -38,12 +39,6 @@ public async Task<ImmutableArray<TextChange>> ExecuteAsync(FormattingContext con
         var formattedCSharpText = await FormatCSharpAsync(generatedCSharpText, context.Options.ToIndentationOptions(), cancellationToken).ConfigureAwait(false);
         _logger.LogTestOnly($"Formatted generated C# document:\r\n{formattedCSharpText}");
 
-        if (_formattedCSharpDocumentModifierFunc is { } func)
-        {
-            formattedCSharpText = func(formattedCSharpText);
-            _logger.LogTestOnly($"Formatted generated C# document (after func):\r\n{formattedCSharpText}");
-        }
-
         // We now have a formatted C# document, and an original document, but we can't just apply the changes to the original
         // document as they come from very different places. What we want to do is go through each line of the generated document,
         // take the indentation that is in it, and apply it to the original document, and then take any formatting changes
@@ -211,7 +206,7 @@ private async Task<SourceText> FormatCSharpAsync(SourceText generatedCSharpText,
 
         var tree = CSharpSyntaxTree.ParseText(generatedCSharpText, cancellationToken: cancellationToken);
         var csharpRoot = await tree.GetRootAsync(cancellationToken).ConfigureAwait(false);
-        var csharpChanges = RazorCSharpFormattingInteractionService.GetFormattedTextChanges(helper.HostWorkspaceServices, csharpRoot, csharpRoot.FullSpan, options, cancellationToken);
+        var csharpChanges = RazorCSharpFormattingInteractionService.GetFormattedTextChanges(helper.HostWorkspaceServices, csharpRoot, csharpRoot.FullSpan, options, _csharpSyntaxFormattingOptionsOverride, cancellationToken);
 
         return generatedCSharpText.WithChanges(csharpChanges);
     }
@@ -224,9 +219,9 @@ internal static string GetFormattingDocumentContentsForSyntaxVisualizer(RazorCod
 
     internal readonly struct TestAccessor(CSharpFormattingPass instance)
     {
-        public void SetFormattedCSharpDocumentModifierFunc(Func<SourceText, SourceText> func)
+        public void SetCSharpSyntaxFormattingOptionsOverride(RazorCSharpSyntaxFormattingOptions? optionsOverride)
         {
-            instance._formattedCSharpDocumentModifierFunc = func;
+            instance._csharpSyntaxFormattingOptionsOverride = optionsOverride;
         }
     }
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/RazorFormattingService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/RazorFormattingService.cs
index 07b64d37d78..bc44ebdca93 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/RazorFormattingService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/RazorFormattingService.cs
@@ -5,13 +5,13 @@
 using System.Collections.Frozen;
 using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Diagnostics;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.PooledObjects;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
 using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
@@ -397,13 +397,17 @@ public void SetDebugAssertsEnabled(bool debugAssertsEnabled)
             contentValidationPass.DebugAssertsEnabled = debugAssertsEnabled;
         }
 
-        public void SetFormattedCSharpDocumentModifierFunc(Func<SourceText, SourceText> func)
+        public void SetCSharpSyntaxFormattingOptionsOverride(RazorCSharpSyntaxFormattingOptions? optionsOverride)
         {
-            // This is only valid for the new formatting engine, so a test that sets it for the old formatter is probably written incorrectly.
-            Debug.Assert(service._languageServerFeatureOptions.UseNewFormattingEngine);
+            if (service._documentFormattingPasses.OfType<CSharpFormattingPass>().SingleOrDefault() is { } pass)
+            {
+                pass.GetTestAccessor().SetCSharpSyntaxFormattingOptionsOverride(optionsOverride);
+            }
 
-            var pass = service._documentFormattingPasses.OfType<New.CSharpFormattingPass>().Single();
-            pass.GetTestAccessor().SetFormattedCSharpDocumentModifierFunc(func);
+            if (service._documentFormattingPasses.OfType<New.CSharpFormattingPass>().SingleOrDefault() is { } newPass)
+            {
+                newPass.GetTestAccessor().SetCSharpSyntaxFormattingOptionsOverride(optionsOverride);
+            }
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/DocumentFormattingTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/DocumentFormattingTest.cs
index 898d8232a06..114c22e29ff 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/DocumentFormattingTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/DocumentFormattingTest.cs
@@ -1,12 +1,12 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
-using System.Text.RegularExpressions;
+using System;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Test.Common;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
 using Microsoft.CodeAnalysis.Razor.Formatting;
-using Microsoft.CodeAnalysis.Text;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -30,7 +30,7 @@ await RunFormattingTestAsync(
             expected: "");
     }
 
-    [FormattingTestFact(SkipOldFormattingEngine = true)]
+    [FormattingTestFact]
     public async Task RoslynFormatBracesAsKandR()
     {
         // To format code blocks we emit a class so that class members are parsed properly by Roslyn, and ignore
@@ -66,16 +66,13 @@ public void Bar() {
                     }
                 }
                 """,
-            // I'm so sorry, but I could not find any way to change Roslyn formatting options from our test infra. Forgive my hacky sins
-            csharpModifierFunc: formattedCSharpText => SourceText.From(
-                Regex.Replace(
-                    formattedCSharpText.ToString(),
-                    @"(class|void) ([\S]+)[\s]+{",
-                    "$1 $2 {"
-                )));
+            formattingOptionsOverride: new RazorCSharpSyntaxFormattingOptions() with
+            {
+                NewLines = RazorNewLinePlacement.None
+            });
     }
 
-    [FormattingTestFact(SkipOldFormattingEngine = true)]
+    [FormattingTestFact]
     public async Task PropertyShrunkToOneLine()
     {
         await RunFormattingTestAsync(
@@ -90,20 +87,16 @@ public string Name
                 """,
             expected: """
                 @code {
-                    public string Name { get; set; }
+                    public string Name {
+                        get;
+                        set;
+                    }
                 }
                 """,
-            // I'm so sorry, but I could not find any way to change Roslyn formatting options from our test infra. Forgive my hacky sins
-            csharpModifierFunc: formattedCSharpText => SourceText.From(
-                formattedCSharpText.ToString().Replace(
-                    """
-                    public string Name
-                        {
-                            get;
-                            set;
-                        }
-                    """,
-                    "public string Name { get; set; }")));
+            formattingOptionsOverride: new RazorCSharpSyntaxFormattingOptions() with
+            {
+                NewLines = RazorNewLinePlacement.None
+            });
     }
 
     [FormattingTestFact]
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingTestBase.cs
index 48a8a13ef9d..b83ba20bfe5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingTestBase.cs
@@ -19,7 +19,7 @@
 using Microsoft.AspNetCore.Razor.Threading;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.Razor;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
 using Microsoft.CodeAnalysis.Razor.Formatting;
 using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.ProjectEngineHost;
@@ -66,13 +66,13 @@ private protected async Task RunFormattingTestAsync(
         bool codeBlockBraceOnNextLine = false,
         bool inGlobalNamespace = false,
         bool debugAssertsEnabled = true,
-        Func<SourceText, SourceText>? csharpModifierFunc = null)
+        RazorCSharpSyntaxFormattingOptions? formattingOptionsOverride = null)
     {
         (input, expected) = ProcessFormattingContext(input, expected);
 
         var razorLSPOptions = RazorLSPOptions.Default with { CodeBlockBraceOnNextLine = codeBlockBraceOnNextLine };
 
-        await RunFormattingTestInternalAsync(input, expected, tabSize, insertSpaces, fileKind, tagHelpers, allowDiagnostics, razorLSPOptions, inGlobalNamespace, debugAssertsEnabled, csharpModifierFunc);
+        await RunFormattingTestInternalAsync(input, expected, tabSize, insertSpaces, fileKind, tagHelpers, allowDiagnostics, razorLSPOptions, inGlobalNamespace, debugAssertsEnabled, formattingOptionsOverride);
     }
 
     private async Task RunFormattingTestInternalAsync(
@@ -86,7 +86,7 @@ private async Task RunFormattingTestInternalAsync(
         RazorLSPOptions? razorLSPOptions,
         bool inGlobalNamespace,
         bool debugAssertsEnabled,
-        Func<SourceText, SourceText>? csharpModifierFunc)
+        RazorCSharpSyntaxFormattingOptions? formattingOptionsOverride)
     {
         // Arrange
         var fileKindValue = fileKind ?? RazorFileKind.Component;
@@ -113,7 +113,7 @@ private async Task RunFormattingTestInternalAsync(
 
         var languageServerFeatureOptions = new TestLanguageServerFeatureOptions(useNewFormattingEngine: _context.UseNewFormattingEngine);
 
-        var formattingService = await TestRazorFormattingService.CreateWithFullSupportAsync(LoggerFactory, codeDocument, razorLSPOptions, languageServerFeatureOptions, debugAssertsEnabled, csharpModifierFunc);
+        var formattingService = await TestRazorFormattingService.CreateWithFullSupportAsync(LoggerFactory, codeDocument, razorLSPOptions, languageServerFeatureOptions, debugAssertsEnabled, formattingOptionsOverride);
         var documentContext = new DocumentContext(uri, documentSnapshot, projectContext: null);
 
         var client = new FormattingLanguageServerClient(_htmlFormattingService, LoggerFactory);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/TestRazorFormattingService.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/TestRazorFormattingService.cs
index c5d3c78a725..6e3877e60f4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/TestRazorFormattingService.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/TestRazorFormattingService.cs
@@ -8,10 +8,10 @@
 using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
 using Microsoft.AspNetCore.Razor.Test.Common.LanguageServer;
 using Microsoft.AspNetCore.Razor.Test.Common.Workspaces;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
 using Microsoft.CodeAnalysis.Razor.Formatting;
 using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
-using Microsoft.CodeAnalysis.Text;
 using Moq;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.Formatting;
@@ -24,7 +24,7 @@ public static async Task<IRazorFormattingService> CreateWithFullSupportAsync(
         RazorLSPOptions? razorLSPOptions = null,
         LanguageServerFeatureOptions? languageServerFeatureOptions = null,
         bool debugAssertsEnabled = false,
-        Func<SourceText, SourceText>? csharpModifierFunc = null)
+        RazorCSharpSyntaxFormattingOptions? formattingOptionsOverride = null)
     {
         codeDocument ??= TestRazorCodeDocument.CreateEmpty();
 
@@ -50,10 +50,7 @@ public static async Task<IRazorFormattingService> CreateWithFullSupportAsync(
         var service = new RazorFormattingService(mappingService, hostServicesProvider, languageServerFeatureOptions, loggerFactory);
         var accessor = service.GetTestAccessor();
         accessor.SetDebugAssertsEnabled(debugAssertsEnabled);
-        if (csharpModifierFunc is not null)
-        {
-            accessor.SetFormattedCSharpDocumentModifierFunc(csharpModifierFunc);
-        }
+        accessor.SetCSharpSyntaxFormattingOptionsOverride(formattingOptionsOverride);
 
         return service;
     }
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/FormattingTestBase.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/FormattingTestBase.cs
index e3fb7f1f28b..999a6c4a8b0 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/FormattingTestBase.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/FormattingTestBase.cs
@@ -9,6 +9,7 @@
 using Microsoft.AspNetCore.Razor.Test.Common;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
 using Microsoft.CodeAnalysis.Razor.Formatting;
 using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.Remote;
@@ -45,7 +46,7 @@ private protected async Task RunFormattingTestAsync(
         int tabSize = 4,
         bool allowDiagnostics = false,
         bool debugAssertsEnabled = true,
-        Func<SourceText, SourceText>? csharpModifierFunc = null)
+        RazorCSharpSyntaxFormattingOptions? formattingOptionsOverride = null)
     {
         (input, expected) = ProcessFormattingContext(input, expected);
 
@@ -65,10 +66,7 @@ private protected async Task RunFormattingTestAsync(
         var formattingService = (RazorFormattingService)OOPExportProvider.GetExportedValue<IRazorFormattingService>();
         var accessor = formattingService.GetTestAccessor();
         accessor.SetDebugAssertsEnabled(debugAssertsEnabled);
-        if (csharpModifierFunc is not null)
-        {
-            accessor.SetFormattedCSharpDocumentModifierFunc(csharpModifierFunc);
-        }
+        accessor.SetCSharpSyntaxFormattingOptionsOverride(formattingOptionsOverride);
 
         var generatedHtml = await RemoteServiceInvoker.TryInvokeAsync<IRemoteHtmlDocumentService, string?>(document.Project.Solution,
             (service, solutionInfo, ct) => service.GetHtmlDocumentTextAsync(solutionInfo, document.Id, ct),

From f15257da825256402ca42f6299bc969282206679 Mon Sep 17 00:00:00 2001
From: David Wengier <david.wengier@microsoft.com>
Date: Fri, 13 Jun 2025 12:24:11 +1000
Subject: [PATCH 03/10] Update
 src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Formatting/CohostDocumentFormattingEndpoint.cs

---
 .../Formatting/CohostDocumentFormattingEndpoint.cs              | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Formatting/CohostDocumentFormattingEndpoint.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Formatting/CohostDocumentFormattingEndpoint.cs
index 1f3c9545a44..2143bde024a 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Formatting/CohostDocumentFormattingEndpoint.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Formatting/CohostDocumentFormattingEndpoint.cs
@@ -79,8 +79,6 @@ public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilitie
 
         var options = RazorFormattingOptions.From(request.Options, _clientSettingsManager.GetClientSettings().AdvancedSettings.CodeBlockBraceOnNextLine);
 
-        
-
         _logger.LogDebug($"Calling OOP with the {htmlChanges.Length} html edits, so it can fill in the rest");
         var remoteResult = await _remoteServiceInvoker.TryInvokeAsync<IRemoteFormattingService, ImmutableArray<TextChange>>(
             razorDocument.Project.Solution,

From 2b94c905a98aaf9c503cf4b687a555f6351815d9 Mon Sep 17 00:00:00 2001
From: David Wengier <david.wengier@microsoft.com>
Date: Tue, 17 Jun 2025 07:28:55 +1000
Subject: [PATCH 04/10] Bump Roslyn

---
 eng/Version.Details.xml | 84 ++++++++++++++++++++---------------------
 eng/Versions.props      | 41 ++++++++++----------
 2 files changed, 60 insertions(+), 65 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f9e9665f530..f6cfc32f699 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -2,89 +2,85 @@
 <Dependencies>
   <Source Uri="https://github.com/dotnet/dotnet" Mapping="razor" Sha="f5705c8f4c5079bba77bae8698ba1583bde0388c" BarId="269610" />
   <ProductDependencies>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25230.6">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="5.0.0-1.25316.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
+      <Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="5.0.0-1.25230.6">
+    <Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="5.0.0-1.25316.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
+      <Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Common" Version="5.0.0-1.25230.6">
+    <Dependency Name="Microsoft.CodeAnalysis.Common" Version="5.0.0-1.25316.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
+      <Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-1.25230.6">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-1.25316.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
+      <Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="5.0.0-1.25230.6">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="5.0.0-1.25316.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
+      <Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.0.0-1.25230.6">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="5.0.0-1.25316.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
+      <Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-1.25230.6">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.0.0-1.25316.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
+      <Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.0.0-1.25230.6">
+    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.0.0-1.25316.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
+      <Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="5.0.0-1.25230.6">
+    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="5.0.0-1.25316.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
+      <Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.0.0-1.25230.6">
+    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.0.0-1.25316.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
+      <Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="5.0.0-1.25230.6">
+    <Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="5.0.0-1.25316.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
+      <Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="5.0.0-1.25230.6">
+    <Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="5.0.0-1.25316.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
+      <Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="5.0.0-1.25230.6">
+    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0-1.25316.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
+      <Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.0.0-1.25230.6">
+    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-1.25316.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
+      <Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="5.0.0-1.25230.6">
+    <Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.0.0-1.25316.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
+      <Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.0.0-1.25230.6">
+    <Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="5.0.0-1.25316.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
+      <Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="5.0.0-1.25230.6">
+    <Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" Version="5.0.0-1.25316.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
+      <Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" Version="5.0.0-1.25230.6">
+    <Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" Version="5.0.0-1.25316.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
+      <Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" Version="5.0.0-1.25230.6">
+    <Dependency Name="Microsoft.CodeAnalysis.LanguageServer.Protocol" Version="5.0.0-1.25316.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
+      <Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.LanguageServer.Protocol" Version="5.0.0-1.25230.6">
+    <Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.0.0-1.25316.1">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.0.0-1.25230.6">
-      <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>ded867328249b5a9b9e6e29e3f07abc19111f5d1</Sha>
+      <Sha>e15bc0a7eb664d20e7237daef7ab6b76da6c16cb</Sha>
     </Dependency>
     <Dependency Name="Microsoft.CodeAnalysis.Analyzers" Version="3.12.0-beta1.25230.6">
       <Uri>https://github.com/dotnet/roslyn</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 5f6f276d9cc..18797452b2d 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -48,27 +48,26 @@
   -->
   <PropertyGroup Label="Automated">
     <MicrosoftCodeAnalysisAnalyzersPackageVersion>3.12.0-beta1.25230.6</MicrosoftCodeAnalysisAnalyzersPackageVersion>
-    <MicrosoftNetCompilersToolsetPackageVersion>5.0.0-1.25230.6</MicrosoftNetCompilersToolsetPackageVersion>
-    <MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
-    <MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>5.0.0-1.25230.6</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
-    <MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>
-    <MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>
-    <MicrosoftCodeAnalysisCommonPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisCommonPackageVersion>
-    <MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisCSharpPackageVersion>
-    <MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
-    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
-    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
-    <MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
-    <MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
-    <MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
-    <MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
-    <MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>
-    <MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
-    <MicrosoftCodeAnalysisTestUtilitiesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
-    <MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
-    <MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
-    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-1.25230.6</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
-    <MicrosoftVisualStudioLanguageServicesPackageVersion>5.0.0-1.25230.6</MicrosoftVisualStudioLanguageServicesPackageVersion>
+    <MicrosoftNetCompilersToolsetPackageVersion>5.0.0-1.25316.1</MicrosoftNetCompilersToolsetPackageVersion>
+    <MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
+    <MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>5.0.0-1.25316.1</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
+    <MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion>
+    <MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion>
+    <MicrosoftCodeAnalysisCommonPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisCommonPackageVersion>
+    <MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisCSharpPackageVersion>
+    <MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
+    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
+    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
+    <MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
+    <MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
+    <MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
+    <MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisLanguageServerProtocolPackageVersion>
+    <MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
+    <MicrosoftCodeAnalysisTestUtilitiesPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
+    <MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
+    <MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
+    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.0.0-1.25316.1</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
+    <MicrosoftVisualStudioLanguageServicesPackageVersion>5.0.0-1.25316.1</MicrosoftVisualStudioLanguageServicesPackageVersion>
     <!--
       Exception - Microsoft.Extensions.ObjectPool and System.Collections.Immutable packages are not updated by automation,
       but are present in Version.Details.xml for source-build PVP flow. See the comment in Version.Details.xml for more information.

From 97a80cf6c339e544c61961e8621169624cc0a1ec Mon Sep 17 00:00:00 2001
From: David Wengier <david.wengier@microsoft.com>
Date: Tue, 17 Jun 2025 07:28:59 +1000
Subject: [PATCH 05/10] Fix build

---
 Directory.Packages.props                                      | 1 -
 .../AssemblyCodeBases.cs                                      | 1 -
 .../Microsoft.VisualStudio.RazorExtension.Dependencies.csproj | 2 --
 .../Microsoft.AspNetCore.Razor.Test.Common.Tooling.csproj     | 4 ++--
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 4afba019303..e866d0a1f53 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -42,7 +42,6 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.EditorFeatures" Version="$(MicrosoftCodeAnalysisEditorFeaturesPackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="$(MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="$(MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion)" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="$(MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="$(MicrosoftCodeAnalysisExternalAccessFSharpVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" Version="$(MicrosoftCodeAnalysisExternalAccessRazorEditorFeaturesPackageVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" Version="$(MicrosoftCodeAnalysisExternalAccessRazorFeaturesPackageVersion)" />
diff --git a/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/AssemblyCodeBases.cs b/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/AssemblyCodeBases.cs
index 322a19b6b29..44ada7a2755 100644
--- a/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/AssemblyCodeBases.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/AssemblyCodeBases.cs
@@ -14,7 +14,6 @@
 [assembly: ProvideBindingRedirection(AssemblyName = "Microsoft.CodeAnalysis.CSharp.Workspaces", GenerateCodeBase = true, OldVersionLowerBound = "4.4.0.0", OldVersionUpperBound = "Current")]
 [assembly: ProvideBindingRedirection(AssemblyName = "Microsoft.CodeAnalysis.EditorFeatures", GenerateCodeBase = true, OldVersionLowerBound = "4.4.0.0", OldVersionUpperBound = "Current")]
 [assembly: ProvideBindingRedirection(AssemblyName = "Microsoft.CodeAnalysis.EditorFeatures.Text", GenerateCodeBase = true, OldVersionLowerBound = "4.4.0.0", OldVersionUpperBound = "Current")]
-[assembly: ProvideBindingRedirection(AssemblyName = "Microsoft.CodeAnalysis.EditorFeatures.Wpf", GenerateCodeBase = true, OldVersionLowerBound = "4.4.0.0", OldVersionUpperBound = "Current")]
 [assembly: ProvideBindingRedirection(AssemblyName = "Microsoft.CodeAnalysis.ExternalAccess.Razor.Features", GenerateCodeBase = true, OldVersionLowerBound = "4.4.0.0", OldVersionUpperBound = "Current")]
 [assembly: ProvideBindingRedirection(AssemblyName = "Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures", GenerateCodeBase = true, OldVersionLowerBound = "4.4.0.0", OldVersionUpperBound = "Current")]
 [assembly: ProvideBindingRedirection(AssemblyName = "Microsoft.CodeAnalysis.InteractiveHost", GenerateCodeBase = true, OldVersionLowerBound = "4.4.0.0", OldVersionUpperBound = "Current")]
diff --git a/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/Microsoft.VisualStudio.RazorExtension.Dependencies.csproj b/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/Microsoft.VisualStudio.RazorExtension.Dependencies.csproj
index f197a78167a..513551a6e64 100644
--- a/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/Microsoft.VisualStudio.RazorExtension.Dependencies.csproj
+++ b/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/Microsoft.VisualStudio.RazorExtension.Dependencies.csproj
@@ -63,7 +63,6 @@
   <ItemGroup Condition="'$(IncludeRoslynDeps)' == 'true'">
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" />
     <PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures" />
-    <PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Wpf" />
     <PackageReference Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.Features" />
     <PackageReference Include="Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures" />
     <PackageReference Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" />
@@ -79,7 +78,6 @@
     <VSIXSourceItem Include="$(OutputPath)Microsoft.CodeAnalysis.CSharp.Workspaces.dll" />
     <VSIXSourceItem Include="$(OutputPath)Microsoft.CodeAnalysis.EditorFeatures.dll" />
     <VSIXSourceItem Include="$(OutputPath)Microsoft.CodeAnalysis.EditorFeatures.Text.dll" />
-    <VSIXSourceItem Include="$(OutputPath)Microsoft.CodeAnalysis.EditorFeatures.Wpf.dll" />
     <VSIXSourceItem Include="$(OutputPath)Microsoft.CodeAnalysis.ExternalAccess.Razor.Features.dll" />
     <VSIXSourceItem Include="$(OutputPath)Microsoft.CodeAnalysis.ExternalAccess.Razor.EditorFeatures.dll" />
     <VSIXSourceItem Include="$(OutputPath)Microsoft.CodeAnalysis.InteractiveHost.dll" />
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Microsoft.AspNetCore.Razor.Test.Common.Tooling.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Microsoft.AspNetCore.Razor.Test.Common.Tooling.csproj
index 7f7ba90c2f7..152c393b629 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Microsoft.AspNetCore.Razor.Test.Common.Tooling.csproj
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Microsoft.AspNetCore.Razor.Test.Common.Tooling.csproj
@@ -31,6 +31,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == '$(NetFxVS)'">
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.EditorFeatures" />
+    <PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Common" />
     <PackageReference Include="Microsoft.WebTools.Languages.Html" />
     <PackageReference Include="Microsoft.WebTools.Languages.Html.Editor" />
     <PackageReference Include="Microsoft.WebTools.Languages.LanguageServer.Server" />
@@ -47,8 +49,6 @@
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzer.Testing" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.EditorFeatures" />
-    <PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Common" />
     <PackageReference Include="Microsoft.CodeAnalysis.LanguageServer.Protocol" />
     <PackageReference Include="Microsoft.CodeAnalysis.Test.Utilities" />
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.Common" />

From d3dcf3edcec2b427945c3c73d4f589d05c9543ed Mon Sep 17 00:00:00 2001
From: David Wengier <david.wengier@microsoft.com>
Date: Tue, 17 Jun 2025 07:31:37 +1000
Subject: [PATCH 06/10] Respond to API change from PR feedback

---
 .../Formatting_NetFx/DocumentFormattingTest.cs                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/DocumentFormattingTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/DocumentFormattingTest.cs
index 114c22e29ff..2a72f25a2bf 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/DocumentFormattingTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/DocumentFormattingTest.cs
@@ -66,7 +66,7 @@ public void Bar() {
                     }
                 }
                 """,
-            formattingOptionsOverride: new RazorCSharpSyntaxFormattingOptions() with
+            formattingOptionsOverride: RazorCSharpSyntaxFormattingOptions.Default with
             {
                 NewLines = RazorNewLinePlacement.None
             });
@@ -93,7 +93,7 @@ public string Name {
                     }
                 }
                 """,
-            formattingOptionsOverride: new RazorCSharpSyntaxFormattingOptions() with
+            formattingOptionsOverride: RazorCSharpSyntaxFormattingOptions.Default with
             {
                 NewLines = RazorNewLinePlacement.None
             });

From 240a6b124457a24724b768ab81b11e0d3a133173 Mon Sep 17 00:00:00 2001
From: David Wengier <david.wengier@microsoft.com>
Date: Tue, 17 Jun 2025 08:23:15 +1000
Subject: [PATCH 07/10] WIP - Move to DocumentUri

---
 .../CodeActions/CSharp/CSharpCodeActionResolver.cs   |  2 +-
 .../CSharp/TypeAccessibilityCodeActionProvider.cs    |  2 +-
 .../UnformattedRemappingCSharpCodeActionResolver.cs  |  2 +-
 .../CodeActions/CodeActionsService.cs                |  2 +-
 .../CodeActions/Razor/AddUsingsCodeActionResolver.cs |  2 +-
 .../ComponentAccessibilityCodeActionProvider.cs      |  4 ++--
 .../Razor/CreateComponentCodeActionResolver.cs       |  4 ++--
 .../Razor/ExtractToCodeBehindCodeActionResolver.cs   |  6 +++---
 .../Razor/ExtractToComponentCodeActionResolver.cs    |  8 ++++----
 .../Razor/GenerateMethodCodeActionResolver.cs        |  4 ++--
 .../Razor/PromoteUsingCodeActionResolver.cs          |  8 ++++----
 .../Razor/WrapAttributesCodeActionResolver.cs        |  2 +-
 .../DocumentMapping/AbstractEditMappingService.cs    |  4 ++--
 .../Extensions/LspExtensions_Location.cs             |  3 ++-
 .../LspExtensions_TextDocumentIdentifier.cs          |  8 +++++---
 .../Extensions/LspFactory.cs                         |  6 +++---
 .../UriExtensions.cs                                 | 12 ++++++++----
 17 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/CSharpCodeActionResolver.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/CSharpCodeActionResolver.cs
index 5102d51d85a..6c9660e6425 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/CSharpCodeActionResolver.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/CSharpCodeActionResolver.cs
@@ -61,7 +61,7 @@ public async Task<CodeAction> ResolveAsync(
         var sourceText = await documentContext.GetSourceTextAsync(cancellationToken).ConfigureAwait(false);
         var codeDocumentIdentifier = new OptionalVersionedTextDocumentIdentifier()
         {
-            Uri = documentContext.Uri
+            DocumentUri = new(documentContext.Uri)
         };
         codeAction.Edit = new WorkspaceEdit()
         {
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/TypeAccessibilityCodeActionProvider.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/TypeAccessibilityCodeActionProvider.cs
index d254211bf90..f585b8e7357 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/TypeAccessibilityCodeActionProvider.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/TypeAccessibilityCodeActionProvider.cs
@@ -261,7 +261,7 @@ private static RazorVSInternalCodeAction CreateFQNCodeAction(
         RazorVSInternalCodeAction nonFQNCodeAction,
         string fullyQualifiedName)
     {
-        var codeDocumentIdentifier = new OptionalVersionedTextDocumentIdentifier() { Uri = context.Request.TextDocument.Uri };
+        var codeDocumentIdentifier = new OptionalVersionedTextDocumentIdentifier() { DocumentUri = context.Request.TextDocument.DocumentUri };
 
         var fqnTextEdit = LspFactory.CreateTextEdit(fqnDiagnostic.Range, fullyQualifiedName);
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/UnformattedRemappingCSharpCodeActionResolver.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/UnformattedRemappingCSharpCodeActionResolver.cs
index 674ba879687..4efacf76272 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/UnformattedRemappingCSharpCodeActionResolver.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CSharp/UnformattedRemappingCSharpCodeActionResolver.cs
@@ -66,7 +66,7 @@ public async Task<CodeAction> ResolveAsync(
 
         var codeDocumentIdentifier = new OptionalVersionedTextDocumentIdentifier()
         {
-            Uri = documentContext.Uri,
+            DocumentUri = new(documentContext.Uri),
         };
         codeAction.Edit = new WorkspaceEdit()
         {
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CodeActionsService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CodeActionsService.cs
index 78adc687862..14a479a3ca0 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CodeActionsService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/CodeActionsService.cs
@@ -151,7 +151,7 @@ void ConvertCodeActionsToSumType(ImmutableArray<RazorVSInternalCodeAction> codeA
         {
             TextDocument = new VSTextDocumentIdentifier()
             {
-                Uri = request.TextDocument.Uri,
+                DocumentUri = request.TextDocument.DocumentUri,
                 ProjectContext = request.TextDocument.ProjectContext
             },
             Context = newContext,
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/AddUsingsCodeActionResolver.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/AddUsingsCodeActionResolver.cs
index a1d04d3f61b..230cf90ca29 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/AddUsingsCodeActionResolver.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/AddUsingsCodeActionResolver.cs
@@ -29,7 +29,7 @@ internal class AddUsingsCodeActionResolver : IRazorCodeActionResolver
         var documentSnapshot = documentContext.Snapshot;
 
         var codeDocument = await documentSnapshot.GetGeneratedOutputAsync(cancellationToken).ConfigureAwait(false);
-        var codeDocumentIdentifier = new OptionalVersionedTextDocumentIdentifier() { Uri = documentContext.Uri };
+        var codeDocumentIdentifier = new OptionalVersionedTextDocumentIdentifier() { DocumentUri = new(documentContext.Uri) };
 
         using var documentChanges = new PooledArrayBuilder<TextDocumentEdit>();
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ComponentAccessibilityCodeActionProvider.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ComponentAccessibilityCodeActionProvider.cs
index e03f30d5316..55734a1a159 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ComponentAccessibilityCodeActionProvider.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ComponentAccessibilityCodeActionProvider.cs
@@ -97,7 +97,7 @@ private void AddCreateComponentFromTag(
             return;
         }
 
-        var path = context.Request.TextDocument.Uri.GetAbsoluteOrUNCPath();
+        var path = context.Request.TextDocument.DocumentUri.GetAbsoluteOrUNCPath();
         path = FilePathNormalizer.Normalize(path);
 
         var directoryName = Path.GetDirectoryName(path);
@@ -291,7 +291,7 @@ private static WorkspaceEdit CreateRenameTagEdit(
         RazorCodeActionContext context, BaseMarkupStartTagSyntax startTag, string newTagName)
     {
         using var textEdits = new PooledArrayBuilder<SumType<TextEdit, AnnotatedTextEdit>>();
-        var codeDocumentIdentifier = new OptionalVersionedTextDocumentIdentifier() { Uri = context.Request.TextDocument.Uri };
+        var codeDocumentIdentifier = new OptionalVersionedTextDocumentIdentifier() { DocumentUri = context.Request.TextDocument.DocumentUri };
 
         var startTagTextEdit = LspFactory.CreateTextEdit(startTag.Name.GetRange(context.CodeDocument.Source), newTagName);
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/CreateComponentCodeActionResolver.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/CreateComponentCodeActionResolver.cs
index e643d5dc088..a4cec55a691 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/CreateComponentCodeActionResolver.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/CreateComponentCodeActionResolver.cs
@@ -47,7 +47,7 @@ internal class CreateComponentCodeActionResolver(LanguageServerFeatureOptions la
         var newComponentUri = LspFactory.CreateFilePathUri(updatedPath);
 
         using var documentChanges = new PooledArrayBuilder<SumType<TextDocumentEdit, CreateFile, RenameFile, DeleteFile>>();
-        documentChanges.Add(new CreateFile() { Uri = newComponentUri });
+        documentChanges.Add(new CreateFile() { DocumentUri = new(newComponentUri) });
 
         TryAddNamespaceDirective(codeDocument, newComponentUri, ref documentChanges.AsRef());
 
@@ -66,7 +66,7 @@ private static void TryAddNamespaceDirective(RazorCodeDocument codeDocument, Uri
 
         if (namespaceDirective != null)
         {
-            var documentIdentifier = new OptionalVersionedTextDocumentIdentifier { Uri = newComponentUri };
+            var documentIdentifier = new OptionalVersionedTextDocumentIdentifier { DocumentUri = new(newComponentUri) };
             documentChanges.Add(new TextDocumentEdit
             {
                 TextDocument = documentIdentifier,
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToCodeBehindCodeActionResolver.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToCodeBehindCodeActionResolver.cs
index aefcb30c0f4..c6417a5d3ff 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToCodeBehindCodeActionResolver.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToCodeBehindCodeActionResolver.cs
@@ -64,12 +64,12 @@ internal class ExtractToCodeBehindCodeActionResolver(
 
         var removeRange = codeDocument.Source.Text.GetRange(actionParams.RemoveStart, actionParams.RemoveEnd);
 
-        var codeDocumentIdentifier = new OptionalVersionedTextDocumentIdentifier { Uri = documentContext.Uri };
-        var codeBehindDocumentIdentifier = new OptionalVersionedTextDocumentIdentifier { Uri = codeBehindUri };
+        var codeDocumentIdentifier = new OptionalVersionedTextDocumentIdentifier { DocumentUri = new(documentContext.Uri) };
+        var codeBehindDocumentIdentifier = new OptionalVersionedTextDocumentIdentifier { DocumentUri = new(codeBehindUri) };
 
         var documentChanges = new SumType<TextDocumentEdit, CreateFile, RenameFile, DeleteFile>[]
         {
-            new CreateFile { Uri = codeBehindUri },
+            new CreateFile { DocumentUri = codeBehindDocumentIdentifier.DocumentUri },
             new TextDocumentEdit
             {
                 TextDocument = codeDocumentIdentifier,
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToComponentCodeActionResolver.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToComponentCodeActionResolver.cs
index ebf70e3b1d7..2188de4409a 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToComponentCodeActionResolver.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/ExtractToComponentCodeActionResolver.cs
@@ -56,7 +56,7 @@ internal class ExtractToComponentCodeActionResolver(
             ? '/' + componentPath
             : componentPath;
 
-        var newComponentUri = LspFactory.CreateFilePathUri(componentPath);
+        var newComponentUri = new DocumentUri(LspFactory.CreateFilePathUri(componentPath));
 
         using var _ = StringBuilderPool.GetPooledObject(out var builder);
 
@@ -89,10 +89,10 @@ internal class ExtractToComponentCodeActionResolver(
 
         var documentChanges = new SumType<TextDocumentEdit, CreateFile, RenameFile, DeleteFile>[]
         {
-            new CreateFile { Uri = newComponentUri },
+            new CreateFile { DocumentUri = newComponentUri },
             new TextDocumentEdit
             {
-                TextDocument = new OptionalVersionedTextDocumentIdentifier { Uri = documentContext.Uri },
+                TextDocument = new OptionalVersionedTextDocumentIdentifier { DocumentUri = new(documentContext.Uri) },
                 Edits =
                 [
                     new TextEdit
@@ -104,7 +104,7 @@ internal class ExtractToComponentCodeActionResolver(
             },
             new TextDocumentEdit
             {
-                TextDocument = new OptionalVersionedTextDocumentIdentifier { Uri = newComponentUri },
+                TextDocument = new OptionalVersionedTextDocumentIdentifier { DocumentUri = newComponentUri },
                 Edits  =
                 [
                     new TextEdit
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/GenerateMethodCodeActionResolver.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/GenerateMethodCodeActionResolver.cs
index fcadfe5b1fc..47f11f904bb 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/GenerateMethodCodeActionResolver.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/GenerateMethodCodeActionResolver.cs
@@ -85,7 +85,7 @@ razorClassName is null ||
 
         var codeBehindUri = LspFactory.CreateFilePathUri(codeBehindPath);
 
-        var codeBehindTextDocumentIdentifier = new OptionalVersionedTextDocumentIdentifier() { Uri = codeBehindUri };
+        var codeBehindTextDocumentIdentifier = new OptionalVersionedTextDocumentIdentifier() { DocumentUri = new(codeBehindUri) };
 
         var templateWithMethodSignature = PopulateMethodSignature(actionParams);
         var classLocationLineSpan = @class.GetLocation().GetLineSpan();
@@ -190,7 +190,7 @@ private async Task<WorkspaceEdit> GenerateMethodInCodeBlockAsync(
 
         var razorTextDocEdit = new TextDocumentEdit()
         {
-            TextDocument = new OptionalVersionedTextDocumentIdentifier() { Uri = documentContext.Uri },
+            TextDocument = new OptionalVersionedTextDocumentIdentifier() { DocumentUri = new(documentContext.Uri) },
             Edits = [.. edits],
         };
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/PromoteUsingCodeActionResolver.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/PromoteUsingCodeActionResolver.cs
index a7249e8bf82..31285a404d8 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/PromoteUsingCodeActionResolver.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/PromoteUsingCodeActionResolver.cs
@@ -39,7 +39,7 @@ internal class PromoteUsingCodeActionResolver(IFileSystem fileSystem) : IRazorCo
         var file = FilePathNormalizer.Normalize(documentContext.Uri.GetAbsoluteOrUNCPath());
         var folder = Path.GetDirectoryName(file).AssumeNotNull();
         var importsFile = Path.GetFullPath(Path.Combine(folder, "..", importsFileName));
-        var importFileUri = LspFactory.CreateFilePathUri(importsFile);
+        var importFileUri = new DocumentUri(LspFactory.CreateFilePathUri(importsFile));
 
         using var edits = new PooledArrayBuilder<SumType<TextDocumentEdit, CreateFile, RenameFile, DeleteFile>>();
 
@@ -47,7 +47,7 @@ internal class PromoteUsingCodeActionResolver(IFileSystem fileSystem) : IRazorCo
         var insertLocation = new LinePosition(0, 0);
         if (!_fileSystem.FileExists(importsFile))
         {
-            edits.Add(new CreateFile() { Uri = importFileUri });
+            edits.Add(new CreateFile() { DocumentUri = importFileUri });
         }
         else
         {
@@ -65,7 +65,7 @@ internal class PromoteUsingCodeActionResolver(IFileSystem fileSystem) : IRazorCo
 
         edits.Add(new TextDocumentEdit
         {
-            TextDocument = new OptionalVersionedTextDocumentIdentifier() { Uri = importFileUri },
+            TextDocument = new OptionalVersionedTextDocumentIdentifier() { DocumentUri = importFileUri },
             Edits = [LspFactory.CreateTextEdit(insertLocation, textToInsert)]
         });
 
@@ -73,7 +73,7 @@ internal class PromoteUsingCodeActionResolver(IFileSystem fileSystem) : IRazorCo
 
         edits.Add(new TextDocumentEdit
         {
-            TextDocument = new OptionalVersionedTextDocumentIdentifier() { Uri = documentContext.Uri },
+            TextDocument = new OptionalVersionedTextDocumentIdentifier() { DocumentUri = new(documentContext.Uri) },
             Edits = [LspFactory.CreateTextEdit(removeRange, string.Empty)]
         });
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/WrapAttributesCodeActionResolver.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/WrapAttributesCodeActionResolver.cs
index f65c1e28641..a8dd05a000f 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/WrapAttributesCodeActionResolver.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/CodeActions/Razor/WrapAttributesCodeActionResolver.cs
@@ -39,7 +39,7 @@ internal class WrapAttributesCodeActionResolver : IRazorCodeActionResolver
 
         var tde = new TextDocumentEdit
         {
-            TextDocument = new OptionalVersionedTextDocumentIdentifier() { Uri = documentContext.Uri },
+            TextDocument = new OptionalVersionedTextDocumentIdentifier() { DocumentUri = new(documentContext.Uri) },
             Edits = edits.ToArray()
         };
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/AbstractEditMappingService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/AbstractEditMappingService.cs
index 338a0b94f82..0872e243bcd 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/AbstractEditMappingService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/AbstractEditMappingService.cs
@@ -113,7 +113,7 @@ private async Task<TextDocumentEdit[]> RemapTextDocumentEditsAsync(IDocumentSnap
 
         foreach (var entry in documentEdits)
         {
-            var generatedDocumentUri = entry.TextDocument.Uri;
+            var generatedDocumentUri = entry.TextDocument.DocumentUri.GetRequiredParsedUri();
 
             // Check if the edit is actually for a generated document, because if not we don't need to do anything
             if (!_filePathService.IsVirtualDocumentUri(generatedDocumentUri))
@@ -144,7 +144,7 @@ private async Task<TextDocumentEdit[]> RemapTextDocumentEditsAsync(IDocumentSnap
             {
                 TextDocument = new OptionalVersionedTextDocumentIdentifier()
                 {
-                    Uri = razorDocumentUri,
+                    DocumentUri = new(razorDocumentUri),
                 },
                 Edits = remappedEdits.Select(e => new SumType<TextEdit, AnnotatedTextEdit>(e)).ToArray()
             });
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/LspExtensions_Location.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/LspExtensions_Location.cs
index 999eae90ccc..61a0d3c7c89 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/LspExtensions_Location.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/LspExtensions_Location.cs
@@ -2,11 +2,12 @@
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.CodeAnalysis.Razor;
 
 namespace Roslyn.LanguageServer.Protocol;
 
 internal static partial class LspExtensions
 {
     public static void Deconstruct(this LspLocation position, out Uri uri, out LspRange range)
-        => (uri, range) = (position.Uri, position.Range);
+        => (uri, range) = (position.DocumentUri.GetRequiredParsedUri(), position.Range);
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/LspExtensions_TextDocumentIdentifier.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/LspExtensions_TextDocumentIdentifier.cs
index 991544ca22c..719adbf5be4 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/LspExtensions_TextDocumentIdentifier.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/LspExtensions_TextDocumentIdentifier.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost;
+using Microsoft.CodeAnalysis.Razor;
 
 namespace Roslyn.LanguageServer.Protocol;
 
@@ -18,21 +19,22 @@ internal static partial class LspExtensions
     /// </summary>
     public static TextDocumentIdentifier WithUri(this TextDocumentIdentifier textDocumentIdentifier, Uri uri)
     {
+        var documentUri = new DocumentUri(uri);
         if (textDocumentIdentifier is VSTextDocumentIdentifier vsTdi)
         {
             return new VSTextDocumentIdentifier
             {
-                Uri = uri,
+                DocumentUri = documentUri,
                 ProjectContext = vsTdi.ProjectContext
             };
         }
 
         return new TextDocumentIdentifier
         {
-            Uri = uri
+            DocumentUri = documentUri
         };
     }
 
     public static RazorTextDocumentIdentifier ToRazorTextDocumentIdentifier(this TextDocumentIdentifier textDocumentIdentifier)
-        => new RazorTextDocumentIdentifier(textDocumentIdentifier.Uri, (textDocumentIdentifier as VSTextDocumentIdentifier)?.ProjectContext?.Id);
+        => new RazorTextDocumentIdentifier(textDocumentIdentifier.DocumentUri.GetRequiredParsedUri(), (textDocumentIdentifier as VSTextDocumentIdentifier)?.ProjectContext?.Id);
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/LspFactory.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/LspFactory.cs
index 093b70c2f9a..a0db9884567 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/LspFactory.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/LspFactory.cs
@@ -170,13 +170,13 @@ public static LspLocation CreateLocation(string filePath, LspRange range)
         => CreateLocation(CreateFilePathUri(filePath), range);
 
     public static LspLocation CreateLocation(Uri uri, LspRange range)
-        => new() { Uri = uri, Range = range };
+        => new() { DocumentUri = new(uri), Range = range };
 
     public static DocumentLink CreateDocumentLink(Uri target, LspRange range)
-        => new() { Target = target, Range = range };
+        => new() { DocumentTarget = new(target), Range = range };
 
     public static DocumentLink CreateDocumentLink(Uri target, LinePositionSpan span)
-        => new() { Target = target, Range = CreateRange(span) };
+        => new() { DocumentTarget = new(target), Range = CreateRange(span) };
 
     public static TextEdit CreateTextEdit(Range range, string newText)
         => new() { Range = range, NewText = newText };
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/UriExtensions.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/UriExtensions.cs
index f2cf6458933..f48ea2d08e8 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/UriExtensions.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/UriExtensions.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Net;
+using Microsoft.AspNetCore.Razor;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor;
 using Microsoft.CodeAnalysis.Razor.Utilities;
 
@@ -17,12 +18,15 @@ internal static class UriExtensions
     public static string GetDocumentFilePath(this Uri uri)
         => RazorUri.GetDocumentFilePathFromUri(uri);
 
+    public static Uri GetRequiredParsedUri(this DocumentUri uri)
+        => uri.ParsedUri.AssumeNotNull();
+
+    public static string GetAbsoluteOrUNCPath(this DocumentUri uri)
+        => GetAbsoluteOrUNCPath(uri.GetRequiredParsedUri());
+
     public static string GetAbsoluteOrUNCPath(this Uri uri)
     {
-        if (uri is null)
-        {
-            throw new ArgumentNullException(nameof(uri));
-        }
+        ArgHelper.ThrowIfNull(uri, nameof(uri));
 
         if (uri.IsUnc)
         {

From 05c2a065d7855d2e6258090d5d5091df5ab5ef05 Mon Sep 17 00:00:00 2001
From: David Wengier <david.wengier@microsoft.com>
Date: Tue, 17 Jun 2025 13:45:53 +1000
Subject: [PATCH 08/10] Respond to DocumentUri changes

---
 .../RazorCodeActionsBenchmark.cs              |  2 +-
 .../RazorCompletionBenchmark.cs               |  2 +-
 .../RazorDiagnosticsBenchmark.cs              |  2 +-
 ...zorSemanticTokensRangeEndpointBenchmark.cs |  2 +-
 .../CapabilitiesManager.cs                    |  4 +-
 .../CodeActions/RoslynCodeActionHelpers.cs    |  6 +-
 .../Definition/DefinitionEndpoint.cs          | 12 ++-
 ...actTextDocumentPresentationEndpointBase.cs |  5 +-
 .../TextDocumentUriPresentationEndpoint.cs    |  2 +-
 .../DocumentDidChangeEndpoint.cs              |  4 +-
 .../DocumentDidCloseEndpoint.cs               |  2 +-
 .../DocumentDidOpenEndpoint.cs                |  2 +-
 .../DocumentDidSaveEndpoint.cs                |  2 +-
 .../FindAllReferencesEndpoint.cs              | 10 +--
 .../DocumentOnTypeFormattingEndpoint.cs       |  4 +-
 .../Formatting/HtmlFormatter.cs               |  4 +-
 .../Implementation/ImplementationEndpoint.cs  |  7 +-
 .../InlineCompletionEndPoint.cs               |  4 +-
 .../LinkedEditingRangeEndpoint.cs             |  4 +-
 .../MapCode/MapCodeEndpoint.cs                | 19 ++---
 .../Mapping/RazorLanguageQueryEndpoint.cs     |  2 +-
 .../ProjectContextsEndpoint.cs                |  3 +-
 .../IDocumentContextFactoryExtensions.cs      |  3 +-
 .../RazorRequestContextFactory.cs             |  3 +-
 .../WrapWithTag/WrapWithTagEndpoint.cs        |  4 +-
 .../CodeActions/CohostCodeActionsEndpoint.cs  |  3 +-
 .../CohostFoldingRangeEndpoint.cs             |  2 +-
 .../CohostGoToDefinitionEndpoint.cs           |  9 ++-
 .../CohostGoToImplementationEndpoint.cs       |  6 +-
 .../CohostSignatureHelpEndpoint.cs            |  3 +-
 .../ProjectSystem/DocumentContext.cs          |  2 +-
 .../Rename/RenameService.cs                   | 18 ++---
 .../CodeActions/RemoteCodeActionsService.cs   |  2 +-
 .../RemoteFindAllReferencesService.cs         |  6 +-
 .../RemoteGoToDefinitionService.cs            |  3 +-
 .../CohostDocumentPullDiagnosticsEndpoint.cs  |  2 +-
 .../Cohost/CohostTextPresentationEndpoint.cs  |  5 +-
 .../Cohost/CohostUriPresentationEndpoint.cs   |  7 +-
 .../Cohost/HtmlRequestInvoker.cs              |  8 +-
 .../Endpoints/RazorCustomMessageTarget.cs     | 29 ++++---
 .../RazorCustomMessageTarget_CodeActions.cs   |  2 +-
 .../RazorCustomMessageTarget_Completion.cs    |  7 +-
 .../RazorCustomMessageTarget_Diagnostics.cs   |  2 +-
 .../RazorCustomMessageTarget_DocumentColor.cs |  4 +-
 ...orCustomMessageTarget_FindAllReferences.cs |  2 +-
 .../RazorCustomMessageTarget_FoldingRange.cs  |  4 +-
 .../RazorCustomMessageTarget_MapCode.cs       |  5 +-
 .../RazorCustomMessageTarget_Presentation.cs  |  2 +-
 ...RazorCustomMessageTarget_SemanticTokens.cs |  2 +-
 ...ustomMessageTarget_TextDocumentPosition.cs |  2 +-
 ...rCustomMessageTarget_UpdateCSharpBuffer.cs |  9 ++-
 .../RazorCustomMessageTarget_WrapWithTag.cs   |  2 +-
 .../Endpoints/RazorDocumentClosedEndpoint.cs  |  3 +-
 .../RazorDynamicFileChangedEndpoint.cs        |  3 +-
 .../Services/HtmlDocumentPublisher.cs         |  2 +-
 .../Services/HtmlRequestInvoker.cs            |  2 +-
 ...icFileProvider.LspTextChangesTextLoader.cs |  4 +-
 .../Services/LspDynamicFileProvider.cs        |  9 ++-
 .../Services/MappingService.cs                |  8 +-
 .../OnAutoInsertEndpointTest.NetFx.cs         | 14 ++--
 .../AutoInsert/OnAutoInsertEndpointTest.cs    |  6 +-
 .../AddUsingsCodeActionResolverTest.cs        |  2 +-
 .../CSharp/CSharpCodeActionProviderTest.cs    | 16 ++--
 .../CSharp/CSharpCodeActionResolverTest.cs    |  2 +-
 ...TypeAccessibilityCodeActionProviderTest.cs | 14 ++--
 .../CodeActionEndToEndTestBase.NetFx.cs       |  4 +-
 .../CodeActions/CodeActionEndpointTest.cs     | 28 +++----
 .../Html/HtmlCodeActionProviderTest.cs        | 11 +--
 .../Html/HtmlCodeActionResolverTest.cs        |  7 +-
 ...nentAccessibilityCodeActionProviderTest.cs | 22 +++---
 ...tractToCodeBehindCodeActionProviderTest.cs | 20 ++---
 ...xtractToComponentCodeActionProviderTest.cs |  4 +-
 ...ToComponentCodeActionResolverTest.NetFx.cs |  5 +-
 .../Delegation/CompletionTestBase.cs          |  5 +-
 .../Completion/RazorCompletionEndpointTest.cs |  4 +-
 .../DataTipRangeHandlerEndpointTest.cs        |  2 +-
 .../ValidateBreakpointRangeEndpointTest.cs    |  2 +-
 .../DefinitionEndpointDelegationTest.cs       | 11 +--
 .../Diagnostics/DiagnosticsEndToEndTest.cs    |  2 +-
 .../VSCSharpDiagnosticsEndToEndTest.cs        |  2 +-
 .../DocumentHighlightEndpointTest.cs          |  7 +-
 ...xtDocumentTextPresentationEndpointTests.cs |  8 +-
 ...extDocumentUriPresentationEndpointTests.cs | 20 ++---
 .../DocumentSymbolEndpointTest.cs             |  2 +-
 .../DocumentDidChangeEndpointTest.cs          |  2 +-
 .../DocumentDidCloseEndpointTest.cs           |  2 +-
 .../DocumentDidOpenEndpointTest.cs            |  2 +-
 .../FindAllReferencesEndpointTest.cs          |  5 +-
 .../Folding/FoldingEndpointTest.cs            |  2 +-
 .../DocumentOnTypeFormattingEndpointTest.cs   | 15 ++--
 .../DocumentRangeFormattingEndpointTest.cs    |  4 +-
 .../FormattingLanguageServerClient.cs         |  8 +-
 .../Hover/HoverEndpointTest.cs                |  6 +-
 .../ImplementationEndpointTest.cs             |  5 +-
 .../InlayHints/InlayHintEndpointTest.cs       |  4 +-
 .../LinkedEditingRangeEndpointTest.cs         | 20 ++---
 .../MapCode/MapCodeTest.cs                    |  9 ++-
 .../ProjectContextsEndpointTest.cs            |  5 +-
 .../RenameEndpointDelegationTest.cs           |  2 +-
 .../Refactoring/RenameEndpointTest.cs         | 77 ++++++++++---------
 .../Semantic/SemanticTokensTest.cs            |  4 +-
 .../SignatureHelpEndpointTest.cs              |  2 +-
 ...tingEndpointTestBase.TestLanguageServer.cs | 30 ++++----
 .../DocumentSpellCheckEndpointTest.cs         |  2 +-
 .../WrapWithTag/WrapWithTagEndpointTests.cs   | 20 ++---
 .../LanguageServer/CSharpTestLspServer.cs     |  4 +-
 .../CohostCodeActionsEndpointTestBase.cs      |  8 +-
 .../CohostDocumentCompletionEndpointTest.cs   |  2 +-
 ...stDocumentCompletionResolveEndpointTest.cs |  2 +-
 .../CohostDocumentHighlightEndpointTest.cs    |  2 +-
 .../CohostFindAllReferencesEndpointTest.cs    |  7 +-
 .../CohostGoToDefinitionEndpointTest.cs       | 11 +--
 .../CohostGoToImplementationEndpointTest.cs   |  7 +-
 .../Cohost/CohostHoverEndpointTest.cs         |  2 +-
 .../Cohost/CohostInlayHintEndpointTest.cs     |  7 +-
 .../CohostLinkedEditingRangeEndpointTest.cs   |  2 +-
 .../Cohost/CohostOnAutoInsertEndpointTest.cs  |  2 +-
 .../CohostOnTypeFormattingEndpointTest.cs     |  2 +-
 .../CohostRangeFormattingEndpointTest.cs      |  2 +-
 .../Cohost/CohostRenameEndpointTest.cs        |  8 +-
 .../Cohost/CohostSignatureHelpEndpointTest.cs |  2 +-
 .../CohostTextPresentationEndpointTest.cs     |  7 +-
 .../CohostUriPresentationEndpointTest.cs      |  9 ++-
 .../Cohost/FormattingTestBase.cs              |  6 +-
 .../RazorCustomMessageTargetTest.cs           | 14 ++--
 125 files changed, 444 insertions(+), 401 deletions(-)

diff --git a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorCodeActionsBenchmark.cs b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorCodeActionsBenchmark.cs
index 0a2175a4816..95a878b0ed2 100644
--- a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorCodeActionsBenchmark.cs
+++ b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorCodeActionsBenchmark.cs
@@ -131,7 +131,7 @@ public async Task RazorLightbulbAsync()
             Context = new VSInternalCodeActionContext(),
             TextDocument = new VSTextDocumentIdentifier
             {
-                Uri = DocumentUri!
+                DocumentUri = new(DocumentUri!)
             },
         };
 
diff --git a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorCompletionBenchmark.cs b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorCompletionBenchmark.cs
index 5803a003dc2..0bc56ef1868 100644
--- a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorCompletionBenchmark.cs
+++ b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorCompletionBenchmark.cs
@@ -134,7 +134,7 @@ public async Task RazorCompletionAsync()
             Context = new VSInternalCompletionContext { },
             TextDocument = new TextDocumentIdentifier
             {
-                Uri = DocumentUri!,
+                DocumentUri = new(DocumentUri!),
             },
         };
 
diff --git a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorDiagnosticsBenchmark.cs b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorDiagnosticsBenchmark.cs
index 0c47a0827fe..c76f3674de3 100644
--- a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorDiagnosticsBenchmark.cs
+++ b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorDiagnosticsBenchmark.cs
@@ -52,7 +52,7 @@ public void Setup()
         var uri = new Uri(razorFilePath);
         Request = new VSInternalDocumentDiagnosticsParams
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri }
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri) }
         };
         var sourceDocument = RazorSourceDocument.Create(GetFileContents(), UTF8Encoding.UTF8, RazorSourceDocumentProperties.Default);
         var codeDocument = RazorCodeDocument.Create(sourceDocument, RazorParserOptions.Default, RazorCodeGenerationOptions.DesignTimeDefault);
diff --git a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorSemanticTokensRangeEndpointBenchmark.cs b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorSemanticTokensRangeEndpointBenchmark.cs
index 0d673ac0708..c80643129e8 100644
--- a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorSemanticTokensRangeEndpointBenchmark.cs
+++ b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorSemanticTokensRangeEndpointBenchmark.cs
@@ -103,7 +103,7 @@ public async Task InitializeRazorSemanticAsync()
     [Benchmark(Description = "Razor Semantic Tokens Range Endpoint")]
     public async Task RazorSemanticTokensRangeEndpointRangesAsync()
     {
-        var textDocumentIdentifier = new TextDocumentIdentifier { Uri = DocumentUri };
+        var textDocumentIdentifier = new TextDocumentIdentifier { DocumentUri = new(DocumentUri) };
         var request = new SemanticTokensRangeParams { Range = Range, TextDocument = textDocumentIdentifier };
 
         await SemanticTokensRangeEndpoint.HandleRequestAsync(request, RequestContext, CancellationToken);
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CapabilitiesManager.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CapabilitiesManager.cs
index 67c9d7bf342..fa2309d954c 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CapabilitiesManager.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CapabilitiesManager.cs
@@ -80,13 +80,13 @@ private async Task<string> ComputeRootPathAsync()
 
         if (initializeParams.WorkspaceFolders is [var firstFolder, ..])
         {
-            return firstFolder.Uri.GetAbsoluteOrUNCPath();
+            return firstFolder.DocumentUri.GetAbsoluteOrUNCPath();
         }
 
         // WorkspaceFolders was added in LSP3.6, fall back to RootUri
 
 #pragma warning disable CS0618 // Type or member is obsolete
-        if (initializeParams.RootUri is Uri rootUri)
+        if (initializeParams.RootDocumentUri is DocumentUri rootUri)
         {
             return rootUri.GetAbsoluteOrUNCPath();
         }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/RoslynCodeActionHelpers.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/RoslynCodeActionHelpers.cs
index d31feab48a0..dc342142871 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/RoslynCodeActionHelpers.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/RoslynCodeActionHelpers.cs
@@ -27,11 +27,11 @@ public async Task<string> GetFormattedNewFileContentsAsync(IProjectSnapshot proj
         {
             Project = new TextDocumentIdentifier
             {
-                Uri = new Uri(projectSnapshot.FilePath, UriKind.Absolute)
+                DocumentUri = new(new Uri(projectSnapshot.FilePath, UriKind.Absolute))
             },
             Document = new TextDocumentIdentifier
             {
-                Uri = csharpFileUri
+                DocumentUri = new(csharpFileUri)
             },
             Contents = newFileContent
         };
@@ -55,7 +55,7 @@ public async Task<string> GetFormattedNewFileContentsAsync(IProjectSnapshot proj
     {
         var tdi = codeBehindUri is null
             ? documentContext.GetTextDocumentIdentifierAndVersion()
-            : new TextDocumentIdentifierAndVersion(new TextDocumentIdentifier() { Uri = codeBehindUri }, 1);
+            : new TextDocumentIdentifierAndVersion(new TextDocumentIdentifier() { DocumentUri = new(codeBehindUri) }, 1);
         var delegatedParams = new DelegatedSimplifyMethodParams(
             tdi,
             RequiresVirtualDocument: codeBehindUri == null,
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Definition/DefinitionEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Definition/DefinitionEndpoint.cs
index 3f4c9b49e76..11336f30b2a 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Definition/DefinitionEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Definition/DefinitionEndpoint.cs
@@ -9,6 +9,7 @@
 using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
 using Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
 using Microsoft.AspNetCore.Razor.Threading;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
 using Microsoft.CodeAnalysis.Razor.GoToDefinition;
 using Microsoft.CodeAnalysis.Razor.Logging;
@@ -107,22 +108,25 @@ public void ApplyCapabilities(VSInternalServerCapabilities serverCapabilities, V
         // Not using .TryGetXXX because this does the null check for us too
         if (result is LspLocation location)
         {
-            (location.Uri, location.Range) = await _documentMappingService.MapToHostDocumentUriAndRangeAsync(location.Uri, location.Range, cancellationToken).ConfigureAwait(false);
+            (var uri, location.Range) = await _documentMappingService.MapToHostDocumentUriAndRangeAsync(location.DocumentUri.GetRequiredParsedUri(), location.Range, cancellationToken).ConfigureAwait(false);
+            location.DocumentUri = new(uri);
         }
         else if (result is LspLocation[] locations)
         {
             foreach (var loc in locations)
             {
-                (loc.Uri, loc.Range) = await _documentMappingService.MapToHostDocumentUriAndRangeAsync(loc.Uri, loc.Range, cancellationToken).ConfigureAwait(false);
+                (var uri, loc.Range) = await _documentMappingService.MapToHostDocumentUriAndRangeAsync(loc.DocumentUri.GetRequiredParsedUri(), loc.Range, cancellationToken).ConfigureAwait(false);
+                loc.DocumentUri = new(uri);
             }
         }
         else if (result is DocumentLink[] links)
         {
             foreach (var link in links)
             {
-                if (link.Target is not null)
+                if (link.DocumentTarget?.ParsedUri is not null)
                 {
-                    (link.Target, link.Range) = await _documentMappingService.MapToHostDocumentUriAndRangeAsync(link.Target, link.Range, cancellationToken).ConfigureAwait(false);
+                    (var uri, link.Range) = await _documentMappingService.MapToHostDocumentUriAndRangeAsync(link.DocumentTarget.ParsedUri, link.Range, cancellationToken).ConfigureAwait(false);
+                    link.DocumentTarget = new(uri);
                 }
             }
         }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentPresentation/AbstractTextDocumentPresentationEndpointBase.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentPresentation/AbstractTextDocumentPresentationEndpointBase.cs
index 462c0eb7bd3..5eacb197fb8 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentPresentation/AbstractTextDocumentPresentationEndpointBase.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentPresentation/AbstractTextDocumentPresentationEndpointBase.cs
@@ -10,6 +10,7 @@
 using Microsoft.AspNetCore.Razor.LanguageServer.EndpointContracts;
 using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
 using Microsoft.AspNetCore.Razor.PooledObjects;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
 using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
@@ -147,7 +148,7 @@ private TextDocumentEdit[] MapDocumentChanges(TextDocumentEdit[] documentEdits,
         using var remappedDocumentEdits = new PooledArrayBuilder<TextDocumentEdit>(documentEdits.Length);
         foreach (var entry in documentEdits)
         {
-            var uri = entry.TextDocument.Uri;
+            var uri = entry.TextDocument.DocumentUri.GetRequiredParsedUri();
             if (!_filePathService.IsVirtualDocumentUri(uri))
             {
                 // This location doesn't point to a background razor file. No need to remap.
@@ -168,7 +169,7 @@ private TextDocumentEdit[] MapDocumentChanges(TextDocumentEdit[] documentEdits,
             {
                 TextDocument = new OptionalVersionedTextDocumentIdentifier()
                 {
-                    Uri = razorDocumentUri,
+                    DocumentUri = new(razorDocumentUri),
                 },
                 Edits = [.. remappedEdits]
             });
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentPresentation/TextDocumentUriPresentationEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentPresentation/TextDocumentUriPresentationEndpoint.cs
index 214715cec69..de3cf1a3d1e 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentPresentation/TextDocumentUriPresentationEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentPresentation/TextDocumentUriPresentationEndpoint.cs
@@ -74,7 +74,7 @@ protected override IRazorPresentationParams CreateRazorRequestParameters(UriPres
                 {
                     TextDocument = new()
                     {
-                        Uri = request.TextDocument.Uri
+                        DocumentUri = request.TextDocument.DocumentUri
                     },
                     Edits = [LspFactory.CreateTextEdit(request.Range, componentTagText)]
                 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSynchronization/DocumentDidChangeEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSynchronization/DocumentDidChangeEndpoint.cs
index 570e5af5f7c..64a161d2fa2 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSynchronization/DocumentDidChangeEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSynchronization/DocumentDidChangeEndpoint.cs
@@ -50,8 +50,8 @@ public async Task HandleNotificationAsync(DidChangeTextDocumentParams request, R
         var documentContext = requestContext.DocumentContext;
         if (documentContext is null)
         {
-            _logger.LogWarning($"Could not find a document context for didChange on '{request.TextDocument.Uri}'");
-            Debug.Fail($"Could not find a document context for didChange on '{request.TextDocument.Uri}'");
+            _logger.LogWarning($"Could not find a document context for didChange on '{request.TextDocument.DocumentUri}'");
+            Debug.Fail($"Could not find a document context for didChange on '{request.TextDocument.DocumentUri}'");
             return;
         }
 
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSynchronization/DocumentDidCloseEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSynchronization/DocumentDidCloseEndpoint.cs
index 0ebddd56f73..8c4b1da1e18 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSynchronization/DocumentDidCloseEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSynchronization/DocumentDidCloseEndpoint.cs
@@ -25,6 +25,6 @@ public TextDocumentIdentifier GetTextDocumentIdentifier(DidCloseTextDocumentPara
 
     public Task HandleNotificationAsync(DidCloseTextDocumentParams request, RazorRequestContext requestContext, CancellationToken cancellationToken)
     {
-        return _projectService.CloseDocumentAsync(request.TextDocument.Uri.GetAbsoluteOrUNCPath(), cancellationToken);
+        return _projectService.CloseDocumentAsync(request.TextDocument.DocumentUri.GetAbsoluteOrUNCPath(), cancellationToken);
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSynchronization/DocumentDidOpenEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSynchronization/DocumentDidOpenEndpoint.cs
index 442b042c668..e53a306af5b 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSynchronization/DocumentDidOpenEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSynchronization/DocumentDidOpenEndpoint.cs
@@ -22,6 +22,6 @@ public Task HandleNotificationAsync(DidOpenTextDocumentParams request, RazorRequ
         var sourceText = SourceText.From(request.TextDocument.Text);
 
         return _projectService.OpenDocumentAsync(
-            request.TextDocument.Uri.GetAbsoluteOrUNCPath(), sourceText, cancellationToken);
+            request.TextDocument.DocumentUri.GetAbsoluteOrUNCPath(), sourceText, cancellationToken);
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSynchronization/DocumentDidSaveEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSynchronization/DocumentDidSaveEndpoint.cs
index c53d34cafbb..4192ca68d8b 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSynchronization/DocumentDidSaveEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSynchronization/DocumentDidSaveEndpoint.cs
@@ -25,7 +25,7 @@ public TextDocumentIdentifier GetTextDocumentIdentifier(DidSaveTextDocumentParam
 
     public Task HandleNotificationAsync(DidSaveTextDocumentParams request, RazorRequestContext requestContext, CancellationToken cancellationToken)
     {
-        _logger.LogInformation($"Saved Document {request.TextDocument.Uri.GetAbsoluteOrUNCPath()}");
+        _logger.LogInformation($"Saved Document {request.TextDocument.DocumentUri.GetAbsoluteOrUNCPath()}");
 
         return Task.CompletedTask;
     }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/FindAllReferences/FindAllReferencesEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/FindAllReferences/FindAllReferencesEndpoint.cs
index 19920a4f16c..aaf841282e4 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/FindAllReferences/FindAllReferencesEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/FindAllReferences/FindAllReferencesEndpoint.cs
@@ -102,21 +102,21 @@ public void ApplyCapabilities(VSInternalServerCapabilities serverCapabilities, V
             // Indicates the reference item is directly available in the code
             referenceItem.Origin = VSInternalItemOrigin.Exact;
 
-            if (!_filePathService.IsVirtualCSharpFile(referenceItem.Location.Uri) &&
-                !_filePathService.IsVirtualHtmlFile(referenceItem.Location.Uri))
+            if (!_filePathService.IsVirtualCSharpFile(referenceItem.Location.DocumentUri.GetRequiredParsedUri()) &&
+                !_filePathService.IsVirtualHtmlFile(referenceItem.Location.DocumentUri.GetRequiredParsedUri()))
             {
                 // This location doesn't point to a virtual file. No need to remap, but we might still want to fix the text,
                 // because Roslyn may have done the remapping for us
-                var resultText = await FindAllReferencesHelper.GetResultTextAsync(_documentMappingService, _projectSnapshotManager.GetQueryOperations(), referenceItem.Location.Range.Start.Line, referenceItem.Location.Uri.GetAbsoluteOrUNCPath(), cancellationToken).ConfigureAwait(false);
+                var resultText = await FindAllReferencesHelper.GetResultTextAsync(_documentMappingService, _projectSnapshotManager.GetQueryOperations(), referenceItem.Location.Range.Start.Line, referenceItem.Location.DocumentUri.GetAbsoluteOrUNCPath(), cancellationToken).ConfigureAwait(false);
                 referenceItem.Text = resultText ?? referenceItem.Text;
 
                 remappedLocations.Add(referenceItem);
                 continue;
             }
 
-            var (itemUri, mappedRange) = await _documentMappingService.MapToHostDocumentUriAndRangeAsync(referenceItem.Location.Uri, referenceItem.Location.Range, cancellationToken).ConfigureAwait(false);
+            var (itemUri, mappedRange) = await _documentMappingService.MapToHostDocumentUriAndRangeAsync(referenceItem.Location.DocumentUri.GetRequiredParsedUri(), referenceItem.Location.Range, cancellationToken).ConfigureAwait(false);
 
-            referenceItem.Location.Uri = itemUri;
+            referenceItem.Location.DocumentUri = new(itemUri);
             referenceItem.DisplayPath = itemUri.AbsolutePath;
             referenceItem.Location.Range = mappedRange;
 
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/DocumentOnTypeFormattingEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/DocumentOnTypeFormattingEndpoint.cs
index af586d0d519..f72ce1d7e2f 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/DocumentOnTypeFormattingEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/DocumentOnTypeFormattingEndpoint.cs
@@ -46,7 +46,7 @@ public TextDocumentIdentifier GetTextDocumentIdentifier(DocumentOnTypeFormatting
 
     public async Task<TextEdit[]?> HandleRequestAsync(DocumentOnTypeFormattingParams request, RazorRequestContext requestContext, CancellationToken cancellationToken)
     {
-        _logger.LogInformation($"Starting OnTypeFormatting request for {request.TextDocument.Uri}.");
+        _logger.LogInformation($"Starting OnTypeFormatting request for {request.TextDocument.DocumentUri}.");
 
         if (!_optionsMonitor.CurrentValue.Formatting.IsEnabled())
         {
@@ -69,7 +69,7 @@ public TextDocumentIdentifier GetTextDocumentIdentifier(DocumentOnTypeFormatting
         var documentContext = requestContext.DocumentContext;
         if (documentContext is null)
         {
-            _logger.LogWarning($"Failed to find document {request.TextDocument.Uri}.");
+            _logger.LogWarning($"Failed to find document {request.TextDocument.DocumentUri}.");
             return null;
         }
 
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/HtmlFormatter.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/HtmlFormatter.cs
index ef1e18ca437..eb8910fc60c 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/HtmlFormatter.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/HtmlFormatter.cs
@@ -30,7 +30,7 @@ internal sealed class HtmlFormatter(
         {
             TextDocument = new TextDocumentIdentifier
             {
-                Uri = uri,
+                DocumentUri = new(uri),
             },
             HostDocumentVersion = documentSnapshot.Version,
             Options = options
@@ -62,7 +62,7 @@ internal sealed class HtmlFormatter(
         {
             Position = position,
             Character = triggerCharacter.ToString(),
-            TextDocument = new TextDocumentIdentifier { Uri = uri },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri) },
             Options = options,
             HostDocumentVersion = documentSnapshot.Version,
         };
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Implementation/ImplementationEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Implementation/ImplementationEndpoint.cs
index 963683cc82f..5de8110d8c1 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Implementation/ImplementationEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Implementation/ImplementationEndpoint.cs
@@ -7,6 +7,7 @@
 using Microsoft.AspNetCore.Razor.LanguageServer.EndpointContracts;
 using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
 using Microsoft.AspNetCore.Razor.Threading;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
 using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.Protocol;
@@ -66,7 +67,8 @@ protected async override Task<ImplementationResult> HandleDelegatedResponseAsync
         {
             foreach (var loc in locations)
             {
-                (loc.Uri, loc.Range) = await _documentMappingService.MapToHostDocumentUriAndRangeAsync(loc.Uri, loc.Range, cancellationToken).ConfigureAwait(false);
+                (var uri, loc.Range) = await _documentMappingService.MapToHostDocumentUriAndRangeAsync(loc.DocumentUri.GetRequiredParsedUri(), loc.Range, cancellationToken).ConfigureAwait(false);
+                loc.DocumentUri = new(uri);
             }
 
             return locations;
@@ -75,7 +77,8 @@ protected async override Task<ImplementationResult> HandleDelegatedResponseAsync
         {
             foreach (var item in referenceItems)
             {
-                (item.Location!.Uri, item.Location.Range) = await _documentMappingService.MapToHostDocumentUriAndRangeAsync(item.Location.Uri, item.Location.Range, cancellationToken).ConfigureAwait(false);
+                (var uri, item.Location!.Range) = await _documentMappingService.MapToHostDocumentUriAndRangeAsync(item.Location.DocumentUri.GetRequiredParsedUri(), item.Location.Range, cancellationToken).ConfigureAwait(false);
+                item.Location.DocumentUri = new(uri);
             }
 
             return referenceItems;
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/InlineCompletion/InlineCompletionEndPoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/InlineCompletion/InlineCompletionEndPoint.cs
index 2ec77cbc522..37e1f9da804 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/InlineCompletion/InlineCompletionEndPoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/InlineCompletion/InlineCompletionEndPoint.cs
@@ -50,7 +50,7 @@ public TextDocumentIdentifier GetTextDocumentIdentifier(VSInternalInlineCompleti
     {
         ArgHelper.ThrowIfNull(request);
 
-        _logger.LogInformation($"Starting request for {request.TextDocument.Uri} at {request.Position}.");
+        _logger.LogInformation($"Starting request for {request.TextDocument.DocumentUri} at {request.Position}.");
 
         var documentContext = requestContext.DocumentContext;
         if (documentContext is null)
@@ -68,7 +68,7 @@ public TextDocumentIdentifier GetTextDocumentIdentifier(VSInternalInlineCompleti
         if (languageKind != RazorLanguageKind.CSharp ||
             !_documentMappingService.TryMapToGeneratedDocumentPosition(codeDocument.GetRequiredCSharpDocument(), hostDocumentIndex, out Position? projectedPosition, out _))
         {
-            _logger.LogInformation($"Unsupported location for {request.TextDocument.Uri}.");
+            _logger.LogInformation($"Unsupported location for {request.TextDocument.DocumentUri}.");
             return null;
         }
 
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/LinkedEditingRange/LinkedEditingRangeEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/LinkedEditingRange/LinkedEditingRangeEndpoint.cs
index 8b7fbfa82f6..26df1642682 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/LinkedEditingRange/LinkedEditingRangeEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/LinkedEditingRange/LinkedEditingRangeEndpoint.cs
@@ -37,7 +37,7 @@ public TextDocumentIdentifier GetTextDocumentIdentifier(LinkedEditingRangeParams
         var documentContext = requestContext.DocumentContext;
         if (documentContext is null || cancellationToken.IsCancellationRequested)
         {
-            _logger.LogWarning($"Unable to resolve document for {request.TextDocument.Uri} or cancellation was requested.");
+            _logger.LogWarning($"Unable to resolve document for {request.TextDocument.DocumentUri} or cancellation was requested.");
             return null;
         }
 
@@ -54,7 +54,7 @@ public TextDocumentIdentifier GetTextDocumentIdentifier(LinkedEditingRangeParams
             };
         }
 
-        _logger.LogInformation($"LinkedEditingRange request was null at line {request.Position.Line}, column {request.Position.Character} for {request.TextDocument.Uri}");
+        _logger.LogInformation($"LinkedEditingRange request was null at line {request.Position.Line}, column {request.Position.Character} for {request.TextDocument.DocumentUri}");
 
         return null;
     }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/MapCode/MapCodeEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/MapCode/MapCodeEndpoint.cs
index 744e653f479..d83f9fa6b7b 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/MapCode/MapCodeEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/MapCode/MapCodeEndpoint.cs
@@ -16,6 +16,7 @@
 using Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
 using Microsoft.AspNetCore.Razor.PooledObjects;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.Protocol;
@@ -82,7 +83,7 @@ public void ApplyCapabilities(VSInternalServerCapabilities serverCapabilities, V
                 continue;
             }
 
-            if (!_documentContextFactory.TryCreate(mapping.TextDocument.Uri, out var documentContext))
+            if (!_documentContextFactory.TryCreate(mapping.TextDocument.DocumentUri.GetRequiredParsedUri(), out var documentContext))
             {
                 continue;
             }
@@ -173,7 +174,7 @@ private async Task<bool> TryMapCodeAsync(
                 // as the code to map. The client is currently implemented using this behavior, but if it
                 // ever changes, we'll need to update this code to account for it (i.e., take into account
                 // focus location URIs).
-                Debug.Assert(location.Uri == documentContext.Uri);
+                Debug.Assert(location.DocumentUri.GetRequiredParsedUri() == documentContext.Uri);
 
                 var syntaxTree = await documentContext.GetSyntaxTreeAsync(cancellationToken).ConfigureAwait(false);
                 if (syntaxTree is null)
@@ -234,7 +235,7 @@ private async Task<bool> TryMapCodeAsync(
                         {
                             TextDocument = new OptionalVersionedTextDocumentIdentifier
                             {
-                                Uri = documentContext.Uri
+                                DocumentUri = new(documentContext.Uri)
                             },
                             Edits = [edit],
                         };
@@ -349,7 +350,7 @@ private async Task<LspLocation[][]> GetCSharpFocusLocationsAsync(LspLocation[][]
                     continue;
                 }
 
-                if (!_documentContextFactory.TryCreate(potentialLocation.Uri, out var documentContext))
+                if (!_documentContextFactory.TryCreate(potentialLocation.DocumentUri.GetRequiredParsedUri(), out var documentContext))
                 {
                     continue;
                 }
@@ -365,7 +366,7 @@ private async Task<LspLocation[][]> GetCSharpFocusLocationsAsync(LspLocation[][]
                     {
                         // We convert the URI to the C# generated document URI later on in
                         // LanguageServer.Client since we're unable to retrieve it here.
-                        Uri = potentialLocation.Uri,
+                        DocumentUri = potentialLocation.DocumentUri,
                         Range = generatedDocumentRange.ToRange()
                     };
 
@@ -392,7 +393,7 @@ private async Task<bool> TryHandleDelegatedResponseAsync(
             // into also supporting file creation/deletion/rename.
             foreach (var edit in documentEdits)
             {
-                var success = await TryProcessEditAsync(edit.TextDocument.Uri, edit.Edits, csharpChanges, cancellationToken).ConfigureAwait(false);
+                var success = await TryProcessEditAsync(edit.TextDocument.DocumentUri.GetRequiredParsedUri(), edit.Edits, csharpChanges, cancellationToken).ConfigureAwait(false);
                 if (!success)
                 {
                     return false;
@@ -436,7 +437,7 @@ async Task<bool> TryProcessEditAsync(
 
                 var textDocumentEdit = new TextDocumentEdit
                 {
-                    TextDocument = new OptionalVersionedTextDocumentIdentifier { Uri = hostDocumentUri },
+                    TextDocument = new OptionalVersionedTextDocumentIdentifier { DocumentUri = new(hostDocumentUri) },
                     Edits = [textEdit]
                 };
 
@@ -450,7 +451,7 @@ async Task<bool> TryProcessEditAsync(
     // Resolve edits that are at the same start location by merging them together.
     private static void MergeEdits(List<TextDocumentEdit> changes)
     {
-        var groupedChanges = changes.GroupBy(c => c.TextDocument.Uri).ToImmutableArray();
+        var groupedChanges = changes.GroupBy(c => c.TextDocument.DocumentUri).ToImmutableArray();
         changes.Clear();
         foreach (var documentChanges in groupedChanges)
         {
@@ -474,7 +475,7 @@ private static void MergeEdits(List<TextDocumentEdit> changes)
             {
                 TextDocument = new OptionalVersionedTextDocumentIdentifier
                 {
-                    Uri = documentChanges.Key,
+                    DocumentUri = documentChanges.Key,
                 },
                 Edits = edits.SelectMany(e => e.Edits).ToArray()
             };
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Mapping/RazorLanguageQueryEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Mapping/RazorLanguageQueryEndpoint.cs
index 0a9c93e8cea..4eec60e0cc7 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Mapping/RazorLanguageQueryEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Mapping/RazorLanguageQueryEndpoint.cs
@@ -26,7 +26,7 @@ public TextDocumentIdentifier GetTextDocumentIdentifier(RazorLanguageQueryParams
     {
         return new TextDocumentIdentifier
         {
-            Uri = request.Uri
+            DocumentUri = new(request.Uri)
         };
     }
 
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectContexts/ProjectContextsEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectContexts/ProjectContextsEndpoint.cs
index 4d34108c12b..d687504ccfc 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectContexts/ProjectContextsEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectContexts/ProjectContextsEndpoint.cs
@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.LanguageServer.EndpointContracts;
 using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.ProjectContexts;
@@ -40,7 +41,7 @@ public async Task<VSProjectContextList> HandleRequestAsync(VSGetProjectContextsP
             throw new ArgumentNullException(nameof(request));
         }
 
-        var delegatedParams = new DelegatedProjectContextsParams(request.TextDocument.Uri);
+        var delegatedParams = new DelegatedProjectContextsParams(request.TextDocument.DocumentUri.GetRequiredParsedUri());
 
         var response = await _clientConnection.SendRequestAsync<DelegatedProjectContextsParams, VSProjectContextList>(
             CustomMessageNames.RazorProjectContextsEndpoint,
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IDocumentContextFactoryExtensions.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IDocumentContextFactoryExtensions.cs
index 7e8a3a3bfcd..bc6af4106f9 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IDocumentContextFactoryExtensions.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/IDocumentContextFactoryExtensions.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Diagnostics.CodeAnalysis;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
@@ -13,7 +14,7 @@ public static bool TryCreate(
         this IDocumentContextFactory service,
         TextDocumentIdentifier documentIdentifier,
         [NotNullWhen(true)] out DocumentContext? context)
-            => service.TryCreate(documentIdentifier.Uri, documentIdentifier.GetProjectContext(), out context);
+            => service.TryCreate(documentIdentifier.DocumentUri.GetRequiredParsedUri(), documentIdentifier.GetProjectContext(), out context);
 
     public static bool TryCreate(
         this IDocumentContextFactory service,
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorRequestContextFactory.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorRequestContextFactory.cs
index 245311ec7df..f60149f5d29 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorRequestContextFactory.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorRequestContextFactory.cs
@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.LanguageServer.EndpointContracts;
 using Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
@@ -32,7 +33,7 @@ public override Task<RazorRequestContext> CreateRequestContextAsync<TRequestPara
             if (textDocumentHandler is ITextDocumentIdentifierHandler<TRequestParams, TextDocumentIdentifier> tdiHandler)
             {
                 var textDocumentIdentifier = tdiHandler.GetTextDocumentIdentifier(@params);
-                uri = textDocumentIdentifier.Uri;
+                uri = textDocumentIdentifier.DocumentUri.GetRequiredParsedUri();
 
                 _logger.LogDebug($"Trying to create DocumentContext for {queueItem.MethodName} for {textDocumentIdentifier.GetProjectContext()?.Id ?? "(no project context)"} for {uri}");
 
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/WrapWithTag/WrapWithTagEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/WrapWithTag/WrapWithTagEndpoint.cs
index 7b4e9f0dd5f..70df200c886 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/WrapWithTag/WrapWithTagEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/WrapWithTag/WrapWithTagEndpoint.cs
@@ -33,7 +33,7 @@ public TextDocumentIdentifier GetTextDocumentIdentifier(WrapWithTagParams reques
         var documentContext = requestContext.DocumentContext;
         if (documentContext is null)
         {
-            _logger.LogWarning($"Failed to find document {request.TextDocument.Uri}.");
+            _logger.LogWarning($"Failed to find document {request.TextDocument.DocumentUri}.");
             return null;
         }
 
@@ -120,7 +120,7 @@ public TextDocumentIdentifier GetTextDocumentIdentifier(WrapWithTagParams reques
 
         var versioned = new VersionedTextDocumentIdentifier
         {
-            Uri = request.TextDocument.Uri,
+            DocumentUri = request.TextDocument.DocumentUri,
             Version = documentContext.Snapshot.Version,
         };
         var parameter = new DelegatedWrapWithTagParams(versioned, request);
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/CodeActions/CohostCodeActionsEndpoint.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/CodeActions/CohostCodeActionsEndpoint.cs
index 3d0af51a254..6416017ff8a 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/CodeActions/CohostCodeActionsEndpoint.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/CodeActions/CohostCodeActionsEndpoint.cs
@@ -13,6 +13,7 @@
 using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost.Handlers;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.CodeActions;
 using Microsoft.CodeAnalysis.Razor.CodeActions.Models;
 using Microsoft.CodeAnalysis.Razor.Protocol;
@@ -103,7 +104,7 @@ public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilitie
 
     private async Task<RazorVSInternalCodeAction[]> GetCSharpCodeActionsAsync(TextDocument razorDocument, VSCodeActionParams request, Guid correlationId, CancellationToken cancellationToken)
     {
-        var generatedDocument = await razorDocument.Project.TryGetCSharpDocumentFromGeneratedDocumentUriAsync(request.TextDocument.Uri, cancellationToken).ConfigureAwait(false);
+        var generatedDocument = await razorDocument.Project.TryGetCSharpDocumentFromGeneratedDocumentUriAsync(request.TextDocument.DocumentUri.GetRequiredParsedUri(), cancellationToken).ConfigureAwait(false);
         if (generatedDocument is null)
         {
             return [];
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/FoldingRange/CohostFoldingRangeEndpoint.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/FoldingRange/CohostFoldingRangeEndpoint.cs
index 15d9cb898ac..bb9074aa22e 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/FoldingRange/CohostFoldingRangeEndpoint.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/FoldingRange/CohostFoldingRangeEndpoint.cs
@@ -92,7 +92,7 @@ public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilitie
     {
         var foldingRangeParams = new FoldingRangeParams
         {
-            TextDocument = new TextDocumentIdentifier { Uri = razorDocument.CreateUri() }
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(razorDocument.CreateUri()) }
         };
 
         var result = await _requestInvoker.MakeHtmlLspRequestAsync<FoldingRangeParams, FoldingRange[]>(
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Navigation/CohostGoToDefinitionEndpoint.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Navigation/CohostGoToDefinitionEndpoint.cs
index d750c87df27..db0805f3121 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Navigation/CohostGoToDefinitionEndpoint.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Navigation/CohostGoToDefinitionEndpoint.cs
@@ -11,6 +11,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.Remote;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 
@@ -102,11 +103,11 @@ public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilitie
 
         if (result.TryGetFirst(out var singleLocation))
         {
-            return LspFactory.CreateLocation(RemapVirtualHtmlUri(singleLocation.Uri), singleLocation.Range.ToLinePositionSpan());
+            return LspFactory.CreateLocation(RemapVirtualHtmlUri(singleLocation.DocumentUri.GetRequiredParsedUri()), singleLocation.Range.ToLinePositionSpan());
         }
         else if (result.TryGetSecond(out var multipleLocations))
         {
-            return Array.ConvertAll(multipleLocations, l => LspFactory.CreateLocation(RemapVirtualHtmlUri(l.Uri), l.Range.ToLinePositionSpan()));
+            return Array.ConvertAll(multipleLocations, l => LspFactory.CreateLocation(RemapVirtualHtmlUri(l.DocumentUri.GetRequiredParsedUri()), l.Range.ToLinePositionSpan()));
         }
         else if (result.TryGetThird(out var documentLinks))
         {
@@ -114,9 +115,9 @@ public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilitie
 
             foreach (var documentLink in documentLinks)
             {
-                if (documentLink.Target is Uri target)
+                if (documentLink.DocumentTarget is DocumentUri target)
                 {
-                    builder.Add(LspFactory.CreateDocumentLink(RemapVirtualHtmlUri(target), documentLink.Range.ToLinePositionSpan()));
+                    builder.Add(LspFactory.CreateDocumentLink(RemapVirtualHtmlUri(target.GetRequiredParsedUri()), documentLink.Range.ToLinePositionSpan()));
                 }
             }
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Navigation/CohostGoToImplementationEndpoint.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Navigation/CohostGoToImplementationEndpoint.cs
index aac48aef424..668fc951b1f 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Navigation/CohostGoToImplementationEndpoint.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/Navigation/CohostGoToImplementationEndpoint.cs
@@ -122,10 +122,10 @@ public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilitie
 
     private void RemapVirtualHtmlUri(LspLocation? location)
     {
-        if (location is not null &&
-            _filePathService.IsVirtualHtmlFile(location.Uri))
+        if (location?.DocumentUri.ParsedUri is { } uri &&
+            _filePathService.IsVirtualHtmlFile(uri))
         {
-            location.Uri = _filePathService.GetRazorDocumentUri(location.Uri);
+            location.DocumentUri = new(_filePathService.GetRazorDocumentUri(uri));
         }
     }
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/SignatureHelp/CohostSignatureHelpEndpoint.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/SignatureHelp/CohostSignatureHelpEndpoint.cs
index a643e563229..da8287a9fbf 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/SignatureHelp/CohostSignatureHelpEndpoint.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.CohostingShared/SignatureHelp/CohostSignatureHelpEndpoint.cs
@@ -10,6 +10,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.Remote;
 using Microsoft.CodeAnalysis.Razor.Workspaces.Settings;
 using Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
@@ -53,7 +54,7 @@ public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilitie
     }
 
     protected override RazorTextDocumentIdentifier? GetRazorTextDocumentIdentifier(SignatureHelpParams request)
-        => new RazorTextDocumentIdentifier(request.TextDocument.Uri, (request.TextDocument as VSTextDocumentIdentifier)?.ProjectContext?.Id);
+        => new RazorTextDocumentIdentifier(request.TextDocument.DocumentUri.GetRequiredParsedUri(), (request.TextDocument as VSTextDocumentIdentifier)?.ProjectContext?.Id);
 
     // NOTE: The use of SumType here is a little odd, but it allows us to return Roslyn LSP types from the Roslyn call, and VS LSP types from the Html
     //       call. It works because both sets of types are attributed the right way, so the Json ends up looking the same and the client doesn't
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentContext.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentContext.cs
index b142c97b4ea..a1a001c38e5 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentContext.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentContext.cs
@@ -29,7 +29,7 @@ internal class DocumentContext(Uri uri, IDocumentSnapshot snapshot, VSProjectCon
     public TextDocumentIdentifier GetTextDocumentIdentifier()
         => new VSTextDocumentIdentifier()
         {
-            Uri = Uri,
+            DocumentUri = new(Uri),
             ProjectContext = _projectContext,
         };
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Rename/RenameService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Rename/RenameService.cs
index a6c641cb100..ff19c248e22 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Rename/RenameService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Rename/RenameService.cs
@@ -75,7 +75,7 @@ internal class RenameService(
         using var _ = ListPool<SumType<TextDocumentEdit, CreateFile, RenameFile, DeleteFile>>.GetPooledObject(out var documentChanges);
         var fileRename = GetFileRenameForComponent(originComponentDocumentSnapshot, newPath);
         documentChanges.Add(fileRename);
-        AddEditsForCodeDocument(documentChanges, originTagHelpers, newName, documentContext.Uri, codeDocument);
+        AddEditsForCodeDocument(documentChanges, originTagHelpers, newName, new(documentContext.Uri), codeDocument);
 
         var documentSnapshots = GetAllDocumentSnapshots(documentContext.FilePath, solutionQueryOperations);
 
@@ -87,9 +87,9 @@ internal class RenameService(
         foreach (var documentChange in documentChanges)
         {
             if (documentChange.TryGetFirst(out var textDocumentEdit) &&
-                textDocumentEdit.TextDocument.Uri == fileRename.OldUri)
+                textDocumentEdit.TextDocument.DocumentUri == fileRename.OldDocumentUri)
             {
-                textDocumentEdit.TextDocument.Uri = fileRename.NewUri;
+                textDocumentEdit.TextDocument.DocumentUri = fileRename.NewDocumentUri;
             }
         }
 
@@ -136,17 +136,17 @@ private static ImmutableArray<IDocumentSnapshot> GetAllDocumentSnapshots(string
     private RenameFile GetFileRenameForComponent(IDocumentSnapshot documentSnapshot, string newPath)
         => new RenameFile
         {
-            OldUri = BuildUri(documentSnapshot.FilePath),
-            NewUri = BuildUri(newPath),
+            OldDocumentUri = BuildUri(documentSnapshot.FilePath),
+            NewDocumentUri = BuildUri(newPath),
         };
 
-    private Uri BuildUri(string filePath)
+    private DocumentUri BuildUri(string filePath)
     {
         // VS Code in Windows expects path to start with '/'
         var updatedPath = _languageServerFeatureOptions.ReturnCodeActionAndRenamePathsWithPrefixedSlash && !filePath.StartsWith("/")
                     ? '/' + filePath
                     : filePath;
-        return LspFactory.CreateFilePathUri(updatedPath);
+        return new(LspFactory.CreateFilePathUri(updatedPath));
     }
 
     private static string MakeNewPath(string originalPath, string newName)
@@ -180,10 +180,10 @@ private static void AddEditsForCodeDocument(
         List<SumType<TextDocumentEdit, CreateFile, RenameFile, DeleteFile>> documentChanges,
         ImmutableArray<TagHelperDescriptor> originTagHelpers,
         string newName,
-        Uri uri,
+        DocumentUri uri,
         RazorCodeDocument codeDocument)
     {
-        var documentIdentifier = new OptionalVersionedTextDocumentIdentifier { Uri = uri };
+        var documentIdentifier = new OptionalVersionedTextDocumentIdentifier { DocumentUri = uri };
         var tagHelperElements = codeDocument.GetRequiredSyntaxRoot()
             .DescendantNodes()
             .OfType<MarkupTagHelperElementSyntax>();
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/RemoteCodeActionsService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/RemoteCodeActionsService.cs
index 1de432143e1..15c3eb3ed63 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/RemoteCodeActionsService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/CodeActions/RemoteCodeActionsService.cs
@@ -51,7 +51,7 @@ private async ValueTask<CodeActionRequestInfo> GetCodeActionRequestInfoAsync(Rem
             {
                 // Since we're here, we may as well fill in the generated document Uri so the other caller won't have to calculate it
                 var generatedDocument = await context.Snapshot.GetGeneratedDocumentAsync(cancellationToken).ConfigureAwait(false);
-                csharpRequest.TextDocument.Uri = generatedDocument.CreateUri();
+                csharpRequest.TextDocument.DocumentUri = new(generatedDocument.CreateUri());
             }
         }
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/FindAllReferences/RemoteFindAllReferencesService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/FindAllReferences/RemoteFindAllReferencesService.cs
index b2f529fab6c..12366d5915f 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/FindAllReferences/RemoteFindAllReferencesService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/FindAllReferences/RemoteFindAllReferencesService.cs
@@ -94,7 +94,7 @@ protected override IRemoteFindAllReferencesService CreateService(in ServiceArgs
                 continue;
             }
 
-            var (mappedUri, mappedRange) = await DocumentMappingService.MapToHostDocumentUriAndRangeAsync(context.Snapshot, location.Uri, location.Range.ToLinePositionSpan(), cancellationToken).ConfigureAwait(false);
+            var (mappedUri, mappedRange) = await DocumentMappingService.MapToHostDocumentUriAndRangeAsync(context.Snapshot, location.DocumentUri.GetRequiredParsedUri(), location.Range.ToLinePositionSpan(), cancellationToken).ConfigureAwait(false);
 
             if (referenceItem is not null)
             {
@@ -102,7 +102,7 @@ protected override IRemoteFindAllReferencesService CreateService(in ServiceArgs
                 referenceItem.Origin = VSInternalItemOrigin.Exact;
 
                 // If we're going to change the Uri, then also override the file paths
-                if (mappedUri != location.Uri)
+                if (mappedUri != location.DocumentUri.GetRequiredParsedUri())
                 {
                     referenceItem.DisplayPath = mappedUri.AbsolutePath;
                     referenceItem.DocumentName = mappedUri.AbsolutePath;
@@ -112,7 +112,7 @@ protected override IRemoteFindAllReferencesService CreateService(in ServiceArgs
                 }
             }
 
-            location.Uri = mappedUri;
+            location.DocumentUri = new(mappedUri);
             location.Range = mappedRange.ToRange();
         }
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/GoToDefinition/RemoteGoToDefinitionService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/GoToDefinition/RemoteGoToDefinitionService.cs
index b158972d8b7..09d267d718c 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/GoToDefinition/RemoteGoToDefinitionService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/GoToDefinition/RemoteGoToDefinitionService.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.PooledObjects;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
 using Microsoft.CodeAnalysis.Razor.GoToDefinition;
 using Microsoft.CodeAnalysis.Razor.Protocol;
@@ -66,7 +67,7 @@ protected override IRemoteGoToDefinitionService CreateService(in ServiceArgs arg
             if (componentLocation is not null)
             {
                 // Convert from VS LSP Location to Roslyn. This can be removed when Razor moves fully onto Roslyn's LSP types.
-                return Results([LspFactory.CreateLocation(componentLocation.Uri, componentLocation.Range.ToLinePositionSpan())]);
+                return Results([LspFactory.CreateLocation(componentLocation.DocumentUri.GetRequiredParsedUri(), componentLocation.Range.ToLinePositionSpan())]);
             }
 
             // If it isn't a Razor component, and it isn't C#, let the server know to delegate to HTML.
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostDocumentPullDiagnosticsEndpoint.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostDocumentPullDiagnosticsEndpoint.cs
index b4de60e2e24..8aee1a1630d 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostDocumentPullDiagnosticsEndpoint.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostDocumentPullDiagnosticsEndpoint.cs
@@ -88,7 +88,7 @@ protected override VSInternalDocumentDiagnosticsParams CreateHtmlParams(Uri uri)
     {
         return new VSInternalDocumentDiagnosticsParams
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri }
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri) }
         };
     }
 
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostTextPresentationEndpoint.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostTextPresentationEndpoint.cs
index 0824774478f..b112cc863a1 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostTextPresentationEndpoint.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostTextPresentationEndpoint.cs
@@ -71,9 +71,10 @@ public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilitie
 
         foreach (var edit in edits)
         {
-            if (_filePathService.IsVirtualHtmlFile(edit.TextDocument.Uri))
+            if (edit.TextDocument.DocumentUri.ParsedUri is { } uri &&
+                _filePathService.IsVirtualHtmlFile(uri))
             {
-                edit.TextDocument = new OptionalVersionedTextDocumentIdentifier { Uri = _filePathService.GetRazorDocumentUri(edit.TextDocument.Uri) };
+                edit.TextDocument = new OptionalVersionedTextDocumentIdentifier { DocumentUri = new(_filePathService.GetRazorDocumentUri(uri)) };
             }
         }
 
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostUriPresentationEndpoint.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostUriPresentationEndpoint.cs
index 4d45900e0a7..d051ad75838 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostUriPresentationEndpoint.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostUriPresentationEndpoint.cs
@@ -75,7 +75,7 @@ public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilitie
                     {
                         TextDocument = new()
                         {
-                            Uri = request.TextDocument.Uri
+                            DocumentUri = request.TextDocument.DocumentUri
                         },
                         Edits = [sourceText.GetTextEdit(textChange)]
                     }
@@ -112,9 +112,10 @@ public ImmutableArray<Registration> GetRegistrations(VSInternalClientCapabilitie
         //       but if we move this all to OOP, per the above TODO, then that point is moot.
         foreach (var edit in edits)
         {
-            if (_filePathService.IsVirtualHtmlFile(edit.TextDocument.Uri))
+            if (edit.TextDocument.DocumentUri.ParsedUri is { } uri &&
+                _filePathService.IsVirtualHtmlFile(uri))
             {
-                edit.TextDocument = new OptionalVersionedTextDocumentIdentifier { Uri = _filePathService.GetRazorDocumentUri(edit.TextDocument.Uri) };
+                edit.TextDocument = new OptionalVersionedTextDocumentIdentifier { DocumentUri = new(_filePathService.GetRazorDocumentUri(uri)) };
             }
         }
 
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/HtmlRequestInvoker.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/HtmlRequestInvoker.cs
index 76f492747a7..283d5849818 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/HtmlRequestInvoker.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/HtmlRequestInvoker.cs
@@ -60,12 +60,12 @@ internal sealed class HtmlRequestInvoker(
 
         // If the request is for a text document, we need to update the Uri to point to the Html document,
         // and most importantly set it back again before leaving the method in case a caller uses it.
-        Uri? originalUri = null;
+        DocumentUri? originalUri = null;
         var textDocumentRequest = request as ITextDocumentParams;
         if (textDocumentRequest is not null)
         {
-            originalUri = textDocumentRequest.TextDocument.Uri;
-            textDocumentRequest.TextDocument.Uri = htmlDocument.Uri;
+            originalUri = textDocumentRequest.TextDocument.DocumentUri;
+            textDocumentRequest.TextDocument.DocumentUri = new(htmlDocument.Uri);
         }
 
         try
@@ -98,7 +98,7 @@ internal sealed class HtmlRequestInvoker(
             // Reset the Uri if we changed it.
             if (textDocumentRequest is not null && originalUri is not null)
             {
-                textDocumentRequest.TextDocument.Uri = originalUri;
+                textDocumentRequest.TextDocument.DocumentUri = originalUri;
             }
         }
     }
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget.cs
index 372c9f05c7f..2217c8d5518 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget.cs
@@ -7,6 +7,7 @@
 using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.Completion;
 using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
@@ -120,19 +121,21 @@ private async Task<SynchronizedResult<TVirtualDocumentSnapshot>> TrySynchronizeV
         [CallerMemberName] string? caller = null)
         where TVirtualDocumentSnapshot : VirtualDocumentSnapshot
     {
-        _logger.LogDebug($"Trying to synchronize for {caller} to version {requiredHostDocumentVersion} of {hostDocument.Uri} for {hostDocument.GetProjectContext()?.Id ?? "(no project context)"}");
+        _logger.LogDebug($"Trying to synchronize for {caller} to version {requiredHostDocumentVersion} of {hostDocument.DocumentUri} for {hostDocument.GetProjectContext()?.Id ?? "(no project context)"}");
+
+        var hostDocumentUri = hostDocument.DocumentUri.GetRequiredParsedUri();
 
         // For Html documents we don't do anything fancy, just call the standard service
         // If we're not generating unique document file names, then we can treat C# documents the same way
         if (!_languageServerFeatureOptions.IncludeProjectKeyInGeneratedFilePath ||
             typeof(TVirtualDocumentSnapshot) == typeof(HtmlVirtualDocumentSnapshot))
         {
-            var htmlResult = await _documentSynchronizer.TrySynchronizeVirtualDocumentAsync<TVirtualDocumentSnapshot>(requiredHostDocumentVersion, hostDocument.Uri, cancellationToken).ConfigureAwait(false);
+            var htmlResult = await _documentSynchronizer.TrySynchronizeVirtualDocumentAsync<TVirtualDocumentSnapshot>(requiredHostDocumentVersion, hostDocumentUri, cancellationToken).ConfigureAwait(false);
             _logger.LogDebug($"{(htmlResult.Synchronized ? "Did" : "Did NOT")} synchronize for {caller}: Version {requiredHostDocumentVersion} for {htmlResult.VirtualSnapshot?.Uri}");
             return htmlResult;
         }
 
-        var virtualDocument = FindVirtualDocument<TVirtualDocumentSnapshot>(hostDocument.Uri, hostDocument.GetProjectContext());
+        var virtualDocument = FindVirtualDocument<TVirtualDocumentSnapshot>(hostDocumentUri, hostDocument.GetProjectContext());
 
         if (virtualDocument is { ProjectKey.IsUnknown: true })
         {
@@ -140,7 +143,7 @@ private async Task<SynchronizedResult<TVirtualDocumentSnapshot>> TrySynchronizeV
             if (await _csharpVirtualDocumentAddListener.WaitForDocumentAddAsync(cancellationToken).ConfigureAwait(false))
             {
                 _logger.LogDebug($"Wait successful!");
-                virtualDocument = FindVirtualDocument<TVirtualDocumentSnapshot>(hostDocument.Uri, hostDocument.GetProjectContext());
+                virtualDocument = FindVirtualDocument<TVirtualDocumentSnapshot>(hostDocumentUri, hostDocument.GetProjectContext());
             }
             else
             {
@@ -151,28 +154,28 @@ private async Task<SynchronizedResult<TVirtualDocumentSnapshot>> TrySynchronizeV
         if (virtualDocument is null)
         {
             _logger.LogDebug($"No virtual document found, falling back to old code.");
-            return await _documentSynchronizer.TrySynchronizeVirtualDocumentAsync<TVirtualDocumentSnapshot>(requiredHostDocumentVersion, hostDocument.Uri, cancellationToken).ConfigureAwait(false);
+            return await _documentSynchronizer.TrySynchronizeVirtualDocumentAsync<TVirtualDocumentSnapshot>(requiredHostDocumentVersion, hostDocumentUri, cancellationToken).ConfigureAwait(false);
         }
 
-        var result = await _documentSynchronizer.TrySynchronizeVirtualDocumentAsync<TVirtualDocumentSnapshot>(requiredHostDocumentVersion, hostDocument.Uri, virtualDocument.Uri, rejectOnNewerParallelRequest, cancellationToken).ConfigureAwait(false);
+        var result = await _documentSynchronizer.TrySynchronizeVirtualDocumentAsync<TVirtualDocumentSnapshot>(requiredHostDocumentVersion, hostDocumentUri, virtualDocument.Uri, rejectOnNewerParallelRequest, cancellationToken).ConfigureAwait(false);
         _logger.LogDebug($"{(result.Synchronized ? "Did" : "Did NOT")} synchronize for {caller}: Version {requiredHostDocumentVersion} for {result.VirtualSnapshot?.Uri}");
 
         // If we failed to sync on version 1, then it could be that we got new information while waiting, so try again
         if (requiredHostDocumentVersion == 1 && !result.Synchronized)
         {
             _logger.LogDebug($"Sync failed for v1 document. Trying to get virtual document again.");
-            virtualDocument = FindVirtualDocument<TVirtualDocumentSnapshot>(hostDocument.Uri, hostDocument.GetProjectContext());
+            virtualDocument = FindVirtualDocument<TVirtualDocumentSnapshot>(hostDocumentUri, hostDocument.GetProjectContext());
 
             if (virtualDocument is null)
             {
                 _logger.LogDebug($"No virtual document found, falling back to old code.");
-                return await _documentSynchronizer.TrySynchronizeVirtualDocumentAsync<TVirtualDocumentSnapshot>(requiredHostDocumentVersion, hostDocument.Uri, cancellationToken).ConfigureAwait(false);
+                return await _documentSynchronizer.TrySynchronizeVirtualDocumentAsync<TVirtualDocumentSnapshot>(requiredHostDocumentVersion, hostDocumentUri, cancellationToken).ConfigureAwait(false);
             }
 
             _logger.LogDebug($"Got virtual document after trying again {virtualDocument.Uri}. Trying to synchronize again.");
 
             // try again
-            result = await _documentSynchronizer.TrySynchronizeVirtualDocumentAsync<TVirtualDocumentSnapshot>(requiredHostDocumentVersion, hostDocument.Uri, virtualDocument.Uri, rejectOnNewerParallelRequest, cancellationToken).ConfigureAwait(false);
+            result = await _documentSynchronizer.TrySynchronizeVirtualDocumentAsync<TVirtualDocumentSnapshot>(requiredHostDocumentVersion, hostDocumentUri, virtualDocument.Uri, rejectOnNewerParallelRequest, cancellationToken).ConfigureAwait(false);
             _logger.LogDebug($"{(result.Synchronized ? "Did" : "Did NOT")} synchronize for {caller}: Version {requiredHostDocumentVersion} for {result.VirtualSnapshot?.Uri}");
         }
 
@@ -189,16 +192,18 @@ private async Task<SynchronizedResult<TVirtualDocumentSnapshot>> TrySynchronizeV
             throw new InvalidOperationException("Got an LSP document synchronizer I don't know how to handle.");
         }
 
+        var hostDocumentUri = hostDocument.DocumentUri.GetRequiredParsedUri();
+
         // If we're not generating unique document file names, then we don't need to ensure we find the right virtual document
         // as there can only be one anyway
         if (_languageServerFeatureOptions.IncludeProjectKeyInGeneratedFilePath &&
             hostDocument.GetProjectContext() is { } projectContext &&
-            FindVirtualDocument<TVirtualDocumentSnapshot>(hostDocument.Uri, projectContext) is { } virtualDocument)
+            FindVirtualDocument<TVirtualDocumentSnapshot>(hostDocumentUri, projectContext) is { } virtualDocument)
         {
-            return documentSynchronizer.TryReturnPossiblyFutureSnapshot<TVirtualDocumentSnapshot>(requiredHostDocumentVersion, hostDocument.Uri, virtualDocument.Uri);
+            return documentSynchronizer.TryReturnPossiblyFutureSnapshot<TVirtualDocumentSnapshot>(requiredHostDocumentVersion, hostDocumentUri, virtualDocument.Uri);
         }
 
-        return documentSynchronizer.TryReturnPossiblyFutureSnapshot<TVirtualDocumentSnapshot>(requiredHostDocumentVersion, hostDocument.Uri);
+        return documentSynchronizer.TryReturnPossiblyFutureSnapshot<TVirtualDocumentSnapshot>(requiredHostDocumentVersion, hostDocumentUri);
     }
 
     private CSharpVirtualDocumentSnapshot? FindVirtualDocument<TVirtualDocumentSnapshot>(
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_CodeActions.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_CodeActions.cs
index a39adbdd394..fdbae784eca 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_CodeActions.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_CodeActions.cs
@@ -52,7 +52,7 @@ internal partial class RazorCustomMessageTarget
             return null;
         }
 
-        codeActionParams.CodeActionParams.TextDocument.Uri = virtualDocumentSnapshot.Uri;
+        codeActionParams.CodeActionParams.TextDocument.DocumentUri = new(virtualDocumentSnapshot.Uri);
 
         var textBuffer = virtualDocumentSnapshot.Snapshot.TextBuffer;
         var lspMethodName = Methods.TextDocumentCodeActionName;
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_Completion.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_Completion.cs
index 6ccd47a260e..8417457a063 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_Completion.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_Completion.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.PooledObjects;
 using Microsoft.AspNetCore.Razor.Threading;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Razor.Protocol.Completion;
@@ -28,7 +29,7 @@ internal partial class RazorCustomMessageTarget
             throw new ArgumentNullException(nameof(inlineCompletionParams));
         }
 
-        var hostDocumentUri = inlineCompletionParams.TextDocument.Uri;
+        var hostDocumentUri = inlineCompletionParams.TextDocument.DocumentUri.GetRequiredParsedUri();
         if (!_documentManager.TryGetDocument(hostDocumentUri, out var documentSnapshot))
         {
             return null;
@@ -64,7 +65,7 @@ internal partial class RazorCustomMessageTarget
         DelegatedCompletionParams request,
         CancellationToken cancellationToken)
     {
-        var hostDocumentUri = request.Identifier.TextDocumentIdentifier.Uri;
+        var hostDocumentUri = request.Identifier.TextDocumentIdentifier.DocumentUri.GetRequiredParsedUri();
 
         string languageServerName;
         bool synchronized;
@@ -312,7 +313,7 @@ private void UpdateVirtualDocument(
     [JsonRpcMethod(LanguageServerConstants.RazorGetFormattingOptionsEndpointName, UseSingleObjectParameterDeserialization = true)]
     public Task<FormattingOptions?> GetFormattingOptionsAsync(TextDocumentIdentifierAndVersion document, CancellationToken _)
     {
-        var formattingOptions = _formattingOptionsProvider.GetOptions(document.TextDocumentIdentifier.Uri);
+        var formattingOptions = _formattingOptionsProvider.GetOptions(document.TextDocumentIdentifier.DocumentUri.GetRequiredParsedUri());
 
         if (formattingOptions is null)
         {
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_Diagnostics.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_Diagnostics.cs
index ec308593445..0786409e3de 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_Diagnostics.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_Diagnostics.cs
@@ -27,7 +27,7 @@ internal partial class RazorCustomMessageTarget
         var hostDocument = new VSTextDocumentIdentifier
         {
             ProjectContext = request.Identifier.TextDocumentIdentifier.GetProjectContext(),
-            Uri = request.Identifier.TextDocumentIdentifier.Uri,
+            DocumentUri = request.Identifier.TextDocumentIdentifier.DocumentUri,
         };
 
         var csharpTask = Task.Run(() => GetVirtualDocumentPullDiagnosticsAsync<CSharpVirtualDocumentSnapshot>(hostDocument, request.Identifier.Version, request.Identifier.TextDocumentIdentifier, request.CorrelationId, RazorLSPConstants.RazorCSharpLanguageServerName, cancellationToken), cancellationToken);
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_DocumentColor.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_DocumentColor.cs
index ff7877b284c..659a3b2346e 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_DocumentColor.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_DocumentColor.cs
@@ -29,7 +29,7 @@ internal partial class RazorCustomMessageTarget
             return new List<ColorInformation>();
         }
 
-        documentColorParams.TextDocument.Uri = htmlDoc.Uri;
+        documentColorParams.TextDocument.DocumentUri = new(htmlDoc.Uri);
         var htmlTextBuffer = htmlDoc.Snapshot.TextBuffer;
         var requests = _requestInvoker.ReinvokeRequestOnMultipleServersAsync<DocumentColorParams, ColorInformation[]>(
             htmlTextBuffer,
@@ -64,7 +64,7 @@ public async Task<IReadOnlyList<ColorPresentation>> ProvideHtmlColorPresentation
             return new List<ColorPresentation>();
         }
 
-        colorPresentationParams.TextDocument.Uri = htmlDoc.Uri;
+        colorPresentationParams.TextDocument.DocumentUri = new(htmlDoc.Uri);
         var htmlTextBuffer = htmlDoc.Snapshot.TextBuffer;
         var requests = _requestInvoker.ReinvokeRequestOnMultipleServersAsync<ColorPresentationParams, ColorPresentation[]>(
             htmlTextBuffer,
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_FindAllReferences.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_FindAllReferences.cs
index f0da741c9ff..ee0bb07863e 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_FindAllReferences.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_FindAllReferences.cs
@@ -23,7 +23,7 @@ internal partial class RazorCustomMessageTarget
         {
             TextDocument = new VSTextDocumentIdentifier()
             {
-                Uri = delegationDetails.Value.ProjectedUri,
+                DocumentUri = new(delegationDetails.Value.ProjectedUri),
                 ProjectContext = null,
             },
             Position = request.ProjectedPosition,
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_FoldingRange.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_FoldingRange.cs
index a10e94fb9d9..965f5e8f57b 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_FoldingRange.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_FoldingRange.cs
@@ -31,7 +31,7 @@ internal partial class RazorCustomMessageTarget
         var hostDocument = new VSTextDocumentIdentifier
         {
             ProjectContext = foldingRangeParams.TextDocument.GetProjectContext(),
-            Uri = foldingRangeParams.TextDocument.Uri,
+            DocumentUri = foldingRangeParams.TextDocument.DocumentUri,
         };
 
         var csharpRanges = new List<FoldingRange>();
@@ -77,7 +77,7 @@ internal partial class RazorCustomMessageTarget
                 {
                     TextDocument = new()
                     {
-                        Uri = htmlDocument.Uri
+                        DocumentUri = new(htmlDocument.Uri)
                     }
                 };
 
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_MapCode.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_MapCode.cs
index 54026f53801..db64786b743 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_MapCode.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_MapCode.cs
@@ -3,6 +3,7 @@
 
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Razor.Telemetry;
 using StreamJsonRpc;
@@ -63,7 +64,7 @@ private void ConvertCSharpFocusLocationUris(Location[][] focusLocations)
                     continue;
                 }
 
-                if (!_documentManager.TryGetDocument(location.Uri, out var documentSnapshot))
+                if (!_documentManager.TryGetDocument(location.DocumentUri.GetRequiredParsedUri(), out var documentSnapshot))
                 {
                     continue;
                 }
@@ -73,7 +74,7 @@ private void ConvertCSharpFocusLocationUris(Location[][] focusLocations)
                     continue;
                 }
 
-                location.Uri = virtualDocument.Uri;
+                location.DocumentUri = new(virtualDocument.Uri);
             }
         }
     }
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_Presentation.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_Presentation.cs
index 9d2337ff89a..029960a2678 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_Presentation.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_Presentation.cs
@@ -60,7 +60,7 @@ internal partial class RazorCustomMessageTarget
 
         presentationParams.TextDocument = new TextDocumentIdentifier
         {
-            Uri = document.Uri,
+            DocumentUri = new(document.Uri),
         };
 
         var textBuffer = document.Snapshot.TextBuffer;
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_SemanticTokens.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_SemanticTokens.cs
index 79feaf869a0..4f55c4edfae 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_SemanticTokens.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_SemanticTokens.cs
@@ -75,7 +75,7 @@ internal partial class RazorCustomMessageTarget
             return new ProvideSemanticTokensResponse(tokens: null, hostDocumentSyncVersion: csharpDoc.HostDocumentSyncVersion ?? -1);
         }
 
-        requestParams.TextDocument.Uri = csharpDoc.Uri;
+        requestParams.TextDocument.DocumentUri = new(csharpDoc.Uri);
         var textBuffer = csharpDoc.Snapshot.TextBuffer;
 
         _logger.LogDebug($"Requesting semantic tokens for {csharpDoc.Uri}, for buffer version {textBuffer.CurrentSnapshot.Version.VersionNumber} and snapshot version {csharpDoc.Snapshot.Version.VersionNumber}, host version {semanticTokensParams.RequiredHostDocumentVersion}, correlation ID {semanticTokensParams.CorrelationId}");
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_TextDocumentPosition.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_TextDocumentPosition.cs
index 86fa205d7eb..3e7d644eb90 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_TextDocumentPosition.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_TextDocumentPosition.cs
@@ -44,7 +44,7 @@ public Task<SumType<LspLocation[], VSInternalReferenceItem[]>> ImplementationAsy
         {
             TextDocument = new VSTextDocumentIdentifier()
             {
-                Uri = delegationDetails.Value.ProjectedUri,
+                DocumentUri = new(delegationDetails.Value.ProjectedUri),
                 ProjectContext = null,
             },
             Position = request.ProjectedPosition,
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_UpdateCSharpBuffer.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_UpdateCSharpBuffer.cs
index 1c8f18e2d96..df742a29d9f 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_UpdateCSharpBuffer.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_UpdateCSharpBuffer.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.Protocol;
@@ -50,7 +51,7 @@ private async Task<bool> UpdateCSharpBufferCoreAsync(UpdateBufferRequest request
         await _joinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
 
         var identifier = CreateTextDocumentIdentifier(request);
-        var hostDocumentUri = identifier.Uri;
+        var hostDocumentUri = identifier.DocumentUri.GetRequiredParsedUri();
 
         _logger.LogDebug($"UpdateCSharpBuffer for {request.HostDocumentVersion} of {hostDocumentUri} in {request.ProjectKeyId}");
 
@@ -152,12 +153,12 @@ await TrySynchronizeVirtualDocumentAsync<CSharpVirtualDocumentSnapshot>(previous
 
     private static TextDocumentIdentifier CreateTextDocumentIdentifier(UpdateBufferRequest request)
     {
-        var hostDocumentUri = new Uri(request.HostDocumentFilePath);
+        var hostDocumentUri = new DocumentUri(new Uri(request.HostDocumentFilePath));
         if (request.ProjectKeyId is { } id)
         {
             return new VSTextDocumentIdentifier
             {
-                Uri = hostDocumentUri,
+                DocumentUri = hostDocumentUri,
                 ProjectContext = new VSProjectContext
                 {
                     Id = id,
@@ -165,7 +166,7 @@ private static TextDocumentIdentifier CreateTextDocumentIdentifier(UpdateBufferR
             };
         }
 
-        return new TextDocumentIdentifier { Uri = hostDocumentUri };
+        return new TextDocumentIdentifier { DocumentUri = hostDocumentUri };
     }
 
     private int GetLineCountOfVirtualDocument(Uri hostDocumentUri, CSharpVirtualDocumentSnapshot virtualDocument)
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_WrapWithTag.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_WrapWithTag.cs
index 9a87e888a71..d8669aa288e 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_WrapWithTag.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_WrapWithTag.cs
@@ -41,7 +41,7 @@ public async Task<VSInternalWrapWithTagResponse> RazorWrapWithTagAsync(VSInterna
             wrapWithParams.Range,
             wrapWithParams.TagName,
             wrapWithParams.Options,
-            new VersionedTextDocumentIdentifier() { Uri = projectedUri, });
+            new VersionedTextDocumentIdentifier() { DocumentUri = new(projectedUri), });
 
         var textBuffer = htmlDocument.Snapshot.TextBuffer;
         var result = await _requestInvoker.ReinvokeRequestOnServerAsync<VSInternalWrapWithTagParams, VSInternalWrapWithTagResponse>(
diff --git a/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Endpoints/RazorDocumentClosedEndpoint.cs b/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Endpoints/RazorDocumentClosedEndpoint.cs
index 094d2193c42..74c5e4c7d7a 100644
--- a/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Endpoints/RazorDocumentClosedEndpoint.cs
+++ b/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Endpoints/RazorDocumentClosedEndpoint.cs
@@ -8,6 +8,7 @@
 using Microsoft.AspNetCore.Razor.Threading;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
 
 namespace Microsoft.VisualStudioCode.RazorExtension.Endpoints;
@@ -29,7 +30,7 @@ internal class RazorDocumentClosedEndpoint(IHtmlDocumentSynchronizer htmlDocumen
 
     protected override Task<VoidResult> HandleRequestAsync(TextDocumentIdentifier textDocument, RazorCohostRequestContext requestContext, CancellationToken cancellationToken)
     {
-        _htmlDocumentSynchronizer.DocumentRemoved(requestContext.Uri.AssumeNotNull(), cancellationToken);
+        _htmlDocumentSynchronizer.DocumentRemoved(requestContext.DocumentUri.AssumeNotNull().GetRequiredParsedUri(), cancellationToken);
         return SpecializedTasks.Default<VoidResult>();
     }
 }
diff --git a/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Endpoints/RazorDynamicFileChangedEndpoint.cs b/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Endpoints/RazorDynamicFileChangedEndpoint.cs
index 69950ac49d0..a661e2da44b 100644
--- a/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Endpoints/RazorDynamicFileChangedEndpoint.cs
+++ b/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Endpoints/RazorDynamicFileChangedEndpoint.cs
@@ -5,6 +5,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
+using Microsoft.CodeAnalysis.Razor;
 
 namespace Microsoft.VisualStudioCode.RazorExtension.Endpoints;
 
@@ -20,7 +21,7 @@ internal class RazorDynamicFileChangedEndpoint : AbstractRazorNotificationHandle
     protected override Task HandleNotificationAsync(RazorDynamicFileChangedParams request, RazorRequestContext context, CancellationToken cancellationToken)
     {
         var dynamicFileInfoProvider = context.GetRequiredService<RazorLspDynamicFileInfoProvider>();
-        dynamicFileInfoProvider.Update(request.RazorDocument.Uri);
+        dynamicFileInfoProvider.Update(request.RazorDocument.DocumentUri.GetRequiredParsedUri());
 
         return Task.CompletedTask;
     }
diff --git a/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/HtmlDocumentPublisher.cs b/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/HtmlDocumentPublisher.cs
index e78dff233b5..07308afe0f0 100644
--- a/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/HtmlDocumentPublisher.cs
+++ b/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/HtmlDocumentPublisher.cs
@@ -24,7 +24,7 @@ public async Task PublishAsync(TextDocument document, SynchronizationResult sync
     {
         Assumed.True(synchronizationResult.Synchronized);
 
-        var request = new HtmlUpdateParameters(new TextDocumentIdentifier { Uri = document.CreateUri() }, synchronizationResult.Checksum.ToString(), htmlText);
+        var request = new HtmlUpdateParameters(new TextDocumentIdentifier { DocumentUri = new(document.CreateUri()) }, synchronizationResult.Checksum.ToString(), htmlText);
 
         var clientConnection = _razorClientServerManagerProvider.ClientLanguageServerManager.AssumeNotNull();
         await clientConnection.SendRequestAsync("razor/updateHtml", request, cancellationToken).ConfigureAwait(false);
diff --git a/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/HtmlRequestInvoker.cs b/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/HtmlRequestInvoker.cs
index 4740e9a85d4..39b0199c8f3 100644
--- a/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/HtmlRequestInvoker.cs
+++ b/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/HtmlRequestInvoker.cs
@@ -40,7 +40,7 @@ internal sealed class HtmlRequestInvoker(
         var forwardedRequest = new HtmlForwardedRequest<TRequest>(
             new TextDocumentIdentifier
             {
-                Uri = razorDocument.CreateUri()
+                DocumentUri = new(razorDocument.CreateUri())
             },
             checksumString,
             request);
diff --git a/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/LspDynamicFileProvider.LspTextChangesTextLoader.cs b/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/LspDynamicFileProvider.LspTextChangesTextLoader.cs
index 9142f62f9dc..bc6795d72b2 100644
--- a/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/LspDynamicFileProvider.LspTextChangesTextLoader.cs
+++ b/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/LspDynamicFileProvider.LspTextChangesTextLoader.cs
@@ -31,7 +31,7 @@ private sealed class LspTextChangesTextLoader(
         private readonly byte[] _checksum = checksum;
         private readonly SourceHashAlgorithm _checksumAlgorithm = checksumAlgorithm;
         private readonly int? _codePage = codePage;
-        private readonly Uri _razorUri = razorUri;
+        private readonly DocumentUri _razorUri = new(razorUri);
         private readonly IRazorClientLanguageServerManager _razorClientLanguageServerManager = razorClientLanguageServerManager;
         private readonly Lazy<SourceText> _emptySourceText = new(() =>
         {
@@ -100,7 +100,7 @@ private async Task<TextAndVersion> GetFullDocumentFromServerAsync(CancellationTo
                 {
                     RazorDocument = new()
                     {
-                        Uri = _razorUri,
+                        DocumentUri = _razorUri,
                     },
                     FullText = true
                 },
diff --git a/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/LspDynamicFileProvider.cs b/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/LspDynamicFileProvider.cs
index 2156151156d..6f67e3299c0 100644
--- a/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/LspDynamicFileProvider.cs
+++ b/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/LspDynamicFileProvider.cs
@@ -7,6 +7,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 
 namespace Microsoft.VisualStudioCode.RazorExtension.Services;
@@ -40,7 +41,7 @@ internal sealed partial class LspDynamicFileProvider(
         {
             RazorDocument = new()
             {
-                Uri = razorUri
+                DocumentUri = new(razorUri)
             }
         };
 
@@ -54,7 +55,7 @@ internal sealed partial class LspDynamicFileProvider(
             return null;
         }
 
-        var textDocument = await WorkspaceExtensions.GetTextDocumentAsync(workspace, response.CSharpDocument.Uri, cancellationToken).ConfigureAwait(false);
+        var textDocument = await WorkspaceExtensions.GetTextDocumentAsync(workspace, response.CSharpDocument.DocumentUri, cancellationToken).ConfigureAwait(false);
         var checksum = Convert.FromBase64String(response.Checksum);
         var textLoader = new LspTextChangesTextLoader(
             textDocument,
@@ -66,7 +67,7 @@ internal sealed partial class LspDynamicFileProvider(
             _clientLanguageServerManager);
 
         return new RazorDynamicFileInfo(
-            RazorUri.GetDocumentFilePathFromUri(response.CSharpDocument.Uri),
+            RazorUri.GetDocumentFilePathFromUri(response.CSharpDocument.DocumentUri.GetRequiredParsedUri()),
             SourceCodeKind.Regular,
             textLoader,
             documentServiceProvider: new LspDocumentServiceProvider(_clientLanguageServerManager));
@@ -78,7 +79,7 @@ public override Task RemoveDynamicFileInfoAsync(Workspace workspace, ProjectId p
         {
             CSharpDocument = new()
             {
-                Uri = new Uri(filePath)
+                DocumentUri = new(new Uri(filePath))
             }
         };
         return _clientLanguageServerManager.SendNotificationAsync(
diff --git a/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/MappingService.cs b/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/MappingService.cs
index b3039347266..48d696c32a4 100644
--- a/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/MappingService.cs
+++ b/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/MappingService.cs
@@ -38,7 +38,7 @@ public async Task<ImmutableArray<RazorMappedSpanResult>> MapSpansAsync(Document
         {
             CSharpDocument = new()
             {
-                Uri = new(document.FilePath)
+                DocumentUri = new(new Uri(document.FilePath))
             },
             Ranges = [.. spans.Select(sourceText.GetRange)]
         };
@@ -57,7 +57,7 @@ public async Task<ImmutableArray<RazorMappedSpanResult>> MapSpansAsync(Document
         Debug.Assert(response.Ranges.Length == spans.Count(), "The number of mapped ranges should match the number of input spans.");
 
         using var builder = new PooledArrayBuilder<RazorMappedSpanResult>(response.Spans.Length);
-        var filePath = response.RazorDocument.Uri.GetDocumentFilePath();
+        var filePath = response.RazorDocument.DocumentUri.GetRequiredParsedUri().GetDocumentFilePath();
 
         for (var i = 0; i < response.Spans.Length; i++)
         {
@@ -94,7 +94,7 @@ public async Task<ImmutableArray<RazorMappedEditResult>> MapTextChangesAsync(Doc
         {
             CSharpDocument = new()
             {
-                Uri = new(newDocument.FilePath)
+                DocumentUri = new(new Uri(newDocument.FilePath))
             },
             TextChanges = textChanges
         };
@@ -110,7 +110,7 @@ public async Task<ImmutableArray<RazorMappedEditResult>> MapTextChangesAsync(Doc
         }
 
         Debug.Assert(response.MappedTextChanges.Length == changes.Count(), "The number of mapped text changes should match the number of input text changes.");
-        var filePath = response.RazorDocument.Uri.GetDocumentFilePath();
+        var filePath = response.RazorDocument.DocumentUri.GetRequiredParsedUri().GetDocumentFilePath();
         var convertedChanges = Array.ConvertAll(response.MappedTextChanges, mappedChange => mappedChange.ToTextChange());
         var result = new RazorMappedEditResult(filePath, convertedChanges);
         return [result];
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/AutoInsert/OnAutoInsertEndpointTest.NetFx.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/AutoInsert/OnAutoInsertEndpointTest.NetFx.cs
index d0429bbd78a..c473bf7f032 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/AutoInsert/OnAutoInsertEndpointTest.NetFx.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/AutoInsert/OnAutoInsertEndpointTest.NetFx.cs
@@ -36,7 +36,7 @@ public async Task Handle_SingleProvider_InvokesProvider()
             LoggerFactory);
         var @params = new VSInternalDocumentOnAutoInsertParams()
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri, },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri), },
             Position = LspFactory.DefaultPosition,
             Character = ">",
             Options = new FormattingOptions
@@ -85,7 +85,7 @@ public async Task Handle_MultipleProviderSameTrigger_UsesSuccessful()
             LoggerFactory);
         var @params = new VSInternalDocumentOnAutoInsertParams()
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri, },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri), },
             Position = LspFactory.DefaultPosition,
             Character = ">",
             Options = new FormattingOptions
@@ -137,7 +137,7 @@ public async Task Handle_MultipleProviderSameTrigger_UsesFirstSuccessful()
             LoggerFactory);
         var @params = new VSInternalDocumentOnAutoInsertParams()
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri, },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri), },
             Position = LspFactory.DefaultPosition,
             Character = ">",
             Options = new FormattingOptions
@@ -181,7 +181,7 @@ public async Task Handle_NoApplicableProvider_CallsProviderAndReturnsNull()
             LoggerFactory);
         var @params = new VSInternalDocumentOnAutoInsertParams()
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri, },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri), },
             Position = LspFactory.DefaultPosition,
             Character = ">",
             Options = new FormattingOptions
@@ -223,7 +223,7 @@ public async Task Handle_OnTypeFormattingOff_Html_CallsLanguageServer()
             LoggerFactory);
         var @params = new VSInternalDocumentOnAutoInsertParams()
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri, },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri), },
             Position = LspFactory.DefaultPosition,
             Character = "=",
             Options = new FormattingOptions
@@ -263,7 +263,7 @@ public async Task Handle_AutoInsertAttributeQuotesOff_Html_DoesNotCallLanguageSe
             LoggerFactory);
         var @params = new VSInternalDocumentOnAutoInsertParams()
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri, },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri), },
             Position = LspFactory.DefaultPosition,
             Character = "=",
             Options = new FormattingOptions
@@ -410,7 +410,7 @@ private async Task VerifyCSharpOnAutoInsertAsync(string input, string expected,
         var text = codeDocument.Source.Text;
         var @params = new VSInternalDocumentOnAutoInsertParams()
         {
-            TextDocument = new TextDocumentIdentifier { Uri = new Uri(razorFilePath), },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(new Uri(razorFilePath)), },
             Position = text.GetPosition(cursorPosition),
             Character = character,
             Options = new FormattingOptions
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/AutoInsert/OnAutoInsertEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/AutoInsert/OnAutoInsertEndpointTest.cs
index 7ed9f62e82b..61148902489 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/AutoInsert/OnAutoInsertEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/AutoInsert/OnAutoInsertEndpointTest.cs
@@ -36,7 +36,7 @@ public async Task Handle_MultipleProviderUnmatchingTrigger_ReturnsNull()
             LoggerFactory);
         var @params = new VSInternalDocumentOnAutoInsertParams()
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri, },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri), },
             Position = LspFactory.DefaultPosition,
             Character = "!",
             Options = new FormattingOptions
@@ -78,7 +78,7 @@ public async Task Handle_DocumentNotFound_ReturnsNull()
         var uri = new Uri("file://path/test.razor");
         var @params = new VSInternalDocumentOnAutoInsertParams()
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri, },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri), },
             Position = LspFactory.DefaultPosition,
             Character = ">",
             Options = new FormattingOptions
@@ -119,7 +119,7 @@ public async Task Handle_OnTypeFormattingOff_CSharp_ReturnsNull()
             LoggerFactory);
         var @params = new VSInternalDocumentOnAutoInsertParams()
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri, },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri), },
             Position = LspFactory.CreatePosition(1, 3),
             Character = "/",
             Options = new FormattingOptions
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/AddUsingsCodeActionResolverTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/AddUsingsCodeActionResolverTest.cs
index 8f7dca3bc6a..80bbbc4ee03 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/AddUsingsCodeActionResolverTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/AddUsingsCodeActionResolverTest.cs
@@ -49,7 +49,7 @@ public void TryCreateAddUsingResolutionParams_CreatesResolutionParams()
     {
         // Arrange
         var fqn = "Abc.Xyz";
-        var docUri = new VSTextDocumentIdentifier { Uri = new Uri("c:/path") };
+        var docUri = new VSTextDocumentIdentifier { DocumentUri = new(new Uri("c:/path")) };
 
         // Act
         var result = AddUsingsCodeActionResolver.TryCreateAddUsingResolutionParams(fqn, docUri, additionalEdit: null, delegatedDocumentUri: null, out var @namespace, out var resolutionParams);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/CSharpCodeActionProviderTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/CSharpCodeActionProviderTest.cs
index 4aa63b263aa..f0a85c13710 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/CSharpCodeActionProviderTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/CSharpCodeActionProviderTest.cs
@@ -53,7 +53,7 @@ public async Task ProvideAsync_ValidCodeActions_ReturnsProvidedCodeAction()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -82,7 +82,7 @@ public async Task ProvideAsync_SupportsCodeActionResolveFalse_ValidCodeActions_R
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -108,7 +108,7 @@ public async Task ProvideAsync_FunctionsBlock_SingleLine_ValidCodeActions_Return
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -139,7 +139,7 @@ public async Task ProvideAsync_FunctionsBlock_OpenBraceSameLine_ValidCodeActions
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -171,7 +171,7 @@ public async Task ProvideAsync_FunctionsBlock_OpenBraceNextLine_ValidCodeActions
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -200,7 +200,7 @@ public async Task ProvideAsync_InvalidCodeActions_ReturnsNoCodeActions()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -235,7 +235,7 @@ public async Task ProvideAsync_InvalidCodeActions_ShowAllFeatureFlagOn_ReturnsCo
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -279,7 +279,7 @@ public async Task ProvideAsync_ImplicitExpression_ReturnsProvidedCodeAction()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/CSharpCodeActionResolverTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/CSharpCodeActionResolverTest.cs
index b9e9c8ad6a9..808fc748c79 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/CSharpCodeActionResolverTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/CSharpCodeActionResolverTest.cs
@@ -130,7 +130,7 @@ public async Task ResolveAsync_NonTextDocumentEdit_ReturnsOriginalCodeAction()
                 DocumentChanges = new SumType<TextDocumentEdit, CreateFile, RenameFile, DeleteFile>[] {
                         new CreateFile()
                         {
-                            Uri = new Uri("c:/some/uri.razor")
+                            DocumentUri = new(new Uri("c:/some/uri.razor"))
                         }
                     }
             }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/TypeAccessibilityCodeActionProviderTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/TypeAccessibilityCodeActionProviderTest.cs
index 8301a768efb..c2726557996 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/TypeAccessibilityCodeActionProviderTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CSharp/TypeAccessibilityCodeActionProviderTest.cs
@@ -32,7 +32,7 @@ public async Task Handle_MissingDiagnostics_ReturnsEmpty()
         var contents = "";
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
             {
@@ -67,7 +67,7 @@ public async Task Handle_InvalidDiagnostics_VSCode_ReturnsEmpty()
         var contents = "";
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
             {
@@ -120,7 +120,7 @@ public async Task Handle_EmptyCodeActions_ReturnsEmpty()
         var contents = "";
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
             {
@@ -158,7 +158,7 @@ public async Task Handle_ValidDiagnostic_ValidCodeAction_VSCode_ReturnsCodeActio
         var contents = "@code { Path; }";
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
             {
@@ -232,7 +232,7 @@ public async Task Handle_CodeActionInSingleLineDirective_VS_ReturnsOnlyUsingCode
         var contents = "@inject Path";
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
             {
@@ -282,7 +282,7 @@ public async Task Handle_ValidCodeAction_VS_ReturnsCodeActions()
         var contents = "@code { Path; }";
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
             {
@@ -338,7 +338,7 @@ public async Task Handle_ValidDiagnostic_MultipleValidCodeActions_VSCode_Returns
         var contents = "@code { Path; }";
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
             {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CodeActionEndToEndTestBase.NetFx.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CodeActionEndToEndTestBase.NetFx.cs
index 71d8f3409e4..ea5463f2f9d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CodeActionEndToEndTestBase.NetFx.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CodeActionEndToEndTestBase.NetFx.cs
@@ -92,7 +92,7 @@ internal async Task ValidateCodeBehindFileAsync(
             var codeBehindSourceText = SourceText.From(initialCodeBehindContent);
             foreach (var change in changes)
             {
-                if (FilePathNormalizer.Normalize(change.TextDocument.Uri.GetAbsoluteOrUNCPath()) == codeBehindFilePath)
+                if (FilePathNormalizer.Normalize(change.TextDocument.DocumentUri.GetAbsoluteOrUNCPath()) == codeBehindFilePath)
                 {
                     codeBehindEdits.AddRange(change.Edits.Select(e => codeBehindSourceText.GetTextChange((TextEdit)e)));
                 }
@@ -241,7 +241,7 @@ internal async Task<SumType<Command, CodeAction>[]> GetCodeActionsAsync(
 
         var @params = new VSCodeActionParams
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = uri },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(uri) },
             Range = sourceText.GetRange(textSpan),
             Context = new VSInternalCodeActionContext() { Diagnostics = diagnostics ?? [] }
         };
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CodeActionEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CodeActionEndpointTest.cs
index 1e60e35b687..4c29a528601 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CodeActionEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CodeActionEndpointTest.cs
@@ -40,7 +40,7 @@ public async Task Handle_NoDocument()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = documentPath },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(documentPath) },
             Range = LspFactory.CreateZeroWidthRange(0, 1),
             Context = new VSInternalCodeActionContext()
         };
@@ -65,7 +65,7 @@ public async Task Handle_NoProviders()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = documentPath },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(documentPath) },
             Range = LspFactory.CreateZeroWidthRange(0, 1),
             Context = new VSInternalCodeActionContext()
         };
@@ -91,7 +91,7 @@ public async Task Handle_OneRazorCodeActionProvider()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = documentPath },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(documentPath) },
             Range = LspFactory.CreateZeroWidthRange(0, 1),
             Context = new VSInternalCodeActionContext()
         };
@@ -121,7 +121,7 @@ public async Task Handle_OneCSharpCodeActionProvider()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = documentPath },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(documentPath) },
             Range = LspFactory.CreateZeroWidthRange(0, 1),
             Context = new VSInternalCodeActionContext()
         };
@@ -147,7 +147,7 @@ public async Task Handle_OneCodeActionProviderWithMultipleCodeActions()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = documentPath },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(documentPath) },
             Range = LspFactory.CreateZeroWidthRange(0, 1),
             Context = new VSInternalCodeActionContext()
         };
@@ -183,7 +183,7 @@ public async Task Handle_MultipleCodeActionProvidersWithMultipleCodeActions()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = documentPath },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(documentPath) },
             Range = LspFactory.CreateZeroWidthRange(0, 1),
             Context = new VSInternalCodeActionContext()
         };
@@ -218,7 +218,7 @@ public async Task Handle_MultipleProviders()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = documentPath },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(documentPath) },
             Range = LspFactory.CreateZeroWidthRange(0, 1),
             Context = new VSInternalCodeActionContext()
         };
@@ -244,7 +244,7 @@ public async Task Handle_OneNullReturningProvider()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = documentPath },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(documentPath) },
             Range = LspFactory.CreateZeroWidthRange(0, 1),
             Context = new VSInternalCodeActionContext()
         };
@@ -281,7 +281,7 @@ public async Task Handle_MultipleMixedProvider()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = documentPath },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(documentPath) },
             Range = LspFactory.CreateZeroWidthRange(0, 1),
             Context = new VSInternalCodeActionContext()
         };
@@ -313,7 +313,7 @@ public async Task Handle_MultipleMixedProvider_SupportsCodeActionResolveTrue()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = documentPath },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(documentPath) },
             Range = LspFactory.CreateZeroWidthRange(0, 1),
             Context = new VSInternalCodeActionContext()
         };
@@ -355,7 +355,7 @@ public async Task Handle_MixedProvider_SupportsCodeActionResolveTrue_UsesGroups(
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = documentPath },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(documentPath) },
             Range = LspFactory.CreateZeroWidthRange(0, 1),
             Context = new VSInternalCodeActionContext()
         };
@@ -398,7 +398,7 @@ public async Task Handle_MultipleMixedProvider_SupportsCodeActionResolveFalse()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = documentPath },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(documentPath) },
             Range = LspFactory.CreateZeroWidthRange(0, 1),
             Context = new VSInternalCodeActionContext()
         };
@@ -437,7 +437,7 @@ public async Task GetCSharpCodeActionsFromLanguageServerAsync_InvalidRangeMappin
         var initialRange = LspFactory.CreateZeroWidthRange(0, 1);
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = documentPath },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(documentPath) },
             Range = initialRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -466,7 +466,7 @@ public async Task GetCSharpCodeActionsFromLanguageServerAsync_ReturnsCodeActions
         var initialRange = LspFactory.CreateZeroWidthRange(0, 1);
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = documentPath },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(documentPath) },
             Range = initialRange,
             Context = new VSInternalCodeActionContext()
             {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Html/HtmlCodeActionProviderTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Html/HtmlCodeActionProviderTest.cs
index 8534b9a62e9..b83612a2a1b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Html/HtmlCodeActionProviderTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Html/HtmlCodeActionProviderTest.cs
@@ -9,6 +9,7 @@
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Test.Common;
 using Microsoft.AspNetCore.Razor.Test.Common.LanguageServer;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.CodeActions;
 using Microsoft.CodeAnalysis.Razor.CodeActions.Models;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
@@ -34,7 +35,7 @@ public async Task ProvideAsync_WrapsResolvableCodeActions()
         var documentPath = "c:/Test.razor";
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -65,7 +66,7 @@ public async Task ProvideAsync_RemapsAndFixesEdits()
         var documentPath = "c:/Test.razor";
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -79,7 +80,7 @@ public async Task ProvideAsync_RemapsAndFixesEdits()
                 new() {
                     TextDocument = new OptionalVersionedTextDocumentIdentifier
                     {
-                        Uri = new Uri(documentPath),
+                        DocumentUri = new(new Uri(documentPath)),
                     },
                     Edits = [LspFactory.CreateTextEdit(context.SourceText.GetRange(span), "Goo /*~~~~~~~~~~~*/ Bar")]
                 }
@@ -105,7 +106,7 @@ public async Task ProvideAsync_RemapsAndFixesEdits()
                         new() {
                             TextDocument = new OptionalVersionedTextDocumentIdentifier
                             {
-                                Uri = new Uri("c:/Test.razor.html"),
+                                DocumentUri = new(new Uri("c:/Test.razor.html")),
                             },
                             Edits = [LspFactory.CreateTextEdit(position: (0, 0), "Goo")]
                         }
@@ -121,7 +122,7 @@ public async Task ProvideAsync_RemapsAndFixesEdits()
         var action = Assert.Single(providedCodeActions);
         Assert.NotNull(action.Edit);
         Assert.True(action.Edit.TryGetTextDocumentEdits(out var documentEdits));
-        Assert.Equal(documentPath, documentEdits[0].TextDocument.Uri.AbsolutePath);
+        Assert.Equal(documentPath, documentEdits[0].TextDocument.DocumentUri.GetRequiredParsedUri().AbsolutePath);
         // Edit should be converted to 2 edits, to remove the tags
         Assert.Collection(documentEdits[0].Edits,
             e =>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Html/HtmlCodeActionResolverTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Html/HtmlCodeActionResolverTest.cs
index 84eb020f00c..dfd59284730 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Html/HtmlCodeActionResolverTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Html/HtmlCodeActionResolverTest.cs
@@ -7,6 +7,7 @@
 using Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
 using Microsoft.AspNetCore.Razor.Test.Common;
 using Microsoft.AspNetCore.Razor.Test.Common.LanguageServer;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.CodeActions;
 using Microsoft.CodeAnalysis.Razor.CodeActions.Models;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
@@ -39,7 +40,7 @@ public async Task ResolveAsync_RemapsAndFixesEdits()
                 new() {
                     TextDocument = new OptionalVersionedTextDocumentIdentifier
                     {
-                        Uri = documentUri,
+                        DocumentUri = new(documentUri),
                     },
                     Edits = [LspFactory.CreateTextEdit(sourceText.GetRange(span), "Goo /*~~~~~~~~~~~*/ Bar")]
                 }
@@ -69,7 +70,7 @@ public async Task ResolveAsync_RemapsAndFixesEdits()
                             {
                                 TextDocument = new OptionalVersionedTextDocumentIdentifier
                                 {
-                                    Uri = new Uri("c:/Test.razor.html"),
+                                    DocumentUri = new(new Uri("c:/Test.razor.html")),
                                 },
                                 Edits = [LspFactory.CreateTextEdit(position: (0, 0), "Goo")]
                             }
@@ -83,7 +84,7 @@ public async Task ResolveAsync_RemapsAndFixesEdits()
         // Assert
         Assert.NotNull(action.Edit);
         Assert.True(action.Edit.TryGetTextDocumentEdits(out var documentEdits));
-        Assert.Equal(documentPath, documentEdits[0].TextDocument.Uri.AbsolutePath);
+        Assert.Equal(documentPath, documentEdits[0].TextDocument.DocumentUri.GetRequiredParsedUri().AbsolutePath);
         // Edit should be converted to 2 edits, to remove the tags
         Assert.Collection(documentEdits[0].Edits,
             e =>
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ComponentAccessibilityCodeActionProviderTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ComponentAccessibilityCodeActionProviderTest.cs
index ec8c6476565..19b49a62c9a 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ComponentAccessibilityCodeActionProviderTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ComponentAccessibilityCodeActionProviderTest.cs
@@ -35,7 +35,7 @@ public async Task Handle_NoTagName_DoesNotProvideLightBulb()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.CreateZeroWidthRange(0, 1),
             Context = new VSInternalCodeActionContext()
         };
@@ -63,7 +63,7 @@ public async Task Handle_InvalidSyntaxTree_NoStartNode()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -97,7 +97,7 @@ public async Task Handle_CursorOutsideComponent()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -125,7 +125,7 @@ public async Task Handle_ExistingComponent_SupportsFileCreationTrue_ReturnsResul
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -172,7 +172,7 @@ public async Task Handle_ExistingComponent_CaseIncorrect_ReturnsResults()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -221,7 +221,7 @@ @using Fully.Qualified
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -262,7 +262,7 @@ public async Task Handle_ExistingGenericComponent_SupportsFileCreationTrue_Retur
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -309,7 +309,7 @@ public async Task Handle_NewComponent_SupportsFileCreationTrue_ReturnsResult()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -339,7 +339,7 @@ public async Task Handle_NewComponent_CaretInAttribute_ReturnsResult()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -369,7 +369,7 @@ public async Task Handle_NewComponent_SupportsFileCreationFalse_ReturnsEmpty()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -397,7 +397,7 @@ public async Task Handle_ExistingComponent_SupportsFileCreationFalse_ReturnsResu
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ExtractToCodeBehindCodeActionProviderTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ExtractToCodeBehindCodeActionProviderTest.cs
index b541171d332..df5b60af6f2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ExtractToCodeBehindCodeActionProviderTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ExtractToCodeBehindCodeActionProviderTest.cs
@@ -40,7 +40,7 @@ public async Task Handle_InvalidFileKind()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -69,7 +69,7 @@ public async Task Handle_OutsideCodeDirective()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -98,7 +98,7 @@ public async Task Handle_InCodeDirectiveBlock_ReturnsNull()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -127,7 +127,7 @@ public async Task Handle_InCodeDirectiveMalformed_ReturnsNull()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -161,7 +161,7 @@ void Test()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -201,7 +201,7 @@ public async Task Handle_InCodeDirective_SupportsFileCreationTrue_ReturnsResult(
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -243,7 +243,7 @@ public async Task Handle_AtEndOfCodeDirectiveWithNoSpace_ReturnsResult()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -279,7 +279,7 @@ public async Task Handle_InCodeDirective_SupportsFileCreationFalse_ReturnsNull()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -314,7 +314,7 @@ public async Task Handle_InFunctionsDirective_SupportsFileCreationTrue_ReturnsRe
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -350,7 +350,7 @@ public async Task Handle_NullRelativePath_ReturnsNull()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = null!
         };
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ExtractToComponentCodeActionProviderTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ExtractToComponentCodeActionProviderTest.cs
index cd07057cd70..643593e9c0d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ExtractToComponentCodeActionProviderTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ExtractToComponentCodeActionProviderTest.cs
@@ -59,7 +59,7 @@ public async Task Handle_InvalidFileKind()
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
@@ -666,7 +666,7 @@ private async Task TestAsync(string contents)
 
         var request = new VSCodeActionParams()
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = new Uri(documentPath) },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(new Uri(documentPath)) },
             Range = LspFactory.DefaultRange,
             Context = new VSInternalCodeActionContext()
         };
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ExtractToComponentCodeActionResolverTest.NetFx.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ExtractToComponentCodeActionResolverTest.NetFx.cs
index a4c951b9110..68b9e09caff 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ExtractToComponentCodeActionResolverTest.NetFx.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Razor/ExtractToComponentCodeActionResolverTest.NetFx.cs
@@ -9,6 +9,7 @@
 using Microsoft.AspNetCore.Razor.LanguageServer.Formatting;
 using Microsoft.AspNetCore.Razor.Test.Common.Workspaces;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.CodeActions.Razor;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Testing;
@@ -325,13 +326,13 @@ private async Task TestAsync(
             [resolver]
             );
 
-        var edits = changes.Where(change => change.TextDocument.Uri.AbsolutePath == componentFilePath).Single();
+        var edits = changes.Where(change => change.TextDocument.DocumentUri.GetRequiredParsedUri().AbsolutePath == componentFilePath).Single();
         var actual = edits.Edits.Select(edit => ((TextEdit)edit).NewText).Single();
 
         AssertEx.EqualOrDiff(expectedNewComponent, actual);
 
         var originalDocumentEdits = changes
-            .Where(change => change.TextDocument.Uri.AbsolutePath == razorFilePath)
+            .Where(change => change.TextDocument.DocumentUri.GetRequiredParsedUri().AbsolutePath == razorFilePath)
             .SelectMany(change => change.Edits.Select(e => sourceText.GetTextChange(((TextEdit)e))));
         var documentText = sourceText.WithChanges(originalDocumentEdits).ToString();
         AssertEx.EqualOrDiff(expectedOriginalDocument, documentText);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/Delegation/CompletionTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/Delegation/CompletionTestBase.cs
index b6ab609c3de..fc10225c0c2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/Delegation/CompletionTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/Delegation/CompletionTestBase.cs
@@ -7,6 +7,7 @@
 using Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
 using Microsoft.AspNetCore.Razor.Test.Common.LanguageServer;
 using Microsoft.AspNetCore.Razor.Test.Common.Workspaces;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.Completion;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
 using Microsoft.CodeAnalysis.Razor.Protocol;
@@ -76,7 +77,7 @@ private protected static IClientConnection CreateClientConnectionForCompletion(
                 {
                     processParams?.Invoke(@params);
 
-                    var csharpDocumentPath = @params.Identifier.TextDocumentIdentifier.Uri.OriginalString + "__virtual.g.cs";
+                    var csharpDocumentPath = @params.Identifier.TextDocumentIdentifier.DocumentUri.GetRequiredParsedUri().OriginalString + "__virtual.g.cs";
                     var csharpDocumentUri = new Uri(csharpDocumentPath);
                     var csharpCompletionParams = new CompletionParams()
                     {
@@ -84,7 +85,7 @@ private protected static IClientConnection CreateClientConnectionForCompletion(
                         Position = @params.ProjectedPosition,
                         TextDocument = new TextDocumentIdentifier()
                         {
-                            Uri = csharpDocumentUri
+                            DocumentUri = new(csharpDocumentUri)
                         }
                     };
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/RazorCompletionEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/RazorCompletionEndpointTest.cs
index 21e592ee9fe..c8bfc855d68 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/RazorCompletionEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/RazorCompletionEndpointTest.cs
@@ -26,7 +26,7 @@ public async Task Handle_NoDocumentContext_NoCompletionItems()
         {
             TextDocument = new TextDocumentIdentifier()
             {
-                Uri = new Uri(documentPath)
+                DocumentUri = new(new Uri(documentPath))
             },
             Position = LspFactory.CreatePosition(0, 1),
             Context = new VSInternalCompletionContext(),
@@ -54,7 +54,7 @@ public async Task Handle_AutoShowCompletionDisabled_NoCompletionItems()
         {
             TextDocument = new TextDocumentIdentifier()
             {
-                Uri = uri
+                DocumentUri = new(uri)
             },
             Position = LspFactory.CreatePosition(0, 1),
             Context = new VSInternalCompletionContext() { InvokeKind = VSInternalCompletionInvokeKind.Typing },
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Debugging/DataTipRangeHandlerEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Debugging/DataTipRangeHandlerEndpointTest.cs
index 279b96817f4..2c4d99478d3 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Debugging/DataTipRangeHandlerEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Debugging/DataTipRangeHandlerEndpointTest.cs
@@ -102,7 +102,7 @@ private async Task VerifyDataTipRangeAsync(string input, VSInternalDataTipTags d
         {
             TextDocument = new TextDocumentIdentifier
             {
-                Uri = new Uri(razorFilePath)
+                DocumentUri = new(new Uri(razorFilePath))
             },
             Position = codeDocument.Source.Text.GetPosition(position)
         };
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Debugging/ValidateBreakpointRangeEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Debugging/ValidateBreakpointRangeEndpointTest.cs
index b915f35c25a..973bbb9e0fb 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Debugging/ValidateBreakpointRangeEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Debugging/ValidateBreakpointRangeEndpointTest.cs
@@ -144,7 +144,7 @@ private async Task VerifyBreakpointRangeAsync(string input)
         {
             TextDocument = new TextDocumentIdentifier
             {
-                Uri = new Uri(razorFilePath)
+                DocumentUri = new(new Uri(razorFilePath))
             },
             Range = codeDocument.Source.Text.GetRange(breakpointSpan)
         };
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Definition/DefinitionEndpointDelegationTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Definition/DefinitionEndpointDelegationTest.cs
index 115c2b53fc4..9be857e485b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Definition/DefinitionEndpointDelegationTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Definition/DefinitionEndpointDelegationTest.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.CodeAnalysis.Testing;
 using Microsoft.CodeAnalysis.Text;
@@ -87,13 +88,13 @@ public async Task Handle_SingleServer_CSharp_MetadataReference()
         Assert.NotNull(result.Value.Third);
         var locations = result.Value.Third;
         var location = Assert.Single(locations);
-        Assert.EndsWith("String.cs", location.Uri.ToString());
+        Assert.EndsWith("String.cs", location.DocumentUri.UriString);
 
         // Note: The location is in a generated C# "metadata-as-source" file, which has a different
         // number of using directives in .NET Framework vs. .NET Core, so rather than relying on line
         // numbers we do some vague notion of actual navigation and test the actual source line that
         // the user would see.
-        var line = File.ReadLines(location.Uri.LocalPath).ElementAt(location.Range.Start.Line);
+        var line = File.ReadLines(location.DocumentUri.GetRequiredParsedUri().LocalPath).ElementAt(location.Range.Start.Line);
         Assert.Contains("public sealed class String", line);
     }
 
@@ -193,7 +194,7 @@ @namespace BlazorApp1.Shared
 
         // Our tests don't currently support mapping multiple documents, so we just need to verify Roslyn sent back the right info.
         // Other tests verify mapping behavior
-        Assert.EndsWith("SurveyPrompt.razor.ide.g.cs", location.Uri.ToString());
+        Assert.EndsWith("SurveyPrompt.razor.ide.g.cs", location.DocumentUri.UriString);
 
         // We can still expect the character to be correct, even if the line won't match
         var surveyPromptSourceText = SourceText.From(surveyPrompt);
@@ -216,7 +217,7 @@ private async Task VerifyCSharpGoToDefinitionAsync(string input, string? filePat
         Assert.NotNull(result.Value.Third);
         var locations = result.Value.Third;
         var location = Assert.Single(locations);
-        Assert.Equal(new Uri(razorFilePath), location.Uri);
+        Assert.Equal(new Uri(razorFilePath), location.DocumentUri.GetRequiredParsedUri());
 
         var expectedRange = codeDocument.Source.Text.GetRange(expectedSpan);
         Assert.Equal(expectedRange, location.Range);
@@ -250,7 +251,7 @@ await projectManager.UpdateAsync(updater =>
         {
             TextDocument = new TextDocumentIdentifier
             {
-                Uri = new Uri(razorFilePath)
+                DocumentUri = new(new Uri(razorFilePath))
             },
             Position = codeDocument.Source.Text.GetPosition(cursorPosition)
         };
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Diagnostics/DiagnosticsEndToEndTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Diagnostics/DiagnosticsEndToEndTest.cs
index 7c011adfa38..4d9b038203e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Diagnostics/DiagnosticsEndToEndTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Diagnostics/DiagnosticsEndToEndTest.cs
@@ -90,7 +90,7 @@ private async Task ValidateDiagnosticsAsync(string input, string? filePath = nul
 
         var diagnosticsRequest = new DocumentDiagnosticParams
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri }
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri) }
         };
 
         var report = await diagnosticsEndPoint.HandleRequestAsync(diagnosticsRequest, requestContext, DisposalToken);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Diagnostics/VSCSharpDiagnosticsEndToEndTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Diagnostics/VSCSharpDiagnosticsEndToEndTest.cs
index 1afb17c4830..b0cce2367f4 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Diagnostics/VSCSharpDiagnosticsEndToEndTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Diagnostics/VSCSharpDiagnosticsEndToEndTest.cs
@@ -89,7 +89,7 @@ private async Task ValidateDiagnosticsAsync(string input, string? filePath = nul
 
         var diagnosticsRequest = new VSInternalDocumentDiagnosticsParams
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri }
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri) }
         };
         var diagnostics = await diagnosticsEndPoint.HandleRequestAsync(diagnosticsRequest, requestContext, DisposalToken);
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentHighlighting/DocumentHighlightEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentHighlighting/DocumentHighlightEndpointTest.cs
index 9eb120cd34f..d450877bb04 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentHighlighting/DocumentHighlightEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentHighlighting/DocumentHighlightEndpointTest.cs
@@ -11,6 +11,7 @@
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
 using Microsoft.AspNetCore.Razor.Test.Common.LanguageServer;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.CodeAnalysis.Testing;
@@ -127,12 +128,12 @@ private async Task VerifyHighlightingRangesAsync(string input)
         {
             TextDocument = new TextDocumentIdentifier
             {
-                Uri = new Uri(razorFilePath)
+                DocumentUri = new(new Uri(razorFilePath))
             },
             Position = codeDocument.Source.Text.GetPosition(cursorPosition)
         };
 
-        var documentContext = CreateDocumentContext(request.TextDocument.Uri, codeDocument);
+        var documentContext = CreateDocumentContext(request.TextDocument.DocumentUri.GetRequiredParsedUri(), codeDocument);
         var requestContext = CreateRazorRequestContext(documentContext);
 
         // Act
@@ -170,7 +171,7 @@ public Task<TResponse> SendRequestAsync<TParams, TResponse>(string method, TPara
             {
                 TextDocument = new TextDocumentIdentifier()
                 {
-                    Uri = csharpDocumentUri
+                    DocumentUri = new(csharpDocumentUri)
                 },
                 Position = highlightParams.ProjectedPosition,
             };
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentPresentation/TextDocumentTextPresentationEndpointTests.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentPresentation/TextDocumentTextPresentationEndpointTests.cs
index 3abfb79d221..9c1ad983a4c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentPresentation/TextDocumentTextPresentationEndpointTests.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentPresentation/TextDocumentTextPresentationEndpointTests.cs
@@ -3,14 +3,12 @@
 
 using System;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
 using Microsoft.AspNetCore.Razor.Test.Common;
 using Microsoft.AspNetCore.Razor.Test.Common.LanguageServer;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Razor.Protocol.DocumentPresentation;
-using Microsoft.CodeAnalysis.Text;
 using Moq;
 using Xunit;
 using Xunit.Abstractions;
@@ -35,7 +33,7 @@ public async Task Handle_Html_MakesRequest()
 
         var parameters = new TextPresentationParams()
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Range = codeDocument.Source.Text.GetRange(code.Span),
             Text = "Hi there"
         };
@@ -65,7 +63,7 @@ public async Task Handle_CSharp_DoesNotMakeRequest()
 
         var parameters = new TextPresentationParams()
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Range = codeDocument.Source.Text.GetRange(code.Span),
             Text = "Hi there"
         };
@@ -95,7 +93,7 @@ public async Task Handle_DocumentNotFound_ReturnsNull()
 
         var parameters = new TextPresentationParams()
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Range = codeDocument.Source.Text.GetRange(code.Span),
             Text = "Hi there"
         };
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentPresentation/TextDocumentUriPresentationEndpointTests.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentPresentation/TextDocumentUriPresentationEndpointTests.cs
index 3cef316e044..380dbc7297b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentPresentation/TextDocumentUriPresentationEndpointTests.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentPresentation/TextDocumentUriPresentationEndpointTests.cs
@@ -62,7 +62,7 @@ await projectManager.UpdateAsync(updater =>
 
         var parameters = new UriPresentationParams()
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Range = LspFactory.CreateSingleLineRange(line: 0, character: 1, length: 1),
             Uris = [droppedUri]
         };
@@ -122,7 +122,7 @@ await projectManager.UpdateAsync(updater =>
 
         var parameters = new UriPresentationParams()
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Range = LspFactory.CreateSingleLineRange(line: 0, character: 1, length: 1),
             Uris =
             [
@@ -193,7 +193,7 @@ await projectManager.UpdateAsync(updater =>
 
         var parameters = new UriPresentationParams()
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Range = LspFactory.CreateSingleLineRange(line: 0, character: 1, length: 1),
             Uris = [droppedUri]
         };
@@ -229,7 +229,7 @@ public async Task Handle_NoTypeNameIdentifier_ReturnsNull()
 
         var parameters = new UriPresentationParams()
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Range = LspFactory.CreateSingleLineRange(line: 0, character: 1, length: 1),
             Uris = [droppedUri]
         };
@@ -258,7 +258,7 @@ public async Task Handle_MultipleUris_ReturnsNull()
 
         var parameters = new UriPresentationParams()
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Range = LspFactory.CreateSingleLineRange(line: 0, character: 1, length: 1),
             Uris =
             [
@@ -293,7 +293,7 @@ public async Task Handle_NotComponent_ReturnsNull()
 
         var parameters = new UriPresentationParams()
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Range = LspFactory.CreateSingleLineRange(line: 0, character: 1, length: 1),
             Uris = [droppedUri]
         };
@@ -348,7 +348,7 @@ await projectManager.UpdateAsync(updater =>
 
         var parameters = new UriPresentationParams()
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Range = LspFactory.CreateSingleLineRange(line: 0, character: 1, length: 1),
             Uris = [droppedUri1, droppedUri2]
         };
@@ -382,7 +382,7 @@ public async Task Handle_CSharp_ReturnsNull()
 
         var parameters = new UriPresentationParams()
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Range = LspFactory.CreateSingleLineRange(line: 0, character: 1, length: 1)
         };
 
@@ -410,7 +410,7 @@ public async Task Handle_DocumentNotFound_ReturnsNull()
 
         var parameters = new UriPresentationParams()
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Range = LspFactory.CreateSingleLineRange(line: 0, character: 1, length: 1)
         };
 
@@ -438,7 +438,7 @@ public async Task Handle_NoUris_ReturnsNull()
 
         var parameters = new UriPresentationParams()
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Range = LspFactory.CreateSingleLineRange(line: 0, character: 1, length: 1)
         };
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentSymbols/DocumentSymbolEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentSymbols/DocumentSymbolEndpointTest.cs
index b2da6034dc9..8b59d042dc1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentSymbols/DocumentSymbolEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentSymbols/DocumentSymbolEndpointTest.cs
@@ -110,7 +110,7 @@ private async Task VerifyDocumentSymbolsAsync(string input, bool hierarchical =
         {
             TextDocument = new VSTextDocumentIdentifier
             {
-                Uri = new Uri(razorFilePath),
+                DocumentUri = new(new Uri(razorFilePath)),
                 ProjectContext = new VSProjectContext()
                 {
                     Label = "test",
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentSynchronization/DocumentDidChangeEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentSynchronization/DocumentDidChangeEndpointTest.cs
index c8d269b23e0..4d1083d2ecf 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentSynchronization/DocumentDidChangeEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentSynchronization/DocumentDidChangeEndpointTest.cs
@@ -116,7 +116,7 @@ public async Task Handle_DidChangeTextDocument_UpdatesDocument()
             ContentChanges = [change],
             TextDocument = new VersionedTextDocumentIdentifier()
             {
-                Uri = documentPath,
+                DocumentUri = new(documentPath),
                 Version = 1337,
             }
         };
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentSynchronization/DocumentDidCloseEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentSynchronization/DocumentDidCloseEndpointTest.cs
index bbefb1341ad..712f4d3b2c1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentSynchronization/DocumentDidCloseEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentSynchronization/DocumentDidCloseEndpointTest.cs
@@ -31,7 +31,7 @@ public async Task Handle_DidCloseTextDocument_ClosesDocument()
         {
             TextDocument = new TextDocumentIdentifier()
             {
-                Uri = new Uri(documentPath)
+                DocumentUri = new(new Uri(documentPath))
             }
         };
         var requestContext = CreateRazorRequestContext(documentContext: null);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentSynchronization/DocumentDidOpenEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentSynchronization/DocumentDidOpenEndpointTest.cs
index cb9ac01e218..6955ed9e172 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentSynchronization/DocumentDidOpenEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DocumentSynchronization/DocumentDidOpenEndpointTest.cs
@@ -37,7 +37,7 @@ public async Task Handle_DidOpenTextDocument_AddsDocument()
             TextDocument = new TextDocumentItem()
             {
                 Text = "hello",
-                Uri = new Uri(documentPath),
+                DocumentUri = new(new Uri(documentPath)),
                 Version = 1337,
             }
         };
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/FindReferences/FindAllReferencesEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/FindReferences/FindAllReferencesEndpointTest.cs
index f8cfee117ee..3508d7f2dcf 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/FindReferences/FindAllReferencesEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/FindReferences/FindAllReferencesEndpointTest.cs
@@ -9,6 +9,7 @@
 using Microsoft.AspNetCore.Razor.Test.Common;
 using Microsoft.AspNetCore.Razor.Test.Common.ProjectSystem;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Testing;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Text.Adornments;
@@ -72,7 +73,7 @@ await projectManager.UpdateAsync(updater =>
             },
             TextDocument = new TextDocumentIdentifier
             {
-                Uri = new Uri(razorFilePath)
+                DocumentUri = new(new Uri(razorFilePath))
             },
             Position = sourceText.GetPosition(cursorPosition)
         };
@@ -90,7 +91,7 @@ await projectManager.UpdateAsync(updater =>
         var i = 0;
         foreach (var referenceItem in result.OrderBy(l => l.Location.AssumeNotNull().Range.Start.Line))
         {
-            Assert.Equal(new Uri(razorFilePath), referenceItem.Location.AssumeNotNull().Uri);
+            Assert.Equal(new Uri(razorFilePath), referenceItem.Location.AssumeNotNull().DocumentUri.GetRequiredParsedUri());
 
             var expectedRange = codeDocument.Source.Text.GetRange(expectedSpans[i]);
             Assert.Equal(expectedRange, referenceItem.Location.Range);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Folding/FoldingEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Folding/FoldingEndpointTest.cs
index b4fcfa8b307..51d64630076 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Folding/FoldingEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Folding/FoldingEndpointTest.cs
@@ -212,7 +212,7 @@ private async Task VerifyRazorFoldsAsync(string input, string? filePath = null)
         {
             TextDocument = new VSTextDocumentIdentifier
             {
-                Uri = new Uri(filePath),
+                DocumentUri = new(new Uri(filePath)),
                 ProjectContext = new VSProjectContext()
                 {
                     Label = "test",
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/DocumentOnTypeFormattingEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/DocumentOnTypeFormattingEndpointTest.cs
index 6719d148762..bc6a37eb72c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/DocumentOnTypeFormattingEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/DocumentOnTypeFormattingEndpointTest.cs
@@ -8,7 +8,6 @@
 using Microsoft.AspNetCore.Razor.Test.Common;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Text;
-using Moq;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -27,7 +26,7 @@ public async Task Handle_OnTypeFormatting_FormattingDisabled_ReturnsNull()
         var htmlFormatter = new TestHtmlFormatter();
         var endpoint = new DocumentOnTypeFormattingEndpoint(
             formattingService, htmlFormatter, optionsMonitor, LoggerFactory);
-        var @params = new DocumentOnTypeFormattingParams { TextDocument = new TextDocumentIdentifier { Uri = uri, } };
+        var @params = new DocumentOnTypeFormattingParams { TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri), } };
         var requestContext = CreateRazorRequestContext(documentContext: null);
 
         // Act
@@ -57,7 +56,7 @@ public async Task Handle_OnTypeFormatting_DocumentNotFound_ReturnsNull()
             formattingService, htmlFormatter, optionsMonitor, LoggerFactory);
         var @params = new DocumentOnTypeFormattingParams()
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri, },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri), },
             Character = ".",
             Position = LspFactory.CreatePosition(2, 11),
             Options = new FormattingOptions { InsertSpaces = true, TabSize = 4 }
@@ -91,7 +90,7 @@ public async Task Handle_OnTypeFormatting_RemapFailed_ReturnsNull()
             formattingService, htmlFormatter, optionsMonitor, LoggerFactory);
         var @params = new DocumentOnTypeFormattingParams()
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri, },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri), },
             Character = ".",
             Position = LspFactory.CreatePosition(2, 11),
             Options = new FormattingOptions { InsertSpaces = true, TabSize = 4 },
@@ -125,7 +124,7 @@ public async Task Handle_OnTypeFormatting_HtmlLanguageKind_ReturnsNull()
             formattingService, htmlFormatter, optionsMonitor, LoggerFactory);
         var @params = new DocumentOnTypeFormattingParams()
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri, },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri), },
             Character = "}",
             Position = LspFactory.CreatePosition(2, 11),
             Options = new FormattingOptions { InsertSpaces = true, TabSize = 4 },
@@ -159,7 +158,7 @@ public async Task Handle_OnTypeFormatting_RazorLanguageKind_ReturnsNull()
             formattingService, htmlFormatter, optionsMonitor, LoggerFactory);
         var @params = new DocumentOnTypeFormattingParams()
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri, },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri), },
             Character = "}",
             Position = LspFactory.CreatePosition(2, 11),
             Options = new FormattingOptions { InsertSpaces = true, TabSize = 4 }
@@ -193,7 +192,7 @@ public async Task Handle_OnTypeFormatting_UnexpectedTriggerCharacter_ReturnsNull
             formattingService, htmlFormatter, optionsMonitor, LoggerFactory);
         var @params = new DocumentOnTypeFormattingParams()
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri, },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri), },
             Character = ".",
             Position = LspFactory.CreatePosition(2, 11),
             Options = new FormattingOptions { InsertSpaces = true, TabSize = 4 }
@@ -230,7 +229,7 @@ public async Task Handle_OnTypeFormatting_ExpectedTriggerCharacter_ReturnsNotNul
             formattingService, htmlFormatter, optionsMonitor, LoggerFactory);
         var @params = new DocumentOnTypeFormattingParams()
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri, },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri), },
             Character = ";",
             Position = sourceText.GetPosition(content.Position),
             Options = new FormattingOptions { InsertSpaces = true, TabSize = 4 }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/DocumentRangeFormattingEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/DocumentRangeFormattingEndpointTest.cs
index 1f0cba0db9f..5f7441d294c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/DocumentRangeFormattingEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/DocumentRangeFormattingEndpointTest.cs
@@ -27,7 +27,7 @@ public async Task Handle_FormattingEnabled_InvokesFormattingService()
             formattingService, htmlFormatter, optionsMonitor);
         var @params = new DocumentRangeFormattingParams()
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri, },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri), },
             Options = new FormattingOptions(),
             Range = LspFactory.DefaultRange
         };
@@ -52,7 +52,7 @@ public async Task Handle_DocumentNotFound_ReturnsNull()
         var uri = new Uri("file://path/test.razor");
         var @params = new DocumentRangeFormattingParams()
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri, }
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri), }
         };
         var requestContext = CreateRazorRequestContext(documentContext: null);
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingLanguageServerClient.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingLanguageServerClient.cs
index a68701fac56..8e5f66cb488 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingLanguageServerClient.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingLanguageServerClient.cs
@@ -33,9 +33,9 @@ public void AddCodeDocument(RazorCodeDocument codeDocument)
 
     private async Task<RazorDocumentFormattingResponse> FormatAsync(DocumentOnTypeFormattingParams @params)
     {
-        var generatedHtml = GetGeneratedHtml(@params.TextDocument.Uri);
+        var generatedHtml = GetGeneratedHtml(@params.TextDocument.DocumentUri.GetRequiredParsedUri());
 
-        var edits = await _htmlFormattingService.GetOnTypeFormattingEditsAsync(_loggerFactory, @params.TextDocument.Uri, generatedHtml, @params.Position, @params.Options.InsertSpaces, @params.Options.TabSize);
+        var edits = await _htmlFormattingService.GetOnTypeFormattingEditsAsync(_loggerFactory, @params.TextDocument.DocumentUri.GetRequiredParsedUri(), generatedHtml, @params.Position, @params.Options.InsertSpaces, @params.Options.TabSize);
 
         return new()
         {
@@ -45,9 +45,9 @@ private async Task<RazorDocumentFormattingResponse> FormatAsync(DocumentOnTypeFo
 
     private async Task<RazorDocumentFormattingResponse> FormatAsync(DocumentFormattingParams @params)
     {
-        var generatedHtml = GetGeneratedHtml(@params.TextDocument.Uri);
+        var generatedHtml = GetGeneratedHtml(@params.TextDocument.DocumentUri.GetRequiredParsedUri());
 
-        var edits = await _htmlFormattingService.GetDocumentFormattingEditsAsync(_loggerFactory, @params.TextDocument.Uri, generatedHtml, @params.Options.InsertSpaces, @params.Options.TabSize);
+        var edits = await _htmlFormattingService.GetDocumentFormattingEditsAsync(_loggerFactory, @params.TextDocument.DocumentUri.GetRequiredParsedUri(), generatedHtml, @params.Options.InsertSpaces, @params.Options.TabSize);
 
         return new()
         {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Hover/HoverEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Hover/HoverEndpointTest.cs
index 6c63dbe66bc..312c173f8ce 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Hover/HoverEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Hover/HoverEndpointTest.cs
@@ -60,7 +60,7 @@ public async Task Handle_Hover_SingleServer_CallsDelegatedLanguageServer()
 
         var request = new TextDocumentPositionParams
         {
-            TextDocument = new() { Uri = new Uri("C:/text.razor") },
+            TextDocument = new() { DocumentUri = new(new Uri("C:/text.razor")) },
             Position = position,
         };
 
@@ -217,7 +217,7 @@ public async Task Handle_Hover_SingleServer_AddTagHelper()
         var razorFileUri = new Uri(razorFilePath);
         var request = new TextDocumentPositionParams
         {
-            TextDocument = new() { Uri = razorFileUri, },
+            TextDocument = new() { DocumentUri = new(razorFileUri), },
             Position = codeDocument.Source.Text.GetPosition(code.Position)
         };
 
@@ -325,7 +325,7 @@ public Task<TResponse> SendRequestAsync<TParams, TResponse>(string method, TPara
 
             var hoverRequest = new TextDocumentPositionParams()
             {
-                TextDocument = new() { Uri = csharpDocumentUri, },
+                TextDocument = new() { DocumentUri = new(csharpDocumentUri), },
                 Position = hoverParams.ProjectedPosition
             };
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Implementation/ImplementationEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Implementation/ImplementationEndpointTest.cs
index 7773e57c303..79b5b50617e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Implementation/ImplementationEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Implementation/ImplementationEndpointTest.cs
@@ -8,6 +8,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Testing;
 using Microsoft.CodeAnalysis.Text;
 using Xunit;
@@ -100,7 +101,7 @@ private async Task VerifyCSharpGoToImplementationAsync(string input)
         {
             TextDocument = new TextDocumentIdentifier
             {
-                Uri = new Uri(razorFilePath)
+                DocumentUri = new(new Uri(razorFilePath))
             },
             Position = codeDocument.Source.Text.GetPosition(cursorPosition)
         };
@@ -119,7 +120,7 @@ private async Task VerifyCSharpGoToImplementationAsync(string input)
         var i = 0;
         foreach (var location in locations.OrderBy(l => l.Range.Start.Line))
         {
-            Assert.Equal(new Uri(razorFilePath), location.Uri);
+            Assert.Equal(new Uri(razorFilePath), location.DocumentUri.GetRequiredParsedUri());
 
             var expectedRange = codeDocument.Source.Text.GetRange(expectedSpans[i]);
             Assert.Equal(expectedRange, location.Range);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/InlayHints/InlayHintEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/InlayHints/InlayHintEndpointTest.cs
index 68be931eb68..d27a818e9d0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/InlayHints/InlayHintEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/InlayHints/InlayHintEndpointTest.cs
@@ -106,7 +106,7 @@ public async Task InlayHints_InvalidRange(int startLine, int starChar, int endLi
         {
             TextDocument = new VSTextDocumentIdentifier
             {
-                Uri = new Uri(razorFilePath)
+                DocumentUri = new(new Uri(razorFilePath))
             },
             Range = LspFactory.CreateRange(startLine, starChar, endLine, endChar)
         };
@@ -137,7 +137,7 @@ private async Task VerifyInlayHintsAsync(string input, Dictionary<string, string
         {
             TextDocument = new VSTextDocumentIdentifier
             {
-                Uri = new Uri(razorFilePath)
+                DocumentUri = new(new Uri(razorFilePath))
             },
             Range = LspFactory.CreateRange(0, 0, codeDocument.Source.Text.Lines.Count, 0)
         };
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/LinkedEditingRange/LinkedEditingRangeEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/LinkedEditingRange/LinkedEditingRangeEndpointTest.cs
index d7b5d2c4848..809cc4fe7ba 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/LinkedEditingRange/LinkedEditingRangeEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/LinkedEditingRange/LinkedEditingRangeEndpointTest.cs
@@ -23,7 +23,7 @@ public async Task Handle_DocumentNotFound_ReturnsNull()
         var endpoint = new LinkedEditingRangeEndpoint(LoggerFactory);
         var request = new LinkedEditingRangeParams
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri) },
             Position = LspFactory.CreatePosition(1, 3) // <te[||]st1></test1>
         };
         var requestContext = CreateRazorRequestContext(documentContext: null);
@@ -49,7 +49,7 @@ public async Task Handle_TagHelperStartTag_ReturnsCorrectRange()
         var endpoint = new LinkedEditingRangeEndpoint(LoggerFactory);
         var request = new LinkedEditingRangeParams
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri) },
             Position = LspFactory.CreatePosition(1, 3) // <te[||]st1></test1>
         };
 
@@ -82,7 +82,7 @@ public async Task Handle_TagHelperStartTag_ReturnsCorrectRange_EndSpan()
         var endpoint = new LinkedEditingRangeEndpoint(LoggerFactory);
         var request = new LinkedEditingRangeParams
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri) },
             Position = LspFactory.CreatePosition(1, 6) // <test1[||]></test1>
         };
 
@@ -115,7 +115,7 @@ public async Task Handle_TagHelperEndTag_ReturnsCorrectRange()
         var endpoint = new LinkedEditingRangeEndpoint(LoggerFactory);
         var request = new LinkedEditingRangeParams
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri) },
             Position = LspFactory.CreatePosition(1, 9) // <test1></[||]test1>
         };
 
@@ -148,7 +148,7 @@ public async Task Handle_NoTag_ReturnsNull()
         var endpoint = new LinkedEditingRangeEndpoint(LoggerFactory);
         var request = new LinkedEditingRangeParams
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri) },
             Position = LspFactory.CreatePosition(0, 1) // @[||]addTagHelper *
         };
         var requestContext = CreateRazorRequestContext(documentContext);
@@ -174,7 +174,7 @@ public async Task Handle_SelfClosingTagHelper_ReturnsNull()
         var endpoint = new LinkedEditingRangeEndpoint(LoggerFactory);
         var request = new LinkedEditingRangeParams
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri) },
             Position = LspFactory.CreatePosition(1, 3) // <te[||]st1 />
         };
         var requestContext = CreateRazorRequestContext(documentContext);
@@ -200,7 +200,7 @@ public async Task Handle_NestedTagHelperStartTags_ReturnsCorrectRange()
         var endpoint = new LinkedEditingRangeEndpoint(LoggerFactory);
         var request = new LinkedEditingRangeParams
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri) },
             Position = LspFactory.CreatePosition(1, 1) // <[||]test1><test1></test1></test1>
         };
 
@@ -233,7 +233,7 @@ public async Task Handle_HTMLStartTag_ReturnsCorrectRange()
         var endpoint = new LinkedEditingRangeEndpoint(LoggerFactory);
         var request = new LinkedEditingRangeParams
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri) },
             Position = LspFactory.CreatePosition(1, 3) // <bo[||]dy></body>
         };
 
@@ -266,7 +266,7 @@ public async Task Handle_HTMLEndTag_ReturnsCorrectRange()
         var endpoint = new LinkedEditingRangeEndpoint(LoggerFactory);
         var request = new LinkedEditingRangeParams
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri) },
             Position = LspFactory.CreatePosition(1, 8) // <body></[||]body>
         };
 
@@ -299,7 +299,7 @@ public async Task Handle_SelfClosingHTMLTag_ReturnsNull()
         var endpoint = new LinkedEditingRangeEndpoint(LoggerFactory);
         var request = new LinkedEditingRangeParams
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri) },
             Position = LspFactory.CreatePosition(1, 3) // <bo[||]dy />
         };
         var requestContext = CreateRazorRequestContext(documentContext);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/MapCode/MapCodeTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/MapCode/MapCodeTest.cs
index 1d0c563d6a9..784b7a46ebd 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/MapCode/MapCodeTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/MapCode/MapCodeTest.cs
@@ -10,6 +10,7 @@
 using Microsoft.AspNetCore.Razor.LanguageServer.MapCode;
 using Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
 using Microsoft.AspNetCore.Razor.Test.Common.LanguageServer;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Razor.Telemetry;
 using Microsoft.CodeAnalysis.Testing;
@@ -305,7 +306,7 @@ private async Task VerifyCodeMappingAsync(
             new() {
                 TextDocument = new TextDocumentIdentifier
                 {
-                    Uri = new Uri(razorFilePath)
+                    DocumentUri = new(new Uri(razorFilePath))
                 },
                 FocusLocations = locations ??
                 [
@@ -313,7 +314,7 @@ private async Task VerifyCodeMappingAsync(
                         new LspLocation
                         {
                             Range = sourceText.GetZeroWidthRange(cursorPosition),
-                            Uri = new Uri(razorFilePath)
+                            DocumentUri = new(new Uri(razorFilePath))
                         }
                     ]
                 ],
@@ -356,7 +357,7 @@ public Task<TResponse> SendRequestAsync<TParams, TResponse>(string method, TPara
                 new() {
                     TextDocument = new TextDocumentIdentifier()
                     {
-                        Uri = csharpDocumentUri
+                        DocumentUri = new(csharpDocumentUri)
                     },
                     Contents = delegatedMapCodeParams.Contents,
                     FocusLocations = delegatedMapCodeParams.FocusLocations
@@ -379,7 +380,7 @@ private static SourceText ApplyWorkspaceEdit(WorkspaceEdit workspaceEdit, Uri do
 
         foreach (var edit in edits)
         {
-            Assert.Equal(documentUri, edit.TextDocument.Uri);
+            Assert.Equal(documentUri, edit.TextDocument.DocumentUri.GetRequiredParsedUri());
 
             foreach (var currentEdit in edit.Edits)
             {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/ProjectContexts/ProjectContextsEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/ProjectContexts/ProjectContextsEndpointTest.cs
index a4faff053da..9c1d0e7a859 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/ProjectContexts/ProjectContextsEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/ProjectContexts/ProjectContextsEndpointTest.cs
@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.LanguageServer.ProjectContexts;
 using Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
+using Microsoft.CodeAnalysis.Razor;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -31,14 +32,14 @@ public async Task GetProjectContexts_ReturnsExpected()
         {
             TextDocument = new TextDocumentItem()
             {
-                Uri = new Uri(razorFilePath),
+                DocumentUri = new(new Uri(razorFilePath)),
                 LanguageId = "razor",
                 Text = input,
                 Version = 1337
             }
         };
 
-        Assert.True(DocumentContextFactory.TryCreate(request.TextDocument.Uri, out var documentContext));
+        Assert.True(DocumentContextFactory.TryCreate(request.TextDocument.DocumentUri.GetRequiredParsedUri(), out var documentContext));
         var requestContext = CreateRazorRequestContext(documentContext);
 
         var results = await endpoint.HandleRequestAsync(request, requestContext, DisposalToken);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Refactoring/RenameEndpointDelegationTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Refactoring/RenameEndpointDelegationTest.cs
index 98e2389198a..3ae885c4b3c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Refactoring/RenameEndpointDelegationTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Refactoring/RenameEndpointDelegationTest.cs
@@ -79,7 +79,7 @@ await projectManager.UpdateAsync(updater =>
         {
             TextDocument = new TextDocumentIdentifier
             {
-                Uri = new Uri(razorFilePath)
+                DocumentUri = new(new Uri(razorFilePath))
             },
             Position = codeDocument.Source.Text.GetPosition(cursorPosition),
             NewName = newName
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Refactoring/RenameEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Refactoring/RenameEndpointTest.cs
index fa6a0e214ca..62453006b61 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Refactoring/RenameEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Refactoring/RenameEndpointTest.cs
@@ -17,6 +17,7 @@
 using Microsoft.AspNetCore.Razor.Test.Common;
 using Microsoft.AspNetCore.Razor.Test.Common.LanguageServer;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.Protocol;
@@ -113,7 +114,7 @@ public async Task Handle_Rename_FileManipulationNotSupported_ReturnsNull()
         var uri = TestPathUtilities.GetUri(s_componentFilePath1);
         var request = new RenameParams
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Position = LspFactory.CreatePosition(2, 1),
             NewName = "Component5"
         };
@@ -136,7 +137,7 @@ public async Task Handle_Rename_WithNamespaceDirective()
         var uri = TestPathUtilities.GetUri(s_componentFilePath1);
         var request = new RenameParams
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Position = LspFactory.CreatePosition(2, 1),
             NewName = "Component5"
         };
@@ -155,14 +156,14 @@ public async Task Handle_Rename_WithNamespaceDirective()
         // We renamed Component2 to Component5, so ensure we received a file rename.
         var renameChange = documentChanges.ElementAt(0);
         Assert.True(renameChange.TryGetThird(out var renameFile));
-        Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath2), renameFile.OldUri);
-        Assert.Equal(TestPathUtilities.GetUri(s_project1BasePath, "Component5.razor"), renameFile.NewUri);
+        Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath2), renameFile.OldDocumentUri.GetRequiredParsedUri());
+        Assert.Equal(TestPathUtilities.GetUri(s_project1BasePath, "Component5.razor"), renameFile.NewDocumentUri.GetRequiredParsedUri());
 
         // Next, we should get a series of text edits to Component1 that rename
         // "Component2" to "Component5".
         var editChange = documentChanges.ElementAt(1);
         Assert.True(editChange.TryGetFirst(out var textDocumentEdit));
-        Assert.Equal(uri, textDocumentEdit.TextDocument.Uri);
+        Assert.Equal(uri, textDocumentEdit.TextDocument.DocumentUri.GetRequiredParsedUri());
         Assert.Collection(
             textDocumentEdit.Edits,
             AssertTextEdit("Component5", startLine: 2, startCharacter: 1, endLine: 2, endCharacter: 11),
@@ -177,7 +178,7 @@ public async Task Handle_Rename_OnComponentParameter_ReturnsNull()
         var uri = TestPathUtilities.GetUri(s_componentWithParamFilePath);
         var request = new RenameParams
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Position = LspFactory.CreatePosition(1, 14),
             NewName = "Test2"
         };
@@ -200,7 +201,7 @@ public async Task Handle_Rename_OnOpeningBrace_ReturnsNull()
         var uri = TestPathUtilities.GetUri(s_componentWithParamFilePath);
         var request = new RenameParams
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Position = LspFactory.CreatePosition(1, 0),
             NewName = "Test2"
         };
@@ -223,7 +224,7 @@ public async Task Handle_Rename_OnComponentNameLeadingEdge_ReturnsResult()
         var uri = TestPathUtilities.GetUri(s_componentWithParamFilePath);
         var request = new RenameParams
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Position = LspFactory.CreatePosition(1, 1),
             NewName = "Test2"
         };
@@ -246,7 +247,7 @@ public async Task Handle_Rename_OnComponentName_ReturnsResult()
         var uri = TestPathUtilities.GetUri(s_componentWithParamFilePath);
         var request = new RenameParams
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Position = LspFactory.CreatePosition(1, 3),
             NewName = "Test2"
         };
@@ -269,7 +270,7 @@ public async Task Handle_Rename_OnComponentEndTag_ReturnsResult()
         var uri = TestPathUtilities.GetUri(s_componentWithParamFilePath);
         var request = new RenameParams
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Position = LspFactory.CreatePosition(1, 36),
             NewName = "Test2"
         };
@@ -292,7 +293,7 @@ public async Task Handle_Rename_OnComponentNameTrailingEdge_ReturnsResult()
         var uri = TestPathUtilities.GetUri(s_componentWithParamFilePath);
         var request = new RenameParams
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Position = LspFactory.CreatePosition(1, 10),
             NewName = "Test2"
         };
@@ -315,7 +316,7 @@ public async Task Handle_Rename_ComponentInSameFile()
         var uri = TestPathUtilities.GetUri(s_componentFilePath4);
         var request = new RenameParams
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Position = LspFactory.CreatePosition(1, 1),
             NewName = "Component5"
         };
@@ -334,13 +335,13 @@ public async Task Handle_Rename_ComponentInSameFile()
         // We renamed Component3 to Component5, so we should expect file rename.
         var renameChange = documentChanges.ElementAt(0);
         Assert.True(renameChange.TryGetThird(out var renameFile));
-        Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath3), renameFile.OldUri);
-        Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath5), renameFile.NewUri);
+        Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath3), renameFile.OldDocumentUri.GetRequiredParsedUri());
+        Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath5), renameFile.NewDocumentUri.GetRequiredParsedUri());
 
         Assert.Collection(GetTextDocumentEdits(result, startIndex: 1, endIndex: 4),
             textDocumentEdit =>
             {
-                Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath4), textDocumentEdit.TextDocument.Uri);
+                Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath4), textDocumentEdit.TextDocument.DocumentUri.GetRequiredParsedUri());
                 Assert.Collection(
                     textDocumentEdit.Edits,
                     AssertTextEdit("Component5", startLine: 1, startCharacter: 1, endLine: 1, endCharacter: 11),
@@ -348,7 +349,7 @@ public async Task Handle_Rename_ComponentInSameFile()
             },
             textDocumentEdit =>
             {
-                Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath4), textDocumentEdit.TextDocument.Uri);
+                Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath4), textDocumentEdit.TextDocument.DocumentUri.GetRequiredParsedUri());
                 Assert.Collection(
                     textDocumentEdit.Edits,
                     AssertTextEdit("Component5", startLine: 2, startCharacter: 1, endLine: 2, endCharacter: 11),
@@ -356,7 +357,7 @@ public async Task Handle_Rename_ComponentInSameFile()
             },
             textDocumentEdit =>
             {
-                Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath5), textDocumentEdit.TextDocument.Uri);
+                Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath5), textDocumentEdit.TextDocument.DocumentUri.GetRequiredParsedUri());
                 Assert.Collection(
                     textDocumentEdit.Edits,
                     AssertTextEdit("Component5", startLine: 1, startCharacter: 1, endLine: 1, endCharacter: 11),
@@ -364,7 +365,7 @@ public async Task Handle_Rename_ComponentInSameFile()
             },
             textDocumentEdit =>
             {
-                Assert.Equal(TestPathUtilities.GetUri(s_componentWithParamFilePath), textDocumentEdit.TextDocument.Uri);
+                Assert.Equal(TestPathUtilities.GetUri(s_componentWithParamFilePath), textDocumentEdit.TextDocument.DocumentUri.GetRequiredParsedUri());
                 Assert.Collection(
                     textDocumentEdit.Edits,
                     AssertTextEdit("Component5", startLine: 1, startCharacter: 1, endLine: 1, endCharacter: 11),
@@ -387,7 +388,7 @@ static IEnumerable<TextDocumentEdit> GetTextDocumentEdits(WorkspaceEdit workspac
 
             return builder
                 .ToArray()
-                .OrderBy(x => x.TextDocument.Uri.ToString())
+                .OrderBy(x => x.TextDocument.DocumentUri.GetRequiredParsedUri().ToString())
                 .ThenBy(x => ((TextEdit)x.Edits.First()).Range.Start.Line)
                 .ThenBy(x => ((TextEdit)x.Edits.First()).Range.Start.Character);
         }
@@ -401,7 +402,7 @@ public async Task Handle_Rename_FullyQualifiedAndNot()
         var uri = TestPathUtilities.GetUri(s_indexFilePath1);
         var request = new RenameParams
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Position = LspFactory.CreatePosition(2, 1),
             NewName = "Component5"
         };
@@ -419,12 +420,12 @@ public async Task Handle_Rename_FullyQualifiedAndNot()
 
         var renameChange = documentChanges.ElementAt(0);
         Assert.True(renameChange.TryGetThird(out var renameFile));
-        Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath1337), renameFile.OldUri);
-        Assert.Equal(TestPathUtilities.GetUri(s_project1BasePath, "Component5.razor"), renameFile.NewUri);
+        Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath1337), renameFile.OldDocumentUri.GetRequiredParsedUri());
+        Assert.Equal(TestPathUtilities.GetUri(s_project1BasePath, "Component5.razor"), renameFile.NewDocumentUri.GetRequiredParsedUri());
 
         var editChange1 = documentChanges.ElementAt(1);
         Assert.True(editChange1.TryGetFirst(out var textDocumentEdit));
-        Assert.Equal(TestPathUtilities.GetUri(s_indexFilePath1), textDocumentEdit.TextDocument.Uri);
+        Assert.Equal(TestPathUtilities.GetUri(s_indexFilePath1), textDocumentEdit.TextDocument.DocumentUri.GetRequiredParsedUri());
         Assert.Collection(
             textDocumentEdit.Edits,
             AssertTextEdit("Component5", startLine: 2, startCharacter: 1, endLine: 2, endCharacter: 14),
@@ -432,7 +433,7 @@ public async Task Handle_Rename_FullyQualifiedAndNot()
 
         var editChange2 = result.DocumentChanges.Value.ElementAt(2);
         Assert.True(editChange2.TryGetFirst(out var textDocumentEdit2));
-        Assert.Equal(TestPathUtilities.GetUri(s_indexFilePath1), textDocumentEdit2.TextDocument.Uri);
+        Assert.Equal(TestPathUtilities.GetUri(s_indexFilePath1), textDocumentEdit2.TextDocument.DocumentUri.GetRequiredParsedUri());
         Assert.Collection(
             textDocumentEdit2.Edits,
             AssertTextEdit("Test.Component5", startLine: 3, startCharacter: 1, endLine: 3, endCharacter: 19),
@@ -447,7 +448,7 @@ public async Task Handle_Rename_MultipleFileUsages()
         var uri = TestPathUtilities.GetUri(s_componentFilePath3);
         var request = new RenameParams
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Position = LspFactory.CreatePosition(1, 1),
             NewName = "Component5"
         };
@@ -465,12 +466,12 @@ public async Task Handle_Rename_MultipleFileUsages()
 
         var renameChange = documentChanges.ElementAt(0);
         Assert.True(renameChange.TryGetThird(out var renameFile));
-        Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath3), renameFile.OldUri);
-        Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath5), renameFile.NewUri);
+        Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath3), renameFile.OldDocumentUri.GetRequiredParsedUri());
+        Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath5), renameFile.NewDocumentUri.GetRequiredParsedUri());
 
         var editChange1 = documentChanges.ElementAt(1);
         Assert.True(editChange1.TryGetFirst(out var textDocumentEdit));
-        Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath5), textDocumentEdit.TextDocument.Uri);
+        Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath5), textDocumentEdit.TextDocument.DocumentUri.GetRequiredParsedUri());
         Assert.Collection(
             textDocumentEdit.Edits,
             AssertTextEdit("Component5", 1, 1, 1, 11),
@@ -478,17 +479,17 @@ public async Task Handle_Rename_MultipleFileUsages()
 
         var editChange2 = documentChanges.ElementAt(2);
         Assert.True(editChange2.TryGetFirst(out var textDocumentEdit2));
-        Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath4), textDocumentEdit2.TextDocument.Uri);
+        Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath4), textDocumentEdit2.TextDocument.DocumentUri.GetRequiredParsedUri());
         Assert.Equal(2, textDocumentEdit2.Edits.Length);
 
         var editChange3 = documentChanges.ElementAt(3);
         Assert.True(editChange3.TryGetFirst(out var textDocumentEdit3));
-        Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath4), textDocumentEdit3.TextDocument.Uri);
+        Assert.Equal(TestPathUtilities.GetUri(s_componentFilePath4), textDocumentEdit3.TextDocument.DocumentUri.GetRequiredParsedUri());
         Assert.Equal(2, textDocumentEdit3.Edits.Length);
 
         var editChange4 = documentChanges.ElementAt(4);
         Assert.True(editChange4.TryGetFirst(out var textDocumentEdit4));
-        Assert.Equal(TestPathUtilities.GetUri(s_componentWithParamFilePath), textDocumentEdit4.TextDocument.Uri);
+        Assert.Equal(TestPathUtilities.GetUri(s_componentWithParamFilePath), textDocumentEdit4.TextDocument.DocumentUri.GetRequiredParsedUri());
         Assert.Equal(2, textDocumentEdit4.Edits.Length);
     }
 
@@ -500,7 +501,7 @@ public async Task Handle_Rename_DifferentDirectories()
         var uri = TestPathUtilities.GetUri(s_directoryFilePath1);
         var request = new RenameParams
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Position = LspFactory.CreatePosition(1, 1),
             NewName = "TestComponent"
         };
@@ -518,12 +519,12 @@ public async Task Handle_Rename_DifferentDirectories()
 
         var renameChange = documentChanges.ElementAt(0);
         Assert.True(renameChange.TryGetThird(out var renameFile));
-        Assert.Equal(TestPathUtilities.GetUri(s_directoryFilePath2), renameFile.OldUri);
-        Assert.Equal(TestPathUtilities.GetUri(s_project1BasePath, "TestComponent.razor"), renameFile.NewUri);
+        Assert.Equal(TestPathUtilities.GetUri(s_directoryFilePath2), renameFile.OldDocumentUri.GetRequiredParsedUri());
+        Assert.Equal(TestPathUtilities.GetUri(s_project1BasePath, "TestComponent.razor"), renameFile.NewDocumentUri.GetRequiredParsedUri());
 
         var editChange = documentChanges.ElementAt(1);
         Assert.True(editChange.TryGetFirst(out var textDocumentEdit));
-        Assert.Equal(TestPathUtilities.GetUri(s_directoryFilePath1), textDocumentEdit.TextDocument.Uri);
+        Assert.Equal(TestPathUtilities.GetUri(s_directoryFilePath1), textDocumentEdit.TextDocument.DocumentUri.GetRequiredParsedUri());
         Assert.Collection(
             textDocumentEdit.Edits,
             AssertTextEdit("TestComponent", startLine: 1, startCharacter: 1, endLine: 1, endCharacter: 11),
@@ -568,7 +569,7 @@ public async Task Handle_Rename_SingleServer_CallsDelegatedLanguageServer()
         var uri = TestPathUtilities.GetUri(s_componentWithParamFilePath);
         var request = new RenameParams
         {
-            TextDocument = new() { Uri = uri },
+            TextDocument = new() { DocumentUri = new(uri) },
             Position = LspFactory.CreatePosition(1, 0),
             NewName = "Test2"
         };
@@ -598,12 +599,12 @@ public async Task Handle_Rename_SingleServer_DoesNotDelegateForRazor()
 
         var request = new RenameParams
         {
-            TextDocument = new() { Uri = TestPathUtilities.GetUri(s_componentWithParamFilePath) },
+            TextDocument = new() { DocumentUri = new(TestPathUtilities.GetUri(s_componentWithParamFilePath)) },
             Position = LspFactory.CreatePosition(0, 1), // This is right after the '@' in '@namespace'
             NewName = "Test2"
         };
 
-        Assert.True(documentContextFactory.TryCreate(request.TextDocument.Uri, out var documentContext));
+        Assert.True(documentContextFactory.TryCreate(request.TextDocument.DocumentUri.GetRequiredParsedUri(), out var documentContext));
         var requestContext = CreateRazorRequestContext(documentContext);
 
         // Act
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Semantic/SemanticTokensTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Semantic/SemanticTokensTest.cs
index 5f9cda5581c..ef4e2dc18b1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Semantic/SemanticTokensTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Semantic/SemanticTokensTest.cs
@@ -1181,14 +1181,14 @@ private string GetBaselineFileContents(string baselineFileName)
     private static SemanticTokensRangesParams CreateVSSemanticTokensRangesParams(ImmutableArray<LinePositionSpan> ranges, Uri uri)
         => new()
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri) },
             Ranges = ranges.Select(s => s.ToRange()).ToArray()
         };
 
     private static SemanticTokensRangeParams CreateVSSemanticTokensRangeParams(LinePositionSpan range, Uri uri)
         => new()
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri) },
             Range = range.ToRange()
         };
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/SignatureHelp/SignatureHelpEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/SignatureHelp/SignatureHelpEndpointTest.cs
index 6c18d6b770c..69e1a1230c0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/SignatureHelp/SignatureHelpEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/SignatureHelp/SignatureHelpEndpointTest.cs
@@ -106,7 +106,7 @@ private async Task VerifySignatureHelpWithContextAndOptionsAsync(string input, R
         {
             TextDocument = new TextDocumentIdentifier
             {
-                Uri = new Uri(razorFilePath)
+                DocumentUri = new(new Uri(razorFilePath))
             },
             Position = codeDocument.Source.Text.GetPosition(cursorPosition),
             Context = signatureHelpContext
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/SingleServerDelegatingEndpointTestBase.TestLanguageServer.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/SingleServerDelegatingEndpointTestBase.TestLanguageServer.cs
index 4a92774695e..2a45a93ef39 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/SingleServerDelegatingEndpointTestBase.TestLanguageServer.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/SingleServerDelegatingEndpointTestBase.TestLanguageServer.cs
@@ -88,7 +88,7 @@ public async Task<TResponse> SendRequestAsync<TParams, TResponse>(string method,
             Assert.IsType<DelegatedDiagnosticParams>(@params);
             var actualParams = new DocumentDiagnosticParams()
             {
-                TextDocument = new TextDocumentIdentifier { Uri = _csharpDocumentUri }
+                TextDocument = new TextDocumentIdentifier { DocumentUri = new(_csharpDocumentUri) }
             };
 
             return _csharpServer.ExecuteRequestAsync<DocumentDiagnosticParams, SumType<FullDocumentDiagnosticReport, UnchangedDocumentDiagnosticReport>?>(
@@ -111,7 +111,7 @@ private Task<VSProjectContextList> HandleProjectContextsAsync<TParams>(TParams @
             {
                 TextDocument = new TextDocumentItem
                 {
-                    Uri = _csharpDocumentUri,
+                    DocumentUri = new(_csharpDocumentUri),
                 },
             };
 
@@ -129,7 +129,7 @@ private Task<InlayHint[]> HandleInlayHintAsync<TParams>(TParams @params, Cancell
             {
                 TextDocument = new TextDocumentIdentifier
                 {
-                    Uri = _csharpDocumentUri,
+                    DocumentUri = new(_csharpDocumentUri),
                 },
                 Range = delegatedParams.ProjectedRange
             };
@@ -160,7 +160,7 @@ private Task<InlayHint> HandleInlayHintResolveAsync<TParams>(TParams @params, Ca
             {
                 TextDocument = new TextDocumentIdentifier
                 {
-                    Uri = _csharpDocumentUri,
+                    DocumentUri = new(_csharpDocumentUri),
                 },
             };
 
@@ -178,7 +178,7 @@ private Task<VSInternalSpellCheckableRangeReport[]> HandleSpellCheckAsync<TParam
             {
                 TextDocument = new VSTextDocumentIdentifier
                 {
-                    Uri = _csharpDocumentUri,
+                    DocumentUri = new(_csharpDocumentUri),
                     ProjectContext = delegatedParams.Identifier.TextDocumentIdentifier.GetProjectContext(),
                 },
             };
@@ -197,7 +197,7 @@ private async Task<RazorPullDiagnosticResponse> HandlePullDiagnosticsAsync<TPara
             {
                 TextDocument = new VSTextDocumentIdentifier
                 {
-                    Uri = _csharpDocumentUri,
+                    DocumentUri = new(_csharpDocumentUri),
                     ProjectContext = delegatedParams.Identifier.TextDocumentIdentifier.GetProjectContext(),
                 },
             };
@@ -232,7 +232,7 @@ private Task<RazorVSInternalCodeAction[]> HandleProvideCodeActionsAsync<TParams>
             var delegatedParams = Assert.IsType<DelegatedCodeActionParams>(@params);
 
             var delegatedRequest = delegatedParams.CodeActionParams;
-            delegatedRequest.TextDocument.Uri = _csharpDocumentUri;
+            delegatedRequest.TextDocument.DocumentUri = new(_csharpDocumentUri);
 
             return _csharpServer.ExecuteRequestAsync<VSCodeActionParams, RazorVSInternalCodeAction[]>(
                 Methods.TextDocumentCodeActionName,
@@ -247,7 +247,7 @@ private Task<VSInternalReferenceItem[]> HandleReferencesAsync<TParams>(TParams @
             {
                 TextDocument = new VSTextDocumentIdentifier()
                 {
-                    Uri = _csharpDocumentUri,
+                    DocumentUri = new(_csharpDocumentUri),
                     ProjectContext = delegatedParams.Identifier.TextDocumentIdentifier.GetProjectContext(),
                 },
                 Position = delegatedParams.ProjectedPosition,
@@ -267,7 +267,7 @@ private Task<VSInternalReferenceItem[]> HandleReferencesAsync<TParams>(TParams @
             {
                 TextDocument = new VSTextDocumentIdentifier()
                 {
-                    Uri = _csharpDocumentUri,
+                    DocumentUri = new(_csharpDocumentUri),
                     ProjectContext = delegatedParams.Identifier.TextDocumentIdentifier.GetProjectContext(),
                 },
                 Position = delegatedParams.ProjectedPosition
@@ -286,7 +286,7 @@ private Task<ImplementationResult> HandleImplementationAsync<T>(T @params, Cance
             {
                 TextDocument = new VSTextDocumentIdentifier()
                 {
-                    Uri = _csharpDocumentUri,
+                    DocumentUri = new(_csharpDocumentUri),
                     ProjectContext = delegatedParams.Identifier.TextDocumentIdentifier.GetProjectContext(),
                 },
                 Position = delegatedParams.ProjectedPosition
@@ -305,7 +305,7 @@ private Task<LspSignatureHelp> HandleSignatureHelpAsync<T>(T @params, Cancellati
             {
                 TextDocument = new VSTextDocumentIdentifier()
                 {
-                    Uri = _csharpDocumentUri,
+                    DocumentUri = new(_csharpDocumentUri),
                     ProjectContext = delegatedParams.Identifier.TextDocumentIdentifier.GetProjectContext(),
                 },
                 Position = delegatedParams.ProjectedPosition,
@@ -324,7 +324,7 @@ private Task<WorkspaceEdit> HandleRenameAsync<T>(T @params, CancellationToken ca
             {
                 TextDocument = new VSTextDocumentIdentifier()
                 {
-                    Uri = _csharpDocumentUri,
+                    DocumentUri = new(_csharpDocumentUri),
                     ProjectContext = delegatedParams.Identifier.TextDocumentIdentifier.GetProjectContext(),
                 },
                 Position = delegatedParams.ProjectedPosition,
@@ -344,7 +344,7 @@ private Task<VSInternalDocumentOnAutoInsertResponseItem> HandleOnAutoInsertAsync
             {
                 TextDocument = new VSTextDocumentIdentifier()
                 {
-                    Uri = _csharpDocumentUri,
+                    DocumentUri = new(_csharpDocumentUri),
                     ProjectContext = delegatedParams.Identifier.TextDocumentIdentifier.GetProjectContext()
                 },
                 Position = delegatedParams.ProjectedPosition,
@@ -375,7 +375,7 @@ private Task<LspRange> HandleValidateBreakpointRangeAsync<T>(T @params, Cancella
             {
                 TextDocument = new VSTextDocumentIdentifier()
                 {
-                    Uri = _csharpDocumentUri,
+                    DocumentUri = new(_csharpDocumentUri),
                     ProjectContext = delegatedParams.Identifier.TextDocumentIdentifier.GetProjectContext(),
                 },
                 Range = delegatedParams.ProjectedRange,
@@ -392,7 +392,7 @@ private Task<VSInternalDataTip> HandleDataTipRangeAsync<T>(T @params, Cancellati
             {
                 TextDocument = new VSTextDocumentIdentifier()
                 {
-                    Uri = _csharpDocumentUri,
+                    DocumentUri = new(_csharpDocumentUri),
                     ProjectContext = delegatedParams.Identifier.TextDocumentIdentifier.GetProjectContext(),
                 },
                 Position = delegatedParams.ProjectedPosition,
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/SpellCheck/DocumentSpellCheckEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/SpellCheck/DocumentSpellCheckEndpointTest.cs
index 9fa544b6586..0c7b04a07f5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/SpellCheck/DocumentSpellCheckEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/SpellCheck/DocumentSpellCheckEndpointTest.cs
@@ -180,7 +180,7 @@ private async Task ValidateSpellCheckRangesAsync(string originalInput, string? f
 
         var request = new VSInternalDocumentSpellCheckableParams
         {
-            TextDocument = new TextDocumentIdentifier { Uri = uri }
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(uri) }
         };
 
         var response = await endpoint.HandleRequestAsync(request, requestContext, DisposalToken);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/WrapWithTag/WrapWithTagEndpointTests.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/WrapWithTag/WrapWithTagEndpointTests.cs
index d340a2c69a3..5863d184f54 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/WrapWithTag/WrapWithTagEndpointTests.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/WrapWithTag/WrapWithTagEndpointTests.cs
@@ -32,7 +32,7 @@ public async Task Handle_Html_ReturnsResult()
 
         var endpoint = new WrapWithTagEndpoint(clientConnection, LoggerFactory);
 
-        var wrapWithDivParams = new WrapWithTagParams(new() { Uri = uri })
+        var wrapWithDivParams = new WrapWithTagParams(new() { DocumentUri = new(uri) })
         {
             Range = LspFactory.CreateSingleLineRange(start: (0, 0), length: 2),
         };
@@ -62,7 +62,7 @@ public async Task Handle_CSharp_ReturnsNull()
 
         var endpoint = new WrapWithTagEndpoint(clientConnection, LoggerFactory);
 
-        var wrapWithDivParams = new WrapWithTagParams(new() { Uri = uri })
+        var wrapWithDivParams = new WrapWithTagParams(new() { DocumentUri = new(uri) })
         {
             Range = LspFactory.CreateSingleLineRange(start: (0, 1), length: 2),
         };
@@ -93,7 +93,7 @@ public async Task Handle_CSharp_WholeImplicitStatement_ReturnsResult()
 
         var endpoint = new WrapWithTagEndpoint(clientConnection, LoggerFactory);
 
-        var wrapWithDivParams = new WrapWithTagParams(new() { Uri = uri })
+        var wrapWithDivParams = new WrapWithTagParams(new() { DocumentUri = new(uri) })
         {
             Range = LspFactory.CreateSingleLineRange(start: (0, 0), length: 8),
         };
@@ -130,7 +130,7 @@ public async Task Handle_RazorBlockStart_ReturnsResult()
         var endpoint = new WrapWithTagEndpoint(clientConnection, LoggerFactory);
 
         var range = codeDocument.Source.Text.GetRange(input.Span);
-        var wrapWithDivParams = new WrapWithTagParams(new TextDocumentIdentifier { Uri = uri })
+        var wrapWithDivParams = new WrapWithTagParams(new TextDocumentIdentifier { DocumentUri = new(uri) })
         {
             Range = range
         };
@@ -167,7 +167,7 @@ public async Task Handle_HtmlInCSharp()
         var endpoint = new WrapWithTagEndpoint(clientConnection, LoggerFactory);
 
         var range = codeDocument.Source.Text.GetRange(input.Span);
-        var wrapWithDivParams = new WrapWithTagParams(new TextDocumentIdentifier { Uri = uri })
+        var wrapWithDivParams = new WrapWithTagParams(new TextDocumentIdentifier { DocumentUri = new(uri) })
         {
             Range = range
         };
@@ -204,7 +204,7 @@ public async Task Handle_HtmlInCSharp_WithWhitespace()
         var endpoint = new WrapWithTagEndpoint(clientConnection, LoggerFactory);
 
         var range = codeDocument.Source.Text.GetRange(input.Span);
-        var wrapWithDivParams = new WrapWithTagParams(new TextDocumentIdentifier { Uri = uri })
+        var wrapWithDivParams = new WrapWithTagParams(new TextDocumentIdentifier { DocumentUri = new(uri) })
         {
             Range = range
         };
@@ -238,7 +238,7 @@ public async Task Handle_HtmlInCSharp_WithNewline()
         var endpoint = new WrapWithTagEndpoint(clientConnection, LoggerFactory);
 
         var range = codeDocument.Source.Text.GetRange(input.Span);
-        var wrapWithDivParams = new WrapWithTagParams(new TextDocumentIdentifier { Uri = uri })
+        var wrapWithDivParams = new WrapWithTagParams(new TextDocumentIdentifier { DocumentUri = new(uri) })
         {
             Range = range
         };
@@ -267,7 +267,7 @@ public async Task Handle_CSharp_PartOfImplicitStatement_ReturnsNull()
 
         var endpoint = new WrapWithTagEndpoint(clientConnection, LoggerFactory);
 
-        var wrapWithDivParams = new WrapWithTagParams(new() { Uri = uri })
+        var wrapWithDivParams = new WrapWithTagParams(new() { DocumentUri = new(uri) })
         {
             Range = LspFactory.CreateSingleLineRange(line: 0, character: 2, length: 2),
         };
@@ -298,7 +298,7 @@ public async Task Handle_CSharp_InImplicitStatement_ReturnsResult()
 
         var endpoint = new WrapWithTagEndpoint(clientConnection, LoggerFactory);
 
-        var wrapWithDivParams = new WrapWithTagParams(new() { Uri = uri })
+        var wrapWithDivParams = new WrapWithTagParams(new() { DocumentUri = new(uri) })
         {
             Range = LspFactory.CreateZeroWidthRange(0, 4),
         };
@@ -326,7 +326,7 @@ public async Task Handle_DocumentNotFound_ReturnsNull()
 
         var endpoint = new WrapWithTagEndpoint(clientConnection, LoggerFactory);
 
-        var wrapWithDivParams = new WrapWithTagParams(new() { Uri = missingUri })
+        var wrapWithDivParams = new WrapWithTagParams(new() { DocumentUri = new(missingUri) })
         {
             Range = LspFactory.CreateSingleLineRange(start: (0, 0), length: 2),
         };
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/LanguageServer/CSharpTestLspServer.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/LanguageServer/CSharpTestLspServer.cs
index 8e3a51b2211..fb352c3bf40 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/LanguageServer/CSharpTestLspServer.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/LanguageServer/CSharpTestLspServer.cs
@@ -190,7 +190,7 @@ public Task OpenDocumentAsync(Uri documentUri, string documentText, Cancellation
     {
         var didOpenParams = new DidOpenTextDocumentParams
         {
-            TextDocument = new() { Uri = documentUri, Text = documentText }
+            TextDocument = new() { DocumentUri = new(documentUri), Text = documentText }
         };
 
         return ExecuteRequestAsync<DidOpenTextDocumentParams, object>(Methods.TextDocumentDidOpenName, didOpenParams, cancellationToken);
@@ -200,7 +200,7 @@ internal Task ReplaceTextAsync(Uri documentUri, (LspRange Range, string Text)[]
     {
         var didChangeParams = new DidChangeTextDocumentParams()
         {
-            TextDocument = new() { Uri = documentUri },
+            TextDocument = new() { DocumentUri = new(documentUri) },
             ContentChanges = Array.ConvertAll(changes, ConvertToEvent)
         };
 
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CodeActions/CohostCodeActionsEndpointTestBase.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CodeActions/CohostCodeActionsEndpointTestBase.cs
index 0656c528a38..4c7010feb98 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CodeActions/CohostCodeActionsEndpointTestBase.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CodeActions/CohostCodeActionsEndpointTestBase.cs
@@ -138,7 +138,7 @@ Could not find code action with name '{codeActionName}'.
 
         var request = new VSCodeActionParams
         {
-            TextDocument = new VSTextDocumentIdentifier { Uri = document.CreateUri() },
+            TextDocument = new VSTextDocumentIdentifier { DocumentUri = new(document.CreateUri()) },
             Range = range,
             Context = new VSInternalCodeActionContext() { Diagnostics = diagnostics.ToArray() }
         };
@@ -172,9 +172,9 @@ private async Task VerifyCodeActionResultAsync(TextDocument document, WorkspaceE
                 if (sumType.Value is CreateFile createFile)
                 {
                     validated = true;
-                    Assert.Single(additionalExpectedFiles.AssumeNotNull(), f => f.fileUri == createFile.Uri);
+                    Assert.Single(additionalExpectedFiles.AssumeNotNull(), f => f.fileUri == createFile.DocumentUri.GetRequiredParsedUri());
                     var documentId = DocumentId.CreateNewId(document.Project.Id);
-                    var filePath = createFile.Uri.GetDocumentFilePath();
+                    var filePath = createFile.DocumentUri.GetRequiredParsedUri().GetDocumentFilePath();
                     var documentInfo = DocumentInfo.Create(documentId, filePath, filePath: filePath);
                     solution = solution.AddDocument(documentInfo);
                 }
@@ -185,7 +185,7 @@ private async Task VerifyCodeActionResultAsync(TextDocument document, WorkspaceE
         {
             foreach (var edit in documentEdits)
             {
-                var textDocument = solution.GetTextDocuments(edit.TextDocument.Uri).First();
+                var textDocument = solution.GetTextDocuments(edit.TextDocument.DocumentUri.GetRequiredParsedUri()).First();
                 var text = await textDocument.GetTextAsync(DisposalToken).ConfigureAwait(false);
                 if (textDocument is Document)
                 {
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentCompletionEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentCompletionEndpointTest.cs
index f9174f07ae3..fa7f6505048 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentCompletionEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentCompletionEndpointTest.cs
@@ -683,7 +683,7 @@ private async Task VerifyCompletionListAsync(
         {
             TextDocument = new TextDocumentIdentifier()
             {
-                Uri = document.CreateUri()
+                DocumentUri = new(document.CreateUri())
             },
             Position = sourceText.GetPosition(input.Position),
             Context = completionContext
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentCompletionResolveEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentCompletionResolveEndpointTest.cs
index dec469e2784..12a9ade95e6 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentCompletionResolveEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentCompletionResolveEndpointTest.cs
@@ -47,7 +47,7 @@ private async Task VerifyCompletionItemResolveAsync(TestCode input)
             requestInvoker,
             LoggerFactory);
 
-        var textDocumentIdentifier = new TextDocumentIdentifierAndVersion(new TextDocumentIdentifier { Uri = document.CreateUri() }, Version: 0);
+        var textDocumentIdentifier = new TextDocumentIdentifierAndVersion(new TextDocumentIdentifier { DocumentUri = new(document.CreateUri()) }, Version: 0);
 
         var context = new DelegatedCompletionResolutionContext(
             textDocumentIdentifier,
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentHighlightEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentHighlightEndpointTest.cs
index a9f4ac14e9d..570e447409e 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentHighlightEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostDocumentHighlightEndpointTest.cs
@@ -156,7 +156,7 @@ private async Task VerifyDocumentHighlightsAsync(string input, DocumentHighlight
 
         var request = new DocumentHighlightParams()
         {
-            TextDocument = new TextDocumentIdentifier() { Uri = document.CreateUri() },
+            TextDocument = new TextDocumentIdentifier() { DocumentUri = new(document.CreateUri()) },
             Position = position
         };
 
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostFindAllReferencesEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostFindAllReferencesEndpointTest.cs
index 853e102cbec..2813e8e99be 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostFindAllReferencesEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostFindAllReferencesEndpointTest.cs
@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.Test.Common;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.Utilities;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Text.Adornments;
@@ -106,7 +107,7 @@ private async Task VerifyFindAllReferencesAsync(TestCode input, bool supportsVSE
         var textDocumentPositionParams = new TextDocumentPositionParams
         {
             Position = position,
-            TextDocument = new TextDocumentIdentifier { Uri = document.CreateUri() },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(document.CreateUri()) },
         };
 
         var results = await endpoint.GetTestAccessor().HandleRequestAsync(document, position, DisposalToken);
@@ -143,14 +144,14 @@ private async Task VerifyFindAllReferencesAsync(TestCode input, bool supportsVSE
         {
             var location = GetLocation(result);
             string matchedText;
-            if (razorDocumentUri.Equals(location.Uri))
+            if (razorDocumentUri.Equals(location.DocumentUri.GetRequiredParsedUri()))
             {
                 matchedText = inputText.Lines[location.Range.Start.Line].ToString();
                 Assert.Single(input.Spans.Where(s => inputText.GetRange(s).Equals(location.Range)));
             }
             else
             {
-                var (fileName, testCode) = Assert.Single(additionalFiles.Where(f => FilePathNormalizingComparer.Instance.Equals(f.fileName, location.Uri.AbsolutePath)));
+                var (fileName, testCode) = Assert.Single(additionalFiles.Where(f => FilePathNormalizingComparer.Instance.Equals(f.fileName, location.DocumentUri.GetRequiredParsedUri().AbsolutePath)));
                 var text = SourceText.From(testCode.Text);
                 matchedText = text.Lines[location.Range.Start.Line].ToString();
                 Assert.Single(testCode.Spans.Where(s => text.GetRange(s).Equals(location.Range)));
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostGoToDefinitionEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostGoToDefinitionEndpointTest.cs
index d5e948f3908..f26e04f7914 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostGoToDefinitionEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostGoToDefinitionEndpointTest.cs
@@ -8,6 +8,7 @@
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Test.Common;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Text;
 using Xunit;
 using Xunit.Abstractions;
@@ -73,13 +74,13 @@ public async Task CSharp_MetadataReference()
         Assert.NotNull(result.Value.Second);
         var locations = result.Value.Second;
         var location = Assert.Single(locations);
-        Assert.EndsWith("String.cs", location.Uri.ToString());
+        Assert.EndsWith("String.cs", location.DocumentUri.UriString);
 
         // Note: The location is in a generated C# "metadata-as-source" file, which has a different
         // number of using directives in .NET Framework vs. .NET Core, so rather than relying on line
         // numbers we do some vague notion of actual navigation and test the actual source line that
         // the user would see.
-        var line = File.ReadLines(location.Uri.LocalPath).ElementAt(location.Range.Start.Line);
+        var line = File.ReadLines(location.DocumentUri.GetRequiredParsedUri().LocalPath).ElementAt(location.Range.Start.Line);
         Assert.Contains("public sealed class String", line);
     }
 
@@ -220,7 +221,7 @@ public async Task Html()
         var htmlResponse = new SumType<LspLocation, LspLocation[], DocumentLink[]>?(new LspLocation[]
         {
             new() {
-                Uri = new Uri(document.CreateUri(), document.Name + FeatureOptions.HtmlVirtualDocumentSuffix),
+                DocumentUri = new(new Uri(document.CreateUri(), document.Name + FeatureOptions.HtmlVirtualDocumentSuffix)),
                 Range = inputText.GetRange(input.Span),
             },
         });
@@ -249,7 +250,7 @@ private async Task VerifyGoToDefinitionAsync(
         var range = text.GetRange(input.Span);
         Assert.Equal(range, location.Range);
 
-        Assert.Equal(document.CreateUri(), location.Uri);
+        Assert.Equal(document.CreateUri(), location.DocumentUri.GetRequiredParsedUri());
     }
 
     private async Task<SumType<LspLocation, LspLocation[], DocumentLink[]>?> GetGoToDefinitionResultAsync(
@@ -275,7 +276,7 @@ private async Task VerifyGoToDefinitionAsync(
         var textDocumentPositionParams = new TextDocumentPositionParams
         {
             Position = position,
-            TextDocument = new TextDocumentIdentifier { Uri = document.CreateUri() },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(document.CreateUri()) },
         };
 
         return await endpoint.GetTestAccessor().HandleRequestAsync(textDocumentPositionParams, document, DisposalToken);
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostGoToImplementationEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostGoToImplementationEndpointTest.cs
index 513e2954697..9b3cc55fafb 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostGoToImplementationEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostGoToImplementationEndpointTest.cs
@@ -7,6 +7,7 @@
 using Microsoft.AspNetCore.Razor.Test.Common;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Remote.Razor;
 using Microsoft.CodeAnalysis.Text;
 using Xunit;
@@ -104,7 +105,7 @@ public async Task Html()
         {
             new LspLocation
             {
-                Uri = new Uri(document.CreateUri(), document.Name + FeatureOptions.HtmlVirtualDocumentSuffix),
+                DocumentUri = new(new Uri(document.CreateUri(), document.Name + FeatureOptions.HtmlVirtualDocumentSuffix)),
                 Range = inputText.GetRange(input.Span),
             },
         });
@@ -139,7 +140,7 @@ private async Task VerifyGoToImplementationResultCoreAsync(TestCode input, TextD
         var textDocumentPositionParams = new TextDocumentPositionParams
         {
             Position = position,
-            TextDocument = new TextDocumentIdentifier { Uri = document.CreateUri() },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(document.CreateUri()) },
         };
 
         var result = await endpoint.GetTestAccessor().HandleRequestAsync(textDocumentPositionParams, document, DisposalToken);
@@ -150,7 +151,7 @@ private async Task VerifyGoToImplementationResultCoreAsync(TestCode input, TextD
             var actual = roslynLocations.Select(l => l.Range.ToLinePositionSpan()).OrderBy(r => r.Start.Line).ToArray();
             Assert.Equal(expected, actual);
 
-            Assert.All(roslynLocations, l => l.Uri.Equals(document.CreateUri()));
+            Assert.All(roslynLocations, l => l.DocumentUri.GetRequiredParsedUri().Equals(document.CreateUri()));
         }
         else
         {
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostHoverEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostHoverEndpointTest.cs
index dd5a2770ea9..5e2152edfff 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostHoverEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostHoverEndpointTest.cs
@@ -210,7 +210,7 @@ private async Task VerifyHoverAsync(TestCode input, Hover htmlResponse, Action<H
         var textDocumentPositionParams = new TextDocumentPositionParams
         {
             Position = LspFactory.CreatePosition(linePosition),
-            TextDocument = new TextDocumentIdentifier { Uri = document.CreateUri() },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(document.CreateUri()) },
         };
 
         return await endpoint.GetTestAccessor().HandleRequestAsync(textDocumentPositionParams, document, DisposalToken);
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostInlayHintEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostInlayHintEndpointTest.cs
index 117bb27ec04..049902fb30c 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostInlayHintEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostInlayHintEndpointTest.cs
@@ -9,6 +9,7 @@
 using Microsoft.AspNetCore.Razor;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Testing;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Test.Utilities;
@@ -141,7 +142,7 @@ public async Task InlayHints_InvalidRange(int startLine, int starChar, int endLi
 
         var request = new InlayHintParams()
         {
-            TextDocument = new TextDocumentIdentifier() { Uri = document.CreateUri() },
+            TextDocument = new TextDocumentIdentifier() { DocumentUri = new(document.CreateUri()) },
             Range = LspFactory.CreateRange(startLine, starChar, endLine, endChar)
         };
 
@@ -203,7 +204,7 @@ private async Task VerifyInlayHintsAsync(string input, Dictionary<string, string
 
         var request = new InlayHintParams()
         {
-            TextDocument = new TextDocumentIdentifier() { Uri = document.CreateUri() },
+            TextDocument = new TextDocumentIdentifier() { DocumentUri = new(document.CreateUri()) },
             Range = new()
             {
                 Start = new(0, 0),
@@ -238,7 +239,7 @@ private async Task VerifyInlayHintsAsync(string input, Dictionary<string, string
             // Make sure we can resolve the document correctly
             var tdi = resolveEndpoint.GetTestAccessor().GetTextDocumentIdentifier(serializedHint);
             Assert.NotNull(tdi);
-            Assert.Equal(document.CreateUri(), tdi.Uri);
+            Assert.Equal(document.CreateUri(), tdi.DocumentUri.GetRequiredParsedUri());
 
             // Make sure we, or really Roslyn, can resolve the hint correctly
             var resolvedHint = await resolveEndpoint.GetTestAccessor().HandleRequestAsync(serializedHint, document, DisposalToken);
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostLinkedEditingRangeEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostLinkedEditingRangeEndpointTest.cs
index 2633656ecd7..d987af3a50e 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostLinkedEditingRangeEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostLinkedEditingRangeEndpointTest.cs
@@ -167,7 +167,7 @@ private async Task VerifyLinkedEditingRangeAsync(string input)
         {
             TextDocument = new TextDocumentIdentifier()
             {
-                Uri = document.CreateUri()
+                DocumentUri = new(document.CreateUri())
             },
             Position = sourceText.GetPosition(cursorPosition)
         };
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostOnAutoInsertEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostOnAutoInsertEndpointTest.cs
index 4b902ad410f..268c064367a 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostOnAutoInsertEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostOnAutoInsertEndpointTest.cs
@@ -254,7 +254,7 @@ private async Task VerifyOnAutoInsertAsync(
         {
             TextDocument = new TextDocumentIdentifier()
             {
-                Uri = document.CreateUri()
+                DocumentUri = new(document.CreateUri())
             },
             Position = sourceText.GetPosition(input.Position),
             Character = triggerCharacter,
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostOnTypeFormattingEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostOnTypeFormattingEndpointTest.cs
index acbab8d9c4a..201e20d9cf2 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostOnTypeFormattingEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostOnTypeFormattingEndpointTest.cs
@@ -130,7 +130,7 @@ private async Task VerifyOnTypeFormattingAsync(TestCode input, string expected,
 
         var request = new DocumentOnTypeFormattingParams()
         {
-            TextDocument = new TextDocumentIdentifier() { Uri = document.CreateUri() },
+            TextDocument = new TextDocumentIdentifier() { DocumentUri = new(document.CreateUri()) },
             Options = new FormattingOptions()
             {
                 TabSize = 4,
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRangeFormattingEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRangeFormattingEndpointTest.cs
index 370e4b12e5a..79274e0059a 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRangeFormattingEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRangeFormattingEndpointTest.cs
@@ -119,7 +119,7 @@ private async Task VerifyRangeFormattingAsync(TestCode input, string expected)
 
         var request = new DocumentRangeFormattingParams()
         {
-            TextDocument = new TextDocumentIdentifier() { Uri = document.CreateUri() },
+            TextDocument = new TextDocumentIdentifier() { DocumentUri = new(document.CreateUri()) },
             Options = new FormattingOptions()
             {
                 TabSize = 4,
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRenameEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRenameEndpointTest.cs
index cac94310738..3bef2896007 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRenameEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRenameEndpointTest.cs
@@ -185,7 +185,7 @@ private async Task VerifyRenamesAsync(
         var renameParams = new RenameParams
         {
             Position = position,
-            TextDocument = new TextDocumentIdentifier { Uri = document.CreateUri() },
+            TextDocument = new TextDocumentIdentifier { DocumentUri = new(document.CreateUri()) },
             NewName = newName,
         };
 
@@ -209,8 +209,8 @@ private async Task VerifyRenamesAsync(
                 if (change.TryGetThird(out var renameEdit))
                 {
                     Assert.Contains(renames,
-                        r => renameEdit.OldUri.GetDocumentFilePath().EndsWith(r.oldName) &&
-                             renameEdit.NewUri.GetDocumentFilePath().EndsWith(r.newName));
+                        r => renameEdit.OldDocumentUri.GetRequiredParsedUri().GetDocumentFilePath().EndsWith(r.oldName) &&
+                             renameEdit.NewDocumentUri.GetRequiredParsedUri().GetDocumentFilePath().EndsWith(r.newName));
                 }
             }
         }
@@ -225,7 +225,7 @@ private static string ProcessRazorDocumentEdits(SourceText inputText, Uri razorD
         Assert.True(result.TryGetTextDocumentEdits(out var textDocumentEdits));
         foreach (var textDocumentEdit in textDocumentEdits)
         {
-            if (textDocumentEdit.TextDocument.Uri == razorDocumentUri)
+            if (textDocumentEdit.TextDocument.DocumentUri.GetRequiredParsedUri() == razorDocumentUri)
             {
                 foreach (var edit in textDocumentEdit.Edits)
                 {
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSignatureHelpEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSignatureHelpEndpointTest.cs
index e5e35bf4e6e..ef46558290d 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSignatureHelpEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSignatureHelpEndpointTest.cs
@@ -109,7 +109,7 @@ private async Task VerifySignatureHelpAsync(string input, string expected, bool
         {
             TextDocument = new TextDocumentIdentifier()
             {
-                Uri = document.CreateUri()
+                DocumentUri = new(document.CreateUri())
             },
             Position = sourceText.GetPosition(cursorPosition),
             Context = signatureHelpContext
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostTextPresentationEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostTextPresentationEndpointTest.cs
index 099ce404bc3..7cc7d96d8b2 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostTextPresentationEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostTextPresentationEndpointTest.cs
@@ -3,6 +3,7 @@
 
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Testing;
 using Xunit;
 using Xunit.Abstractions;
@@ -33,7 +34,7 @@ The end.
                     {
                         TextDocument = new()
                         {
-                            Uri = FileUri("File1.razor.g.html")
+                            DocumentUri = new(FileUri("File1.razor.g.html"))
                         },
                         Edits = [LspFactory.CreateTextEdit(position: (0, 0), "Hello World")]
                     }
@@ -56,7 +57,7 @@ private async Task VerifyUriPresentationAsync(string input, string text, string?
         {
             TextDocument = new TextDocumentIdentifier()
             {
-                Uri = document.CreateUri()
+                DocumentUri = new(document.CreateUri())
             },
             Range = sourceText.GetRange(span),
             Text = text
@@ -73,7 +74,7 @@ private async Task VerifyUriPresentationAsync(string input, string text, string?
             Assert.NotNull(result);
             Assert.NotNull(result.DocumentChanges);
             Assert.Equal(expected, ((TextEdit)result.DocumentChanges.Value.First[0].Edits[0]).NewText);
-            Assert.Equal(document.CreateUri(), result.DocumentChanges.Value.First[0].TextDocument.Uri);
+            Assert.Equal(document.CreateUri(), result.DocumentChanges.Value.First[0].TextDocument.DocumentUri.GetRequiredParsedUri());
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostUriPresentationEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostUriPresentationEndpointTest.cs
index fe308c50a8d..206e9ac58be 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostUriPresentationEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostUriPresentationEndpointTest.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Testing;
 using Xunit;
 using Xunit.Abstractions;
@@ -56,7 +57,7 @@ The end.
                     {
                         TextDocument = new()
                         {
-                            Uri = FileUri("File1.razor.g.html")
+                            DocumentUri = new(FileUri("File1.razor.g.html"))
                         },
                         Edits = [LspFactory.CreateTextEdit(position: (0, 0), htmlTag)]
                     }
@@ -128,7 +129,7 @@ This is a Razor document.
                     {
                         TextDocument = new()
                         {
-                            Uri = FileUri("File1.razor.g.html")
+                            DocumentUri = new(FileUri("File1.razor.g.html"))
                         },
                         Edits = [LspFactory.CreateTextEdit(position: (0, 0), htmlTag)]
                     }
@@ -251,7 +252,7 @@ private async Task VerifyUriPresentationAsync(string input, Uri[] uris, string?
         {
             TextDocument = new TextDocumentIdentifier()
             {
-                Uri = document.CreateUri()
+                DocumentUri = new(document.CreateUri())
             },
             Range = sourceText.GetRange(span),
             Uris = uris
@@ -268,7 +269,7 @@ private async Task VerifyUriPresentationAsync(string input, Uri[] uris, string?
             Assert.NotNull(result);
             Assert.NotNull(result.DocumentChanges);
             Assert.Equal(expected, ((TextEdit)result.DocumentChanges.Value.First[0].Edits[0]).NewText);
-            Assert.Equal(document.CreateUri(), result.DocumentChanges.Value.First[0].TextDocument.Uri);
+            Assert.Equal(document.CreateUri(), result.DocumentChanges.Value.First[0].TextDocument.DocumentUri.GetRequiredParsedUri());
         }
     }
 }
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/FormattingTestBase.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/FormattingTestBase.cs
index 999a6c4a8b0..ab0ce45340c 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/FormattingTestBase.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/FormattingTestBase.cs
@@ -131,7 +131,7 @@ private protected async Task RunOnTypeFormattingTestAsync(
 
         var request = new DocumentOnTypeFormattingParams()
         {
-            TextDocument = new TextDocumentIdentifier() { Uri = document.CreateUri() },
+            TextDocument = new TextDocumentIdentifier() { DocumentUri = new(document.CreateUri()) },
             Options = new FormattingOptions()
             {
                 TabSize = tabSize,
@@ -184,7 +184,7 @@ private protected async Task RunOnTypeFormattingTestAsync(
             var endpoint = new CohostDocumentFormattingEndpoint(RemoteServiceInvoker, requestInvoker, clientSettingsManager, LoggerFactory);
             var request = new DocumentFormattingParams()
             {
-                TextDocument = new TextDocumentIdentifier() { Uri = document.CreateUri() },
+                TextDocument = new TextDocumentIdentifier() { DocumentUri = new(document.CreateUri()) },
                 Options = new FormattingOptions()
                 {
                     TabSize = tabSize,
@@ -199,7 +199,7 @@ private protected async Task RunOnTypeFormattingTestAsync(
         var rangeEndpoint = new CohostRangeFormattingEndpoint(RemoteServiceInvoker, requestInvoker, clientSettingsManager, LoggerFactory);
         var rangeRequest = new DocumentRangeFormattingParams()
         {
-            TextDocument = new TextDocumentIdentifier() { Uri = document.CreateUri() },
+            TextDocument = new TextDocumentIdentifier() { DocumentUri = new(document.CreateUri()) },
             Options = new FormattingOptions()
             {
                 TabSize = 4,
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/LanguageClient/RazorCustomMessageTargetTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/LanguageClient/RazorCustomMessageTargetTest.cs
index 263d24c5678..deff3c6647a 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/LanguageClient/RazorCustomMessageTargetTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/LanguageClient/RazorCustomMessageTargetTest.cs
@@ -211,7 +211,7 @@ public async Task ProvideCodeActionsAsync_CannotLookupDocument_ReturnsNullAsync(
             {
                 TextDocument = new VSTextDocumentIdentifier()
                 {
-                    Uri = new Uri("C:/path/to/file.razor")
+                    DocumentUri = new(new Uri("C:/path/to/file.razor"))
                 },
                 Range = LspFactory.DefaultRange,
                 Context = new VSInternalCodeActionContext()
@@ -292,7 +292,7 @@ async IAsyncEnumerable<ReinvocationResponse<IReadOnlyList<VSInternalCodeAction>>
             {
                 TextDocument = new VSTextDocumentIdentifier()
                 {
-                    Uri = testDocUri
+                    DocumentUri = new(testDocUri)
                 },
                 Range = LspFactory.DefaultRange,
                 Context = new VSInternalCodeActionContext()
@@ -373,7 +373,7 @@ async IAsyncEnumerable<ReinvocationResponse<VSInternalCodeAction>> GetExpectedRe
         {
             Title = "Something",
         };
-        var request = new RazorResolveCodeActionParams(new TextDocumentIdentifier { Uri = razorUri }, HostDocumentVersion: 1, RazorLanguageKind.CSharp, codeAction);
+        var request = new RazorResolveCodeActionParams(new TextDocumentIdentifier { DocumentUri = new(razorUri) }, HostDocumentVersion: 1, RazorLanguageKind.CSharp, codeAction);
 
         // Act
         var result = await target.ResolveCodeActionsAsync(request, DisposalToken);
@@ -412,7 +412,7 @@ public async Task ProvideSemanticTokensAsync_CannotLookupDocument_ReturnsNullAsy
         var request = new ProvideSemanticTokensRangesParams(
             textDocument: new TextDocumentIdentifier()
             {
-                Uri = new Uri("C:/path/to/file.razor")
+                DocumentUri = new(new Uri("C:/path/to/file.razor"))
             },
             requiredHostDocumentVersion: 1,
             ranges: [LspFactory.DefaultRange],
@@ -459,7 +459,7 @@ public async Task ProvideSemanticTokensAsync_CannotLookupVirtualDocument_Returns
         var request = new ProvideSemanticTokensRangesParams(
             textDocument: new TextDocumentIdentifier()
             {
-                Uri = new Uri("C:/path/to/file.razor")
+                DocumentUri = new(new Uri("C:/path/to/file.razor"))
             },
             requiredHostDocumentVersion: 0,
             ranges: [LspFactory.DefaultRange],
@@ -539,7 +539,7 @@ public async Task ProvideSemanticTokensAsync_ContainsRange_ReturnsSemanticTokens
         var request = new ProvideSemanticTokensRangesParams(
             textDocument: new TextDocumentIdentifier()
             {
-                Uri = new Uri("C:/path/to%20-%20project/file.razor")
+                DocumentUri = new(new Uri("C:/path/to%20-%20project/file.razor"))
             },
             requiredHostDocumentVersion: 0,
             ranges: [LspFactory.DefaultRange],
@@ -620,7 +620,7 @@ public async Task ProvideSemanticTokensAsync_EmptyRange_ReturnsNoSemanticTokens(
         var request = new ProvideSemanticTokensRangesParams(
             textDocument: new TextDocumentIdentifier()
             {
-                Uri = new Uri("C:/path/to%20-%20project/file.razor")
+                DocumentUri = new(new Uri("C:/path/to%20-%20project/file.razor"))
             },
             requiredHostDocumentVersion: 0,
             ranges: [LspFactory.DefaultRange],

From 8588037b2e1deb4a58e5e22daf971eec678a57aa Mon Sep 17 00:00:00 2001
From: David Wengier <david.wengier@microsoft.com>
Date: Tue, 17 Jun 2025 13:55:16 +1000
Subject: [PATCH 09/10] Pass C# formatting settings override around more

---
 .../Formatting/CSharpFormatter.cs                | 16 +++++++++++-----
 .../Formatting/Passes/CSharpFormattingPass.cs    | 13 -------------
 .../Passes/CSharpFormattingPassBase.cs           | 15 ++++++++++++++-
 .../Passes/CSharpOnTypeFormattingPass.cs         |  1 +
 .../Formatting/RazorFormattingService.cs         |  5 +++++
 5 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/CSharpFormatter.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/CSharpFormatter.cs
index c848d92b529..e917827fa6a 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/CSharpFormatter.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/CSharpFormatter.cs
@@ -46,13 +46,14 @@ public static async Task<IReadOnlyDictionary<int, int>> GetCSharpIndentationAsyn
         FormattingContext context,
         HashSet<int> projectedDocumentLocations,
         HostWorkspaceServices hostWorkspaceServices,
+        RazorCSharpSyntaxFormattingOptions? formattingOptionsOverride,
         CancellationToken cancellationToken)
     {
         // Sorting ensures we count the marker offsets correctly.
         // We also want to ensure there are no duplicates to avoid duplicate markers.
         var filteredLocations = projectedDocumentLocations.OrderAsArray();
 
-        var indentations = await GetCSharpIndentationCoreAsync(context, filteredLocations, hostWorkspaceServices, cancellationToken).ConfigureAwait(false);
+        var indentations = await GetCSharpIndentationCoreAsync(context, filteredLocations, hostWorkspaceServices, formattingOptionsOverride, cancellationToken).ConfigureAwait(false);
         return indentations;
     }
 
@@ -60,7 +61,7 @@ private ImmutableArray<TextChange> MapEditsToHostDocument(RazorCodeDocument code
     {
         var actualEdits = _documentMappingService.GetHostDocumentEdits(codeDocument.GetRequiredCSharpDocument(), csharpEdits);
 
-        return actualEdits.ToImmutableArray();
+        return [.. actualEdits];
     }
 
     private static async Task<ImmutableArray<TextChange>> GetFormattingEditsAsync(
@@ -77,10 +78,15 @@ private static async Task<ImmutableArray<TextChange>> GetFormattingEditsAsync(
         Assumes.NotNull(root);
 
         var changes = RazorCSharpFormattingInteractionService.GetFormattedTextChanges(hostWorkspaceServices, root, spanToFormat, indentationOptions, formattingOptionsOverride, cancellationToken);
-        return changes.ToImmutableArray();
+        return [.. changes];
     }
 
-    private static async Task<Dictionary<int, int>> GetCSharpIndentationCoreAsync(FormattingContext context, ImmutableArray<int> projectedDocumentLocations, HostWorkspaceServices hostWorkspaceServices, CancellationToken cancellationToken)
+    private static async Task<Dictionary<int, int>> GetCSharpIndentationCoreAsync(
+        FormattingContext context,
+        ImmutableArray<int> projectedDocumentLocations,
+        HostWorkspaceServices hostWorkspaceServices,
+        RazorCSharpSyntaxFormattingOptions? formattingOptionsOverride,
+        CancellationToken cancellationToken)
     {
         // No point calling the C# formatting if we won't be interested in any of its work anyway
         if (projectedDocumentLocations.Length == 0)
@@ -96,7 +102,7 @@ private static async Task<Dictionary<int, int>> GetCSharpIndentationCoreAsync(Fo
 
         // At this point, we have added all the necessary markers and attached annotations.
         // Let's invoke the C# formatter and hope for the best.
-        var formattedRoot = RazorCSharpFormattingInteractionService.Format(hostWorkspaceServices, root, context.Options.ToIndentationOptions(), cancellationToken);
+        var formattedRoot = RazorCSharpFormattingInteractionService.Format(hostWorkspaceServices, root, context.Options.ToIndentationOptions(), formattingOptionsOverride, cancellationToken);
         var formattedText = formattedRoot.GetText();
 
         var desiredIndentationMap = new Dictionary<int, int>();
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpFormattingPass.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpFormattingPass.cs
index afc82ac6435..62111ea1cb1 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpFormattingPass.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpFormattingPass.cs
@@ -7,7 +7,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.PooledObjects;
-using Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
 using Microsoft.CodeAnalysis.Razor.Logging;
@@ -28,8 +27,6 @@ internal sealed class CSharpFormattingPass(
     private readonly CSharpFormatter _csharpFormatter = new(documentMappingService);
     private readonly ILogger _logger = loggerFactory.GetOrCreateLogger<CSharpFormattingPass>();
 
-    private RazorCSharpSyntaxFormattingOptions? _csharpSyntaxFormattingOptionsOverride;
-
     protected async override Task<ImmutableArray<TextChange>> ExecuteCoreAsync(FormattingContext context, RoslynWorkspaceHelper roslynWorkspaceHelper, ImmutableArray<TextChange> changes, CancellationToken cancellationToken)
     {
         // Apply previous edits if any.
@@ -96,14 +93,4 @@ private async Task<ImmutableArray<TextChange>> FormatCSharpAsync(FormattingConte
 
         return csharpChanges.ToImmutable();
     }
-
-    internal TestAccessor GetTestAccessor() => new TestAccessor(this);
-
-    internal readonly struct TestAccessor(CSharpFormattingPass instance)
-    {
-        public void SetCSharpSyntaxFormattingOptionsOverride(RazorCSharpSyntaxFormattingOptions? optionsOverride)
-        {
-            instance._csharpSyntaxFormattingOptionsOverride = optionsOverride;
-        }
-    }
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpFormattingPassBase.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpFormattingPassBase.cs
index 9e057bc4b0d..b4cb8697652 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpFormattingPassBase.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpFormattingPassBase.cs
@@ -13,6 +13,7 @@
 using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.Language.Syntax;
 using Microsoft.AspNetCore.Razor.PooledObjects;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
 using Microsoft.CodeAnalysis.Razor.Logging;
@@ -28,6 +29,8 @@ internal abstract partial class CSharpFormattingPassBase(IDocumentMappingService
 
     protected IDocumentMappingService DocumentMappingService { get; } = documentMappingService;
 
+    protected RazorCSharpSyntaxFormattingOptions? _csharpSyntaxFormattingOptionsOverride;
+
     public async Task<ImmutableArray<TextChange>> ExecuteAsync(FormattingContext context, ImmutableArray<TextChange> changes, CancellationToken cancellationToken)
     {
         using var roslynWorkspaceHelper = new RoslynWorkspaceHelper(hostServicesProvider);
@@ -164,7 +167,7 @@ owner.Parent is RazorDirectiveSyntax containingDirective &&
         }
 
         // Now, invoke the C# formatter to obtain the CSharpDesiredIndentation for all significant locations.
-        var significantLocationIndentation = await CSharpFormatter.GetCSharpIndentationAsync(context, significantLocations, hostWorkspaceServices, cancellationToken).ConfigureAwait(false);
+        var significantLocationIndentation = await CSharpFormatter.GetCSharpIndentationAsync(context, significantLocations, hostWorkspaceServices, _csharpSyntaxFormattingOptionsOverride, cancellationToken).ConfigureAwait(false);
 
         // Build source mapping indentation scopes.
         var sourceMappingIndentations = new SortedDictionary<int, IndentationData>();
@@ -695,4 +698,14 @@ public int GetIndentation(SortedDictionary<int, IndentationData> sourceMappingIn
             return _indentation;
         }
     }
+
+    internal TestAccessor GetTestAccessor() => new(this);
+
+    internal readonly struct TestAccessor(CSharpFormattingPassBase instance)
+    {
+        public void SetCSharpSyntaxFormattingOptionsOverride(RazorCSharpSyntaxFormattingOptions? optionsOverride)
+        {
+            instance._csharpSyntaxFormattingOptionsOverride = optionsOverride;
+        }
+    }
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpOnTypeFormattingPass.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpOnTypeFormattingPass.cs
index 616f6baaf8b..39ea901dbc6 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpOnTypeFormattingPass.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/Passes/CSharpOnTypeFormattingPass.cs
@@ -58,6 +58,7 @@ protected async override Task<ImmutableArray<TextChange>> ExecuteCoreAsync(Forma
                 context.Options.ToIndentationOptions(),
                 autoFormattingOptions,
                 indentStyle: CodeAnalysis.Formatting.FormattingOptions.IndentStyle.Smart,
+                _csharpSyntaxFormattingOptionsOverride,
                 cancellationToken).ConfigureAwait(false);
 
             if (formattingChanges.IsEmpty)
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/RazorFormattingService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/RazorFormattingService.cs
index bc44ebdca93..a5576e59816 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/RazorFormattingService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Formatting/RazorFormattingService.cs
@@ -404,6 +404,11 @@ public void SetCSharpSyntaxFormattingOptionsOverride(RazorCSharpSyntaxFormatting
                 pass.GetTestAccessor().SetCSharpSyntaxFormattingOptionsOverride(optionsOverride);
             }
 
+            if (service._documentFormattingPasses.OfType<CSharpOnTypeFormattingPass>().SingleOrDefault() is { } onTypePass)
+            {
+                onTypePass.GetTestAccessor().SetCSharpSyntaxFormattingOptionsOverride(optionsOverride);
+            }
+
             if (service._documentFormattingPasses.OfType<New.CSharpFormattingPass>().SingleOrDefault() is { } newPass)
             {
                 newPass.GetTestAccessor().SetCSharpSyntaxFormattingOptionsOverride(optionsOverride);

From 74889541eede3ccbd92162d51365fed800281438 Mon Sep 17 00:00:00 2001
From: David Wengier <david.wengier@microsoft.com>
Date: Tue, 17 Jun 2025 14:48:35 +1000
Subject: [PATCH 10/10] Move away from EditorFeatures

---
 .../LanguageServer/CSharpTestLspServerHelpers.cs   |  2 +-
 .../Mef/TestComposition.cs                         | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/LanguageServer/CSharpTestLspServerHelpers.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/LanguageServer/CSharpTestLspServerHelpers.cs
index 50ec6333e14..b9dd2ef08bb 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/LanguageServer/CSharpTestLspServerHelpers.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/LanguageServer/CSharpTestLspServerHelpers.cs
@@ -58,7 +58,7 @@ public static async Task<CSharpTestLspServer> CreateCSharpLspServerAsync(
     {
         var csharpFiles = files.Select(f => new CSharpFile(f.Uri, f.SourceText));
 
-        var exportProvider = TestComposition.Roslyn
+        var exportProvider = TestComposition.RoslynFeatures
             .AddParts(typeof(RazorTestLanguageServerFactory))
             .ExportProviderFactory.CreateExportProvider();
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Mef/TestComposition.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Mef/TestComposition.cs
index 82cb60cf553..e7f1c8a95c1 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Mef/TestComposition.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/Mef/TestComposition.cs
@@ -23,25 +23,25 @@ public sealed partial class TestComposition
         ImmutableHashSet<Type>.Empty,
         ImmutableHashSet<Type>.Empty);
 
-    public static readonly TestComposition Roslyn = Empty
+    public static readonly TestComposition RoslynFeatures = Empty
         .AddAssemblies(MefHostServices.DefaultAssemblies)
         .AddAssemblies(Assembly.LoadFrom("Microsoft.CodeAnalysis.dll"))
-        .AddAssemblies(Assembly.LoadFrom("Microsoft.CodeAnalysis.CSharp.EditorFeatures.dll"))
-        .AddAssemblies(Assembly.LoadFrom("Microsoft.CodeAnalysis.EditorFeatures.dll"))
+        .AddAssemblies(Assembly.LoadFrom("Microsoft.CodeAnalysis.CSharp.Features.dll"))
+        .AddAssemblies(Assembly.LoadFrom("Microsoft.CodeAnalysis.Features.dll"))
         .AddAssemblies(Assembly.LoadFrom("Microsoft.CodeAnalysis.ExternalAccess.Razor.Features.dll"))
         .AddAssemblies(Assembly.LoadFrom("Microsoft.CodeAnalysis.LanguageServer.Protocol.dll"))
         .AddParts(typeof(RazorTestWorkspaceRegistrationService));
 
-    public static readonly TestComposition RoslynFeatures = Empty
+#if NETFRAMEWORK
+    public static readonly TestComposition Roslyn = Empty
         .AddAssemblies(MefHostServices.DefaultAssemblies)
         .AddAssemblies(Assembly.LoadFrom("Microsoft.CodeAnalysis.dll"))
-        .AddAssemblies(Assembly.LoadFrom("Microsoft.CodeAnalysis.CSharp.Features.dll"))
-        .AddAssemblies(Assembly.LoadFrom("Microsoft.CodeAnalysis.Features.dll"))
+        .AddAssemblies(Assembly.LoadFrom("Microsoft.CodeAnalysis.CSharp.EditorFeatures.dll"))
+        .AddAssemblies(Assembly.LoadFrom("Microsoft.CodeAnalysis.EditorFeatures.dll"))
         .AddAssemblies(Assembly.LoadFrom("Microsoft.CodeAnalysis.ExternalAccess.Razor.Features.dll"))
         .AddAssemblies(Assembly.LoadFrom("Microsoft.CodeAnalysis.LanguageServer.Protocol.dll"))
         .AddParts(typeof(RazorTestWorkspaceRegistrationService));
 
-#if NETFRAMEWORK
     public static readonly TestComposition Editor = Empty
         .AddAssemblies(Assembly.LoadFrom("Microsoft.VisualStudio.Text.Implementation.dll"))
         .AddParts(typeof(TestExportJoinableTaskContext));