diff --git a/Directory.Build.props b/Directory.Build.props
index d2e322d1332..69a3cd1524c 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -26,6 +26,7 @@
     <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
     <EnableWindowsTargeting Condition="'$(DotNetBuildFromSource)' != 'true'">true</EnableWindowsTargeting>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
 
     <SharedSourceRoot>$(MSBuildThisFileDirectory)src\Shared\</SharedSourceRoot>
 
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 2c7e57038aa..86b4aa1bca0 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -16,7 +16,7 @@
     <_MicrosoftCodeAnalysisAnalyzersPackageVersion>3.11.0-beta1.24170.2</_MicrosoftCodeAnalysisAnalyzersPackageVersion>
     <_MicrosoftVisualStudioLanguageServicesPackageVersion>$(MicrosoftVisualStudioLanguageServicesPackageVersion)</_MicrosoftVisualStudioLanguageServicesPackageVersion>
     <_XunitPackageVersion>2.6.3</_XunitPackageVersion>
-    <_MicrosoftBuildPackageVersion>17.3.0-preview-22364-05</_MicrosoftBuildPackageVersion>
+    <_MicrosoftBuildPackageVersion>17.11.0-preview-24309-01</_MicrosoftBuildPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -89,7 +89,7 @@
     <PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.11.8" />
     <PackageVersion Include="Microsoft.VisualStudio.Shell.Framework" Version="$(_MicrosoftVisualStudioShellPackagesVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="$(_MicrosoftVisualStudioShellPackagesVersion)" />
-    <PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.9.102" />
+    <PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.11.8" />
     <PackageVersion Include="Microsoft.VisualStudio.Text.Data" Version="$(_MicrosoftVisualStudioPackagesVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.Text.Implementation" Version="$(_MicrosoftVisualStudioPackagesVersion)" NoWarn="NU1701" />
     <PackageVersion Include="Microsoft.VisualStudio.Text.Logic" Version="$(_MicrosoftVisualStudioPackagesVersion)" />
@@ -109,13 +109,13 @@
     <PackageVersion Include="NuGet.VisualStudio" Version="17.9.1" />
     <PackageVersion Include="Roslyn.Diagnostics.Analyzers" Version="$(_MicrosoftCodeAnalysisAnalyzersPackageVersion)" />
     <PackageVersion Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutablePackageVersion)" />
-    <PackageVersion Include="System.Resources.Extensions" Version="6.0.0" />
-    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
+    <PackageVersion Include="System.Resources.Extensions" Version="8.0.0" />
+    <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
     <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
     <PackageVersion Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataPackageVersion)" />
     <PackageVersion Include="System.Security.Cryptography.Xml" Version="7.0.1" />
     <PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
-    <PackageVersion Include="System.Text.Json" Version="6.0.0" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.4" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
     <PackageVersion Include="xunit" Version="$(_XunitPackageVersion)" />
     <PackageVersion Include="Xunit.Combinatorial" Version="1.5.25" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 11bb619b856..88ed2343575 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -11,82 +11,82 @@
       <Sha>9ae78a4e6412926d19ba97cfed159bf9de70b538</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-1.24366.6">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.12.0-1.24379.11">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
+      <Sha>cf82d399c36008e7936d545cde24141f8d3790fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.12.0-1.24366.6">
+    <Dependency Name="Microsoft.CommonLanguageServerProtocol.Framework" Version="4.12.0-1.24379.11">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
+      <Sha>cf82d399c36008e7936d545cde24141f8d3790fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor" Version="4.12.0-1.24366.6">
+    <Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.Razor" Version="4.12.0-1.24379.11">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
+      <Sha>cf82d399c36008e7936d545cde24141f8d3790fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.12.0-1.24366.6">
+    <Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.12.0-1.24379.11">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
+      <Sha>cf82d399c36008e7936d545cde24141f8d3790fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-1.24366.6">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.12.0-1.24379.11">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
+      <Sha>cf82d399c36008e7936d545cde24141f8d3790fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="4.12.0-1.24366.6">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.EditorFeatures" Version="4.12.0-1.24379.11">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
+      <Sha>cf82d399c36008e7936d545cde24141f8d3790fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-1.24366.6">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.12.0-1.24379.11">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
+      <Sha>cf82d399c36008e7936d545cde24141f8d3790fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-1.24366.6">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0-1.24379.11">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
+      <Sha>cf82d399c36008e7936d545cde24141f8d3790fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="4.12.0-1.24366.6">
+    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="4.12.0-1.24379.11">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
+      <Sha>cf82d399c36008e7936d545cde24141f8d3790fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="4.12.0-1.24366.6">
+    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Common" Version="4.12.0-1.24379.11">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
+      <Sha>cf82d399c36008e7936d545cde24141f8d3790fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="4.12.0-1.24366.6">
+    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="4.12.0-1.24379.11">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
+      <Sha>cf82d399c36008e7936d545cde24141f8d3790fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="4.12.0-1.24366.6">
+    <Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="4.12.0-1.24379.11">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
+      <Sha>cf82d399c36008e7936d545cde24141f8d3790fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="4.12.0-1.24366.6">
+    <Dependency Name="Microsoft.CodeAnalysis.Remote.ServiceHub" Version="4.12.0-1.24379.11">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
+      <Sha>cf82d399c36008e7936d545cde24141f8d3790fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.12.0-1.24366.6">
+    <Dependency Name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" Version="4.12.0-1.24379.11">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
+      <Sha>cf82d399c36008e7936d545cde24141f8d3790fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.12.0-1.24366.6">
+    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.Common" Version="4.12.0-1.24379.11">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
+      <Sha>cf82d399c36008e7936d545cde24141f8d3790fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-1.24366.6">
+    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.12.0-1.24379.11">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
+      <Sha>cf82d399c36008e7936d545cde24141f8d3790fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="4.12.0-1.24366.6">
+    <Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="4.12.0-1.24379.11">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
+      <Sha>cf82d399c36008e7936d545cde24141f8d3790fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="4.12.0-1.24366.6">
+    <Dependency Name="Microsoft.CodeAnalysis.Test.Utilities" Version="4.12.0-1.24379.11">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
+      <Sha>cf82d399c36008e7936d545cde24141f8d3790fa</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-1.24366.6">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn" Version="4.12.0-1.24379.11">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>30edd04fd41dec9e8f9f48e698ebd5b80d9f7677</Sha>
+      <Sha>cf82d399c36008e7936d545cde24141f8d3790fa</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
   </ProductDependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 6aa6e7cad14..17f66d15c16 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -30,7 +30,7 @@
     imported. This OK because we want to just have an obvious salt for a local build.
   -->
   <PropertyGroup>
-    <VsixVersionPrefix>17.12.1</VsixVersionPrefix>
+    <VsixVersionPrefix>17.12.2</VsixVersionPrefix>
     <AddinMajorVersion>17.12</AddinMajorVersion>
     <AddinVersion>$(AddinMajorVersion)</AddinVersion>
     <AddinVersion Condition="'$(OfficialBuildId)' != ''">$(AddinVersion).$(OfficialBuildId)</AddinVersion>
@@ -53,25 +53,25 @@
     <MicrosoftSourceBuildIntermediatearcadePackageVersion>9.0.0-beta.24352.2</MicrosoftSourceBuildIntermediatearcadePackageVersion>
     <MicrosoftDotNetXliffTasksPackageVersion>1.0.0-beta.23475.1</MicrosoftDotNetXliffTasksPackageVersion>
     <MicrosoftSourceBuildIntermediatexlifftasksPackageVersion>1.0.0-beta.23475.1</MicrosoftSourceBuildIntermediatexlifftasksPackageVersion>
-    <MicrosoftNetCompilersToolsetPackageVersion>4.12.0-1.24366.6</MicrosoftNetCompilersToolsetPackageVersion>
-    <MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.12.0-1.24366.6</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
-    <MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
-    <MicrosoftCodeAnalysisCommonPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisCommonPackageVersion>
-    <MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisCSharpPackageVersion>
-    <MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
-    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
-    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
-    <MicrosoftCodeAnalysisEditorFeaturesPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
-    <MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
-    <MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
-    <MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
-    <MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
-    <MicrosoftCodeAnalysisTestUtilitiesPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
-    <MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
-    <MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
-    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-1.24366.6</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
-    <MicrosoftSourceBuildIntermediateroslynPackageVersion>4.12.0-1.24366.6</MicrosoftSourceBuildIntermediateroslynPackageVersion>
-    <MicrosoftVisualStudioLanguageServicesPackageVersion>4.12.0-1.24366.6</MicrosoftVisualStudioLanguageServicesPackageVersion>
+    <MicrosoftNetCompilersToolsetPackageVersion>4.12.0-1.24379.11</MicrosoftNetCompilersToolsetPackageVersion>
+    <MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>4.12.0-1.24379.11</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
+    <MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>4.12.0-1.24379.11</MicrosoftCodeAnalysisExternalAccessRazorPackageVersion>
+    <MicrosoftCodeAnalysisCommonPackageVersion>4.12.0-1.24379.11</MicrosoftCodeAnalysisCommonPackageVersion>
+    <MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-1.24379.11</MicrosoftCodeAnalysisCSharpPackageVersion>
+    <MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>4.12.0-1.24379.11</MicrosoftCodeAnalysisCSharpEditorFeaturesPackageVersion>
+    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-1.24379.11</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
+    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-1.24379.11</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
+    <MicrosoftCodeAnalysisEditorFeaturesPackageVersion>4.12.0-1.24379.11</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
+    <MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>4.12.0-1.24379.11</MicrosoftCodeAnalysisEditorFeaturesCommonPackageVersion>
+    <MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>4.12.0-1.24379.11</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
+    <MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>4.12.0-1.24379.11</MicrosoftCodeAnalysisEditorFeaturesWpfPackageVersion>
+    <MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>4.12.0-1.24379.11</MicrosoftCodeAnalysisRemoteServiceHubPackageVersion>
+    <MicrosoftCodeAnalysisTestUtilitiesPackageVersion>4.12.0-1.24379.11</MicrosoftCodeAnalysisTestUtilitiesPackageVersion>
+    <MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>4.12.0-1.24379.11</MicrosoftCodeAnalysisVisualBasicWorkspacesPackageVersion>
+    <MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>4.12.0-1.24379.11</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
+    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-1.24379.11</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
+    <MicrosoftSourceBuildIntermediateroslynPackageVersion>4.12.0-1.24379.11</MicrosoftSourceBuildIntermediateroslynPackageVersion>
+    <MicrosoftVisualStudioLanguageServicesPackageVersion>4.12.0-1.24379.11</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.
diff --git a/eng/config/PublishData.json b/eng/config/PublishData.json
index beb8ad1ffff..0430b2b4e1f 100644
--- a/eng/config/PublishData.json
+++ b/eng/config/PublishData.json
@@ -29,16 +29,7 @@
       "vsBranch": "main",
       "vsMajorVersion": 17,
       "insertionCreateDraftPR": false,
-      "insertionTitlePrefix": "[d17.12 P1]"
-    },
-    "release/dev17.5": {
-      "nugetKind": [
-        "Shipping",
-        "NonShipping"
-      ],
-      "vsBranch": "rel/d17.5",
-      "vsMajorVersion": 17,
-      "insertionTitlePrefix": "[17.5]"
+      "insertionTitlePrefix": "[d17.12 P2]"
     },
     "release/dev17.6": {
       "nugetKind": [
@@ -95,6 +86,16 @@
       "vsMajorVersion": 17,
       "insertionCreateDraftPR": false,
       "insertionTitlePrefix": "[17.11]"
+    },
+    "release/dev17.12": {
+      "nugetKind": [
+        "Shipping",
+        "NonShipping"
+      ],
+      "vsBranch": "rel/d17.12",
+      "vsMajorVersion": 17,
+      "insertionCreateDraftPR": false,
+      "insertionTitlePrefix": "[d17.12 P1]"
     }
   }
 }
diff --git a/eng/targets/Services.props b/eng/targets/Services.props
index ede89dc2165..747b8e2a392 100644
--- a/eng/targets/Services.props
+++ b/eng/targets/Services.props
@@ -24,5 +24,6 @@
     <ServiceHubService Include="Microsoft.VisualStudio.Razor.FoldingRange" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteFoldingRangeService+Factory" />
     <ServiceHubService Include="Microsoft.VisualStudio.Razor.SignatureHelp" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteSignatureHelpService+Factory" />
     <ServiceHubService Include="Microsoft.VisualStudio.Razor.DocumentHighlight" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteDocumentHighlightService+Factory" />
+    <ServiceHubService Include="Microsoft.VisualStudio.Razor.InlayHint" ClassName="Microsoft.CodeAnalysis.Remote.Razor.RemoteInlayHintService+Factory" />
   </ItemGroup>
 </Project>
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorProviderTest.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorProviderTest.cs
index 6374829f5eb..b79da5d4bf9 100644
--- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorProviderTest.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ViewComponentTagHelperDescriptorProviderTest.cs
@@ -6,7 +6,6 @@
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.Razor;
 using Xunit;
 using static Microsoft.AspNetCore.Razor.Language.CommonMetadata;
 
@@ -28,8 +27,7 @@ public class StringParameterViewComponent
 
         var compilation = MvcShim.BaseCompilation.AddSyntaxTrees(CSharpSyntaxTree.ParseText(code));
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
+        var context = new TagHelperDescriptorProviderContext(compilation);
 
         var provider = new ViewComponentTagHelperDescriptorProvider()
         {
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperDescriptorProviderTest.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperDescriptorProviderTest.cs
index 228dbee93cb..8776cd20f16 100644
--- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperDescriptorProviderTest.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ViewComponentTagHelperDescriptorProviderTest.cs
@@ -6,7 +6,6 @@
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.Razor;
 using Xunit;
 using static Microsoft.AspNetCore.Razor.Language.CommonMetadata;
 
@@ -28,8 +27,7 @@ public class StringParameterViewComponent
 
         var compilation = MvcShim.BaseCompilation.AddSyntaxTrees(CSharpSyntaxTree.ParseText(code));
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
+        var context = new TagHelperDescriptorProviderContext(compilation);
 
         var provider = new ViewComponentTagHelperDescriptorProvider()
         {
diff --git a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorProviderTest.cs b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorProviderTest.cs
index 11de487c208..e4712707c84 100644
--- a/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorProviderTest.cs
+++ b/src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperDescriptorProviderTest.cs
@@ -6,7 +6,6 @@
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.Razor;
 using Xunit;
 using static Microsoft.AspNetCore.Razor.Language.CommonMetadata;
 
@@ -28,8 +27,7 @@ public class StringParameterViewComponent
 
         var compilation = MvcShim.BaseCompilation.AddSyntaxTrees(CSharpSyntaxTree.ParseText(code));
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
+        var context = new TagHelperDescriptorProviderContext(compilation);
 
         var provider = new ViewComponentTagHelperDescriptorProvider()
         {
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/legacyTest/Microsoft.AspNetCore.Razor.Language.Legacy.Test.csproj b/src/Compiler/Microsoft.AspNetCore.Razor.Language/legacyTest/Microsoft.AspNetCore.Razor.Language.Legacy.Test.csproj
index 7b16714b910..160c21c8ca7 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/legacyTest/Microsoft.AspNetCore.Razor.Language.Legacy.Test.csproj
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/legacyTest/Microsoft.AspNetCore.Razor.Language.Legacy.Test.csproj
@@ -21,6 +21,9 @@
 
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="Moq" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" VersionOverride="$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" VersionOverride="$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" VersionOverride="$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj
index f60fafca607..c0579b84329 100644
--- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj
+++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj
@@ -21,6 +21,9 @@
 
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="Moq" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" VersionOverride="$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" VersionOverride="$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" VersionOverride="$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/BindTagHelperDescriptorProvider.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/BindTagHelperDescriptorProvider.cs
index d806c859e57..e2c3d9f77c5 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/BindTagHelperDescriptorProvider.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/BindTagHelperDescriptorProvider.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Components;
 using Microsoft.AspNetCore.Razor.PooledObjects;
@@ -12,21 +13,14 @@
 
 namespace Microsoft.CodeAnalysis.Razor;
 
-internal class BindTagHelperDescriptorProvider : ITagHelperDescriptorProvider
+// Run after the component tag helper provider, because we need to see the results.
+internal sealed class BindTagHelperDescriptorProvider() : TagHelperDescriptorProviderBase(order: 1000)
 {
-    private static TagHelperDescriptor? s_fallbackBindTagHelper;
+    private static readonly Lazy<TagHelperDescriptor> s_fallbackBindTagHelper = new(CreateFallbackBindTagHelper);
 
-    // Run after the component tag helper provider, because we need to see the results.
-    public int Order { get; set; } = 1000;
-
-    public RazorEngine? Engine { get; set; }
-
-    public void Execute(TagHelperDescriptorProviderContext context)
+    public override void Execute(TagHelperDescriptorProviderContext context)
     {
-        if (context == null)
-        {
-            throw new ArgumentNullException(nameof(context));
-        }
+        ArgHelper.ThrowIfNull(context);
 
         // This provider returns tag helper information for 'bind' which doesn't necessarily
         // map to any real component. Bind behaviors more like a macro, which can map a single LValue to
@@ -91,11 +85,7 @@ public void Execute(TagHelperDescriptorProviderContext context)
         // we have. Case #4 is data-driven based on component definitions.
         //
         // We provide a good set of attributes that map to the HTML dom. This set is user extensible.
-        var compilation = context.GetCompilation();
-        if (compilation == null)
-        {
-            return;
-        }
+        var compilation = context.Compilation;
 
         var bindMethods = compilation.GetTypeByMetadataName(ComponentsApi.BindConverter.FullTypeName);
         if (bindMethods == null)
@@ -105,14 +95,13 @@ public void Execute(TagHelperDescriptorProviderContext context)
             return;
         }
 
-        var targetSymbol = context.Items.GetTargetSymbol();
-        if (targetSymbol is not null && !SymbolEqualityComparer.Default.Equals(targetSymbol, bindMethods.ContainingAssembly))
+        if (context.TargetSymbol is { } targetSymbol && !SymbolEqualityComparer.Default.Equals(targetSymbol, bindMethods.ContainingAssembly))
         {
             return;
         }
 
         // Tag Helper definition for case #1. This is the most general case.
-        context.Results.Add(GetOrCreateFallbackBindTagHelper());
+        context.Results.Add(s_fallbackBindTagHelper.Value);
 
         var bindElementAttribute = compilation.GetTypeByMetadataName(ComponentsApi.BindElementAttribute.FullTypeName);
         var bindInputElementAttribute = compilation.GetTypeByMetadataName(ComponentsApi.BindInputElementAttribute.FullTypeName);
@@ -129,112 +118,107 @@ public void Execute(TagHelperDescriptorProviderContext context)
         collector.Collect(context);
     }
 
-    private static TagHelperDescriptor GetOrCreateFallbackBindTagHelper()
+    private static TagHelperDescriptor CreateFallbackBindTagHelper()
     {
-        return s_fallbackBindTagHelper ??= CreateFallbackBindTagHelper();
-
-        static TagHelperDescriptor CreateFallbackBindTagHelper()
+        using var _ = TagHelperDescriptorBuilder.GetPooledInstance(
+            ComponentMetadata.Bind.TagHelperKind, "Bind", ComponentsApi.AssemblyName,
+            out var builder);
+
+        builder.CaseSensitive = true;
+        builder.SetDocumentation(DocumentationDescriptor.BindTagHelper_Fallback);
+
+        builder.SetMetadata(
+            SpecialKind(ComponentMetadata.Bind.TagHelperKind),
+            MakeTrue(TagHelperMetadata.Common.ClassifyAttributesOnly),
+            RuntimeName(ComponentMetadata.Bind.RuntimeName),
+            MakeTrue(ComponentMetadata.Bind.FallbackKey),
+            TypeName("Microsoft.AspNetCore.Components.Bind"),
+            TypeNamespace("Microsoft.AspNetCore.Components"),
+            TypeNameIdentifier("Bind"));
+
+        builder.TagMatchingRule(rule =>
         {
-            using var _ = TagHelperDescriptorBuilder.GetPooledInstance(
-                ComponentMetadata.Bind.TagHelperKind, "Bind", ComponentsApi.AssemblyName,
-                out var builder);
-
-            builder.CaseSensitive = true;
-            builder.SetDocumentation(DocumentationDescriptor.BindTagHelper_Fallback);
-
-            builder.SetMetadata(
-                SpecialKind(ComponentMetadata.Bind.TagHelperKind),
-                MakeTrue(TagHelperMetadata.Common.ClassifyAttributesOnly),
-                RuntimeName(ComponentMetadata.Bind.RuntimeName),
-                MakeTrue(ComponentMetadata.Bind.FallbackKey),
-                TypeName("Microsoft.AspNetCore.Components.Bind"),
-                TypeNamespace("Microsoft.AspNetCore.Components"),
-                TypeNameIdentifier("Bind"));
-
-            builder.TagMatchingRule(rule =>
+            rule.TagName = "*";
+            rule.Attribute(attribute =>
             {
-                rule.TagName = "*";
-                rule.Attribute(attribute =>
-                {
-                    attribute.Name = "@bind-";
-                    attribute.NameComparisonMode = RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch;
-                    attribute.SetMetadata(Attributes.IsDirectiveAttribute);
-                });
+                attribute.Name = "@bind-";
+                attribute.NameComparisonMode = RequiredAttributeDescriptor.NameComparisonMode.PrefixMatch;
+                attribute.SetMetadata(Attributes.IsDirectiveAttribute);
             });
+        });
 
-            builder.BindAttribute(attribute =>
-            {
-                attribute.SetDocumentation(DocumentationDescriptor.BindTagHelper_Fallback);
+        builder.BindAttribute(attribute =>
+        {
+            attribute.SetDocumentation(DocumentationDescriptor.BindTagHelper_Fallback);
 
-                var attributeName = "@bind-...";
-                attribute.Name = attributeName;
-                attribute.AsDictionary("@bind-", typeof(object).FullName);
+            var attributeName = "@bind-...";
+            attribute.Name = attributeName;
+            attribute.AsDictionary("@bind-", typeof(object).FullName);
 
-                attribute.SetMetadata(
-                    PropertyName("Bind"),
-                    IsDirectiveAttribute);
+            attribute.SetMetadata(
+                PropertyName("Bind"),
+                IsDirectiveAttribute);
 
-                attribute.TypeName = "System.Collections.Generic.Dictionary<string, object>";
+            attribute.TypeName = "System.Collections.Generic.Dictionary<string, object>";
 
-                attribute.BindAttributeParameter(parameter =>
-                {
-                    parameter.Name = "format";
-                    parameter.TypeName = typeof(string).FullName;
-                    parameter.SetDocumentation(DocumentationDescriptor.BindTagHelper_Fallback_Format);
+            attribute.BindAttributeParameter(parameter =>
+            {
+                parameter.Name = "format";
+                parameter.TypeName = typeof(string).FullName;
+                parameter.SetDocumentation(DocumentationDescriptor.BindTagHelper_Fallback_Format);
 
-                    parameter.SetMetadata(Parameters.Format);
-                });
+                parameter.SetMetadata(Parameters.Format);
+            });
 
-                attribute.BindAttributeParameter(parameter =>
-                {
-                    parameter.Name = "event";
-                    parameter.TypeName = typeof(string).FullName;
-                    parameter.SetDocumentation(
-                        DocumentationDescriptor.From(
-                            DocumentationId.BindTagHelper_Fallback_Event, attributeName));
+            attribute.BindAttributeParameter(parameter =>
+            {
+                parameter.Name = "event";
+                parameter.TypeName = typeof(string).FullName;
+                parameter.SetDocumentation(
+                    DocumentationDescriptor.From(
+                        DocumentationId.BindTagHelper_Fallback_Event, attributeName));
 
-                    parameter.SetMetadata(Parameters.Event);
-                });
+                parameter.SetMetadata(Parameters.Event);
+            });
 
-                attribute.BindAttributeParameter(parameter =>
-                {
-                    parameter.Name = "culture";
-                    parameter.TypeName = typeof(CultureInfo).FullName;
-                    parameter.SetDocumentation(DocumentationDescriptor.BindTagHelper_Element_Culture);
+            attribute.BindAttributeParameter(parameter =>
+            {
+                parameter.Name = "culture";
+                parameter.TypeName = typeof(CultureInfo).FullName;
+                parameter.SetDocumentation(DocumentationDescriptor.BindTagHelper_Element_Culture);
 
-                    parameter.SetMetadata(Parameters.Culture);
-                });
+                parameter.SetMetadata(Parameters.Culture);
+            });
 
-                attribute.BindAttributeParameter(parameter =>
-                {
-                    parameter.Name = "get";
-                    parameter.TypeName = typeof(object).FullName;
-                    parameter.SetDocumentation(DocumentationDescriptor.BindTagHelper_Element_Get);
+            attribute.BindAttributeParameter(parameter =>
+            {
+                parameter.Name = "get";
+                parameter.TypeName = typeof(object).FullName;
+                parameter.SetDocumentation(DocumentationDescriptor.BindTagHelper_Element_Get);
 
-                    parameter.SetMetadata(Parameters.Get);
-                });
+                parameter.SetMetadata(Parameters.Get);
+            });
 
-                attribute.BindAttributeParameter(parameter =>
-                {
-                    parameter.Name = "set";
-                    parameter.TypeName = typeof(Delegate).FullName;
-                    parameter.SetDocumentation(DocumentationDescriptor.BindTagHelper_Element_Set);
+            attribute.BindAttributeParameter(parameter =>
+            {
+                parameter.Name = "set";
+                parameter.TypeName = typeof(Delegate).FullName;
+                parameter.SetDocumentation(DocumentationDescriptor.BindTagHelper_Element_Set);
 
-                    parameter.SetMetadata(Parameters.Set);
-                });
+                parameter.SetMetadata(Parameters.Set);
+            });
 
-                attribute.BindAttributeParameter(parameter =>
-                {
-                    parameter.Name = "after";
-                    parameter.TypeName = typeof(Delegate).FullName;
-                    parameter.SetDocumentation(DocumentationDescriptor.BindTagHelper_Element_After);
+            attribute.BindAttributeParameter(parameter =>
+            {
+                parameter.Name = "after";
+                parameter.TypeName = typeof(Delegate).FullName;
+                parameter.SetDocumentation(DocumentationDescriptor.BindTagHelper_Element_After);
 
-                    parameter.SetMetadata(Parameters.After);
-                });
+                parameter.SetMetadata(Parameters.After);
             });
+        });
 
-            return builder.Build();
-        }
+        return builder.Build();
     }
 
     private class Collector(
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/CompilationTagHelperFeature.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/CompilationTagHelperFeature.cs
index 09ca7e652ef..cfa7f57f20b 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/CompilationTagHelperFeature.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/CompilationTagHelperFeature.cs
@@ -17,15 +17,15 @@ public sealed class CompilationTagHelperFeature : RazorEngineFeatureBase, ITagHe
 
     public IReadOnlyList<TagHelperDescriptor> GetDescriptors()
     {
-        var results = new List<TagHelperDescriptor>();
-
-        var context = TagHelperDescriptorProviderContext.Create(results);
         var compilation = CSharpCompilation.Create("__TagHelpers", references: _referenceFeature.References);
-        if (IsValidCompilation(compilation))
+        if (!IsValidCompilation(compilation))
         {
-            context.SetCompilation(compilation);
+            return [];
         }
 
+        var results = new List<TagHelperDescriptor>();
+        var context = new TagHelperDescriptorProviderContext(compilation, results);
+
         for (var i = 0; i < _providers.Length; i++)
         {
             _providers[i].Execute(context);
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/ComponentTagHelperDescriptorProvider.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/ComponentTagHelperDescriptorProvider.cs
index 55c244c0500..99c6e5e6943 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/ComponentTagHelperDescriptorProvider.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/ComponentTagHelperDescriptorProvider.cs
@@ -1,53 +1,38 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Components;
-using Microsoft.AspNetCore.Razor.Language.Extensions;
 using Microsoft.AspNetCore.Razor.PooledObjects;
 using static Microsoft.AspNetCore.Razor.Language.CommonMetadata;
 
 namespace Microsoft.CodeAnalysis.Razor;
 
-internal partial class ComponentTagHelperDescriptorProvider : RazorEngineFeatureBase, ITagHelperDescriptorProvider
+internal sealed class ComponentTagHelperDescriptorProvider : TagHelperDescriptorProviderBase
 {
     private static readonly SymbolDisplayFormat GloballyQualifiedFullNameTypeDisplayFormat =
         SymbolDisplayFormat.FullyQualifiedFormat
             .WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Included)
             .WithMiscellaneousOptions(SymbolDisplayFormat.FullyQualifiedFormat.MiscellaneousOptions & (~SymbolDisplayMiscellaneousOptions.UseSpecialTypes));
 
-    public bool IncludeDocumentation { get; set; }
-
-    public int Order { get; set; }
-
-    public void Execute(TagHelperDescriptorProviderContext context)
+    public override void Execute(TagHelperDescriptorProviderContext context)
     {
-        if (context == null)
-        {
-            throw new ArgumentNullException(nameof(context));
-        }
+        ArgHelper.ThrowIfNull(context);
 
-        var compilation = context.GetCompilation();
-        if (compilation == null)
-        {
-            // No compilation, nothing to do.
-            return;
-        }
-
-        var targetSymbol = context.Items.GetTargetSymbol();
+        var compilation = context.Compilation;
+        var targetSymbol = context.TargetSymbol;
 
         var collector = new Collector(compilation, targetSymbol);
         collector.Collect(context);
     }
 
-    private sealed class Collector(Compilation compilation, ISymbol targetSymbol)
+    private sealed class Collector(Compilation compilation, ISymbol? targetSymbol)
         : TagHelperCollector<Collector>(compilation, targetSymbol)
     {
         protected override void Collect(ISymbol symbol, ICollection<TagHelperDescriptor> results)
@@ -143,7 +128,7 @@ private static TagHelperDescriptor CreateNameMatchingDescriptor(
 
                 foreach (var attribute in type.GetAttributes())
                 {
-                    if (attribute.AttributeClass.HasFullName(ComponentsApi.CascadingTypeParameterAttribute.MetadataName) &&
+                    if (attribute.HasFullName(ComponentsApi.CascadingTypeParameterAttribute.MetadataName) &&
                         attribute.ConstructorArguments.FirstOrDefault() is { Value: string value })
                     {
                         cascadeGenericTypeAttributes.Add(value);
@@ -205,7 +190,7 @@ private static void CreateProperty(TagHelperDescriptorBuilder builder, INamedTyp
                 pb.ContainingType = containingSymbol.ToDisplayString(SymbolExtensions.FullNameTypeDisplayFormat);
                 pb.TypeName = property.Type.ToDisplayString(SymbolExtensions.FullNameTypeDisplayFormat);
                 pb.IsEditorRequired = property.GetAttributes().Any(
-                    static a => a.AttributeClass.HasFullName("Microsoft.AspNetCore.Components.EditorRequiredAttribute"));
+                    static a => a.HasFullName("Microsoft.AspNetCore.Components.EditorRequiredAttribute"));
 
                 pb.CaseSensitive = false;
 
@@ -238,7 +223,7 @@ private static void CreateProperty(TagHelperDescriptorBuilder builder, INamedTyp
                     metadata.Add(MakeTrue(ComponentMetadata.Component.GenericTypedKey));
                 }
 
-                if (property.SetMethod.IsInitOnly)
+                if (property.SetMethod.AssumeNotNull().IsInitOnly)
                 {
                     metadata.Add(MakeTrue(ComponentMetadata.Component.InitOnlyProperty));
                 }
@@ -300,101 +285,98 @@ static bool HasTypeParameter(ITypeSymbol type)
 
         private static string IsAwaitable(IPropertySymbol prop)
         {
-            var methodSymbol = ((INamedTypeSymbol)prop.Type).DelegateInvokeMethod;
+            var methodSymbol = ((INamedTypeSymbol)prop.Type).DelegateInvokeMethod.AssumeNotNull();
             if (methodSymbol.ReturnsVoid)
             {
                 return bool.FalseString;
             }
-            else
+
+            var members = methodSymbol.ReturnType.GetMembers();
+            foreach (var candidate in members)
             {
-                var members = methodSymbol.ReturnType.GetMembers();
-                foreach (var candidate in members)
+                if (candidate is not IMethodSymbol method || !string.Equals(candidate.Name, "GetAwaiter", StringComparison.Ordinal))
                 {
-                    if (candidate is not IMethodSymbol method || !string.Equals(candidate.Name, "GetAwaiter", StringComparison.Ordinal))
-                    {
-                        continue;
-                    }
+                    continue;
+                }
 
-                    if (!VerifyGetAwaiter(method))
-                    {
-                        continue;
-                    }
+                if (!VerifyGetAwaiter(method))
+                {
+                    continue;
+                }
 
-                    return bool.TrueString;
+                return bool.TrueString;
+            }
+
+            return methodSymbol.IsAsync ? bool.TrueString : bool.FalseString;
+
+            static bool VerifyGetAwaiter(IMethodSymbol getAwaiter)
+            {
+                var returnType = getAwaiter.ReturnType;
+                if (returnType == null)
+                {
+                    return false;
                 }
 
-                return methodSymbol.IsAsync ? bool.TrueString : bool.FalseString;
+                var foundIsCompleted = false;
+                var foundOnCompleted = false;
+                var foundGetResult = false;
 
-                static bool VerifyGetAwaiter(IMethodSymbol getAwaiter)
+                foreach (var member in returnType.GetMembers())
                 {
-                    var returnType = getAwaiter.ReturnType;
-                    if (returnType == null)
+                    if (!foundIsCompleted &&
+                        member is IPropertySymbol property &&
+                        IsProperty_IsCompleted(property))
                     {
-                        return false;
+                        foundIsCompleted = true;
                     }
 
-
-                    var foundIsCompleted = false;
-                    var foundOnCompleted = false;
-                    var foundGetResult = false;
-
-                    foreach (var member in returnType.GetMembers())
+                    if (!(foundOnCompleted && foundGetResult) && member is IMethodSymbol method)
                     {
-                        if (!foundIsCompleted &&
-                            member is IPropertySymbol property &&
-                            IsProperty_IsCompleted(property))
+                        if (IsMethod_OnCompleted(method))
                         {
-                            foundIsCompleted = true;
+                            foundOnCompleted = true;
                         }
-
-                        if (!(foundOnCompleted && foundGetResult) && member is IMethodSymbol method)
+                        else if (IsMethod_GetResult(method))
                         {
-                            if (IsMethod_OnCompleted(method))
-                            {
-                                foundOnCompleted = true;
-                            }
-                            else if (IsMethod_GetResult(method))
-                            {
-                                foundGetResult = true;
-                            }
+                            foundGetResult = true;
                         }
+                    }
 
-                        if (foundIsCompleted && foundOnCompleted && foundGetResult)
-                        {
-                            return true;
-                        }
+                    if (foundIsCompleted && foundOnCompleted && foundGetResult)
+                    {
+                        return true;
                     }
+                }
 
-                    return false;
+                return false;
 
-                    static bool IsProperty_IsCompleted(IPropertySymbol property)
+                static bool IsProperty_IsCompleted(IPropertySymbol property)
+                {
+                    return property is
                     {
-                        return property is
-                        {
-                            Name: WellKnownMemberNames.IsCompleted,
-                            Type.SpecialType: SpecialType.System_Boolean,
-                            GetMethod: not null
-                        };
-                    }
+                        Name: WellKnownMemberNames.IsCompleted,
+                        Type.SpecialType: SpecialType.System_Boolean,
+                        GetMethod: not null
+                    };
+                }
 
-                    static bool IsMethod_OnCompleted(IMethodSymbol method)
+                static bool IsMethod_OnCompleted(IMethodSymbol method)
+                {
+                    return method is
                     {
-                        return method is
-                        {
-                            Name: WellKnownMemberNames.OnCompleted,
-                            ReturnsVoid: true,
-                            Parameters: [{ Type.TypeKind: TypeKind.Delegate }]
-                        };
-                    }
+                        Name: WellKnownMemberNames.OnCompleted,
+                        ReturnsVoid: true,
+                        Parameters: [{ Type.TypeKind: TypeKind.Delegate }]
+                    };
+                }
 
-                    static bool IsMethod_GetResult(IMethodSymbol method)
+                static bool IsMethod_GetResult(IMethodSymbol method)
+                {
+                    return method is
                     {
-                        return method is
-                        {
-                            Name: WellKnownMemberNames.GetResult,
-                            Parameters: []
-                        };
-                    }
+                        Name: WellKnownMemberNames.GetResult,
+                        Parameters: []
+                    };
                 }
             }
         }
@@ -407,7 +389,7 @@ private static void CreateTypeParameterProperty(TagHelperDescriptorBuilder build
                 pb.Name = typeParameter.Name;
                 pb.TypeName = typeof(Type).FullName;
 
-                using var _ = ListPool<KeyValuePair<string, string>>.GetPooledObject(out var metadataPairs);
+                using var _ = ListPool<KeyValuePair<string, string?>>.GetPooledObject(out var metadataPairs);
                 metadataPairs.Add(PropertyName(typeParameter.Name));
                 metadataPairs.Add(MakeTrue(ComponentMetadata.Component.TypeParameterKey));
                 metadataPairs.Add(new(ComponentMetadata.Component.TypeParameterIsCascadingKey, cascade.ToString()));
@@ -465,7 +447,7 @@ private static void CreateTypeParameterProperty(TagHelperDescriptorBuilder build
                         builder.Name));
             });
 
-            static bool TryGetWhereClauseText(ITypeParameterSymbol typeParameter, PooledList<string> constraints, [NotNullWhen(true)] out string constraintsText)
+            static bool TryGetWhereClauseText(ITypeParameterSymbol typeParameter, PooledList<string> constraints, [NotNullWhen(true)] out string? constraintsText)
             {
                 if (constraints.Count == 0)
                 {
@@ -554,7 +536,7 @@ private static TagHelperDescriptor CreateChildContentDescriptor(TagHelperDescrip
             return descriptor;
         }
 
-        private static void CreateContextParameter(TagHelperDescriptorBuilder builder, string childContentName)
+        private static void CreateContextParameter(TagHelperDescriptorBuilder builder, string? childContentName)
         {
             builder.BindAttribute(b =>
             {
@@ -586,9 +568,10 @@ private static void CreateContextParameter(TagHelperDescriptorBuilder builder, s
             using var names = new PooledHashSet<string>(StringHashSetPool.Ordinal);
             using var results = new PooledArrayBuilder<(IPropertySymbol, PropertyKind)>();
 
+            var currentType = type;
             do
             {
-                if (type.HasFullName(ComponentsApi.ComponentBase.MetadataName))
+                if (currentType.HasFullName(ComponentsApi.ComponentBase.MetadataName))
                 {
                     // The ComponentBase base class doesn't have any [Parameter].
                     // Bail out now to avoid walking through its many members, plus the members
@@ -596,7 +579,7 @@ private static void CreateContextParameter(TagHelperDescriptorBuilder builder, s
                     break;
                 }
 
-                foreach (var member in type.GetMembers())
+                foreach (var member in currentType.GetMembers())
                 {
                     if (member is not IPropertySymbol property)
                     {
@@ -639,7 +622,7 @@ private static void CreateContextParameter(TagHelperDescriptorBuilder builder, s
                         kind = PropertyKind.Ignored;
                     }
 
-                    if (!property.GetAttributes().Any(static a => a.AttributeClass.HasFullName(ComponentsApi.ParameterAttribute.MetadataName)))
+                    if (!property.GetAttributes().Any(static a => a.HasFullName(ComponentsApi.ParameterAttribute.MetadataName)))
                     {
                         if (property.IsOverride)
                         {
@@ -668,9 +651,9 @@ var p when IsDelegate(p) => PropertyKind.Delegate,
                     results.Add((property, kind));
                 }
 
-                type = type.BaseType;
+                currentType = currentType.BaseType;
             }
-            while (type != null);
+            while (currentType != null);
 
             return results.DrainToImmutable();
 
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/DefaultTagHelperDescriptorProvider.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/DefaultTagHelperDescriptorProvider.cs
index a7f69392c35..3953596d2f9 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/DefaultTagHelperDescriptorProvider.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/DefaultTagHelperDescriptorProvider.cs
@@ -1,32 +1,20 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
-using System;
 using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.PooledObjects;
 
 namespace Microsoft.CodeAnalysis.Razor;
 
-public sealed class DefaultTagHelperDescriptorProvider : RazorEngineFeatureBase, ITagHelperDescriptorProvider
+public sealed class DefaultTagHelperDescriptorProvider : TagHelperDescriptorProviderBase
 {
-    public int Order { get; set; }
-
-    public void Execute(TagHelperDescriptorProviderContext context)
+    public override void Execute(TagHelperDescriptorProviderContext context)
     {
-        if (context == null)
-        {
-            throw new ArgumentNullException(nameof(context));
-        }
+        ArgHelper.ThrowIfNull(context);
 
-        var compilation = context.GetCompilation();
-        if (compilation == null)
-        {
-            // No compilation, nothing to do.
-            return;
-        }
+        var compilation = context.Compilation;
 
         var tagHelperTypeSymbol = compilation.GetTypeByMetadataName(TagHelperTypes.ITagHelper);
         if (tagHelperTypeSymbol == null || tagHelperTypeSymbol.TypeKind == TypeKind.Error)
@@ -35,14 +23,14 @@ public void Execute(TagHelperDescriptorProviderContext context)
             return;
         }
 
-        var targetSymbol = context.Items.GetTargetSymbol();
+        var targetSymbol = context.TargetSymbol;
         var factory = new DefaultTagHelperDescriptorFactory(compilation, context.IncludeDocumentation, context.ExcludeHidden);
         var collector = new Collector(compilation, targetSymbol, factory, tagHelperTypeSymbol);
         collector.Collect(context);
     }
 
     private class Collector(
-        Compilation compilation, ISymbol targetSymbol, DefaultTagHelperDescriptorFactory factory, INamedTypeSymbol tagHelperTypeSymbol)
+        Compilation compilation, ISymbol? targetSymbol, DefaultTagHelperDescriptorFactory factory, INamedTypeSymbol tagHelperTypeSymbol)
         : TagHelperCollector<Collector>(compilation, targetSymbol)
     {
         private readonly DefaultTagHelperDescriptorFactory _factory = factory;
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/EventHandlerTagHelperDescriptorProvider.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/EventHandlerTagHelperDescriptorProvider.cs
index 058f6485b3e..f89840fde8b 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/EventHandlerTagHelperDescriptorProvider.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/EventHandlerTagHelperDescriptorProvider.cs
@@ -1,10 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
-using System;
 using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Components;
 using Microsoft.AspNetCore.Razor.PooledObjects;
@@ -12,24 +10,13 @@
 
 namespace Microsoft.CodeAnalysis.Razor;
 
-internal class EventHandlerTagHelperDescriptorProvider : ITagHelperDescriptorProvider
+internal sealed class EventHandlerTagHelperDescriptorProvider : TagHelperDescriptorProviderBase
 {
-    public int Order { get; set; }
-
-    public RazorEngine Engine { get; set; }
-
-    public void Execute(TagHelperDescriptorProviderContext context)
+    public override void Execute(TagHelperDescriptorProviderContext context)
     {
-        if (context == null)
-        {
-            throw new ArgumentNullException(nameof(context));
-        }
+        ArgHelper.ThrowIfNull(context);
 
-        var compilation = context.GetCompilation();
-        if (compilation == null)
-        {
-            return;
-        }
+        var compilation = context.Compilation;
 
         if (compilation.GetTypeByMetadataName(ComponentsApi.EventHandlerAttribute.FullTypeName) is not INamedTypeSymbol eventHandlerAttribute)
         {
@@ -37,13 +24,13 @@ public void Execute(TagHelperDescriptorProviderContext context)
             return;
         }
 
-        var targetSymbol = context.Items.GetTargetSymbol();
+        var targetSymbol = context.TargetSymbol;
 
         var collector = new Collector(compilation, targetSymbol, eventHandlerAttribute);
         collector.Collect(context);
     }
 
-    private class Collector(Compilation compilation, ISymbol targetSymbol, INamedTypeSymbol eventHandlerAttribute)
+    private class Collector(Compilation compilation, ISymbol? targetSymbol, INamedTypeSymbol eventHandlerAttribute)
         : TagHelperCollector<Collector>(compilation, targetSymbol)
     {
         private readonly INamedTypeSymbol _eventHandlerAttribute = eventHandlerAttribute;
@@ -67,30 +54,63 @@ protected override void Collect(ISymbol symbol, ICollection<TagHelperDescriptor>
                 {
                     if (SymbolEqualityComparer.Default.Equals(attribute.AttributeClass, _eventHandlerAttribute))
                     {
-                        var enablePreventDefault = false;
-                        var enableStopPropagation = false;
-                        if (attribute.ConstructorArguments.Length == 4)
+                        if (!AttributeArgs.TryGet(attribute, out var values))
                         {
-                            enablePreventDefault = (bool)attribute.ConstructorArguments[2].Value;
-                            enableStopPropagation = (bool)attribute.ConstructorArguments[3].Value;
+                            // If this occurs, the EventHandlerAttribute type has been broken.
+                            Assumed.Unreachable();
                         }
 
                         var (typeName, namespaceName) = displayNames.GetNames();
-                        var constructorArguments = attribute.ConstructorArguments;
-
-                        results.Add(CreateTagHelper(
-                            typeName,
-                            namespaceName,
-                            type.Name,
-                            (string)constructorArguments[0].Value,
-                            (INamedTypeSymbol)constructorArguments[1].Value,
-                            enablePreventDefault,
-                            enableStopPropagation));
+                        results.Add(CreateTagHelper(typeName, namespaceName, type.Name, values));
                     }
                 }
             }
         }
 
+        private readonly record struct AttributeArgs(
+            string Attribute,
+            INamedTypeSymbol EventArgsType,
+            bool EnableStopPropagation,
+            bool EnablePreventDefault)
+        {
+            public static bool TryGet(AttributeData attribute, out AttributeArgs args)
+            {
+                // EventHandlerAttribute has two constructors:
+                //
+                // - EventHandlerAttribute(string attributeName, Type eventArgsType);
+                // - EventHandlerAttribute(string attributeName, Type eventArgsType, bool enableStopPropagation, bool enablePreventDefault);
+
+                args = default;
+
+                var arguments = attribute.ConstructorArguments;
+
+                if (arguments.Length is not (2 or 4))
+                {
+                    return false;
+                }
+
+                if (arguments[0] is not { Value: string attributeName } ||
+                    arguments[1] is not { Value: INamedTypeSymbol eventArgsType })
+                {
+                    return false;
+                }
+
+                // TODO: The enablePreventDefault and enableStopPropagation arguments are incorrectly swapped!
+                // However, they have been that way since the 4-argument constructor variant was introduced
+                // in https://github.com/dotnet/razor/commit/7635bba6ef2d3e6798d0846ceb96da6d5908e1b0.
+                // Fixing this is tracked be https://github.com/dotnet/razor/issues/10497
+
+                if (arguments is not [.., { Value: bool enablePreventDefault }, { Value: bool enableStopPropagation }])
+                {
+                    enableStopPropagation = false;
+                    enablePreventDefault = false;
+                }
+
+                args = new(attributeName, eventArgsType, enableStopPropagation, enablePreventDefault);
+                return true;
+            }
+        }
+
         /// <summary>
         ///  Helper to avoid computing various type-based names until necessary.
         /// </summary>
@@ -112,11 +132,10 @@ private static TagHelperDescriptor CreateTagHelper(
             string typeName,
             string typeNamespace,
             string typeNameIdentifier,
-            string attribute,
-            INamedTypeSymbol eventArgsType,
-            bool enablePreventDefault,
-            bool enableStopPropagation)
+            AttributeArgs args)
         {
+            var (attribute, eventArgsType, enableStopPropagation, enablePreventDefault) = args;
+
             var attributeName = "@" + attribute;
             var eventArgType = eventArgsType.ToDisplayString();
             _ = TagHelperDescriptorBuilder.GetPooledInstance(
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/FormNameTagHelperDescriptorProvider.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/FormNameTagHelperDescriptorProvider.cs
index 030030882eb..c04ecadf5fc 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/FormNameTagHelperDescriptorProvider.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/FormNameTagHelperDescriptorProvider.cs
@@ -3,33 +3,23 @@
 
 using System;
 using System.Linq;
+using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Components;
 using static Microsoft.AspNetCore.Razor.Language.CommonMetadata;
 
 namespace Microsoft.CodeAnalysis.Razor;
 
-internal sealed class FormNameTagHelperDescriptorProvider : ITagHelperDescriptorProvider
+// Run after the component tag helper provider
+internal sealed class FormNameTagHelperDescriptorProvider() : TagHelperDescriptorProviderBase(order: 1000)
 {
     private static readonly Lazy<TagHelperDescriptor> s_formNameTagHelper = new(CreateFormNameTagHelper);
 
-    // Run after the component tag helper provider
-    public int Order { get; set; } = 1000;
-
-    public RazorEngine? Engine { get; set; }
-
-    public void Execute(TagHelperDescriptorProviderContext context)
+    public override void Execute(TagHelperDescriptorProviderContext context)
     {
-        if (context == null)
-        {
-            throw new ArgumentNullException(nameof(context));
-        }
+        ArgHelper.ThrowIfNull(context);
 
-        var compilation = context.GetCompilation();
-        if (compilation == null)
-        {
-            return;
-        }
+        var compilation = context.Compilation;
 
         var renderTreeBuilders = compilation.GetTypesByMetadataName(ComponentsApi.RenderTreeBuilder.FullTypeName)
             .Where(static t => t.DeclaredAccessibility == Accessibility.Public &&
@@ -40,8 +30,7 @@ public void Execute(TagHelperDescriptorProviderContext context)
             return;
         }
 
-        var targetSymbol = context.Items.GetTargetSymbol();
-        if (targetSymbol is not null && !SymbolEqualityComparer.Default.Equals(targetSymbol, renderTreeBuilder.ContainingAssembly))
+        if (context.TargetSymbol is { } targetSymbol && !SymbolEqualityComparer.Default.Equals(targetSymbol, renderTreeBuilder.ContainingAssembly))
         {
             return;
         }
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/KeyTagHelperDescriptorProvider.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/KeyTagHelperDescriptorProvider.cs
index 22a999350e1..0bafbe36bf6 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/KeyTagHelperDescriptorProvider.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/KeyTagHelperDescriptorProvider.cs
@@ -1,36 +1,24 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
 using System;
+using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Components;
 using static Microsoft.AspNetCore.Razor.Language.CommonMetadata;
 
 namespace Microsoft.CodeAnalysis.Razor;
 
-internal class KeyTagHelperDescriptorProvider : ITagHelperDescriptorProvider
+// Run after the component tag helper provider
+internal sealed class KeyTagHelperDescriptorProvider() : TagHelperDescriptorProviderBase(order: 1000)
 {
-    private static TagHelperDescriptor s_keyTagHelper;
-
-    // Run after the component tag helper provider
-    public int Order { get; set; } = 1000;
-
-    public RazorEngine Engine { get; set; }
+    private static readonly Lazy<TagHelperDescriptor> s_keyTagHelper = new(CreateKeyTagHelper);
 
-    public void Execute(TagHelperDescriptorProviderContext context)
+    public override void Execute(TagHelperDescriptorProviderContext context)
     {
-        if (context == null)
-        {
-            throw new ArgumentNullException(nameof(context));
-        }
+        ArgHelper.ThrowIfNull(context);
 
-        var compilation = context.GetCompilation();
-        if (compilation == null)
-        {
-            return;
-        }
+        var compilation = context.Compilation;
 
         var renderTreeBuilderType = compilation.GetTypeByMetadataName(ComponentsApi.RenderTreeBuilder.FullTypeName);
         if (renderTreeBuilderType == null)
@@ -40,56 +28,50 @@ public void Execute(TagHelperDescriptorProviderContext context)
             return;
         }
 
-        var targetSymbol = context.Items.GetTargetSymbol();
-        if (targetSymbol is not null && !SymbolEqualityComparer.Default.Equals(targetSymbol, renderTreeBuilderType.ContainingAssembly))
+        if (context.TargetSymbol is { } targetSymbol && !SymbolEqualityComparer.Default.Equals(targetSymbol, renderTreeBuilderType.ContainingAssembly))
         {
             return;
         }
 
-        context.Results.Add(GetOrCreateKeyTagHelper());
+        context.Results.Add(s_keyTagHelper.Value);
     }
 
-    private static TagHelperDescriptor GetOrCreateKeyTagHelper()
+    private static TagHelperDescriptor CreateKeyTagHelper()
     {
-        return s_keyTagHelper ??= CreateKeyTagHelper();
+        using var _ = TagHelperDescriptorBuilder.GetPooledInstance(
+            ComponentMetadata.Key.TagHelperKind, "Key", ComponentsApi.AssemblyName,
+            out var builder);
 
-        static TagHelperDescriptor CreateKeyTagHelper()
-        {
-            using var _ = TagHelperDescriptorBuilder.GetPooledInstance(
-                ComponentMetadata.Key.TagHelperKind, "Key", ComponentsApi.AssemblyName,
-                out var builder);
+        builder.CaseSensitive = true;
+        builder.SetDocumentation(DocumentationDescriptor.KeyTagHelper);
 
-            builder.CaseSensitive = true;
-            builder.SetDocumentation(DocumentationDescriptor.KeyTagHelper);
+        builder.SetMetadata(
+            SpecialKind(ComponentMetadata.Key.TagHelperKind),
+            MakeTrue(TagHelperMetadata.Common.ClassifyAttributesOnly),
+            RuntimeName(ComponentMetadata.Key.RuntimeName),
+            TypeName("Microsoft.AspNetCore.Components.Key"));
 
-            builder.SetMetadata(
-                SpecialKind(ComponentMetadata.Key.TagHelperKind),
-                MakeTrue(TagHelperMetadata.Common.ClassifyAttributesOnly),
-                RuntimeName(ComponentMetadata.Key.RuntimeName),
-                TypeName("Microsoft.AspNetCore.Components.Key"));
-
-            builder.TagMatchingRule(rule =>
+        builder.TagMatchingRule(rule =>
+        {
+            rule.TagName = "*";
+            rule.Attribute(attribute =>
             {
-                rule.TagName = "*";
-                rule.Attribute(attribute =>
-                {
-                    attribute.Name = "@key";
-                    attribute.SetMetadata(Attributes.IsDirectiveAttribute);
-                });
+                attribute.Name = "@key";
+                attribute.SetMetadata(Attributes.IsDirectiveAttribute);
             });
+        });
 
-            builder.BindAttribute(attribute =>
-            {
-                attribute.SetDocumentation(DocumentationDescriptor.KeyTagHelper);
-                attribute.Name = "@key";
+        builder.BindAttribute(attribute =>
+        {
+            attribute.SetDocumentation(DocumentationDescriptor.KeyTagHelper);
+            attribute.Name = "@key";
 
-                attribute.TypeName = typeof(object).FullName;
-                attribute.SetMetadata(
-                    PropertyName("Key"),
-                    IsDirectiveAttribute);
-            });
+            attribute.TypeName = typeof(object).FullName;
+            attribute.SetMetadata(
+                PropertyName("Key"),
+                IsDirectiveAttribute);
+        });
 
-            return builder.Build();
-        }
+        return builder.Build();
     }
 }
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/RefTagHelperDescriptorProvider.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/RefTagHelperDescriptorProvider.cs
index 7ade45235d5..e6cb16f5489 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/RefTagHelperDescriptorProvider.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/RefTagHelperDescriptorProvider.cs
@@ -1,36 +1,24 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
 using System;
+using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Components;
 using static Microsoft.AspNetCore.Razor.Language.CommonMetadata;
 
 namespace Microsoft.CodeAnalysis.Razor;
 
-internal class RefTagHelperDescriptorProvider : ITagHelperDescriptorProvider
+// Run after the component tag helper provider, because later we may want component-type-specific variants of this
+internal sealed class RefTagHelperDescriptorProvider() : TagHelperDescriptorProviderBase(order: 1000)
 {
-    private static TagHelperDescriptor s_refTagHelper;
-
-    // Run after the component tag helper provider, because later we may want component-type-specific variants of this
-    public int Order { get; set; } = 1000;
-
-    public RazorEngine Engine { get; set; }
+    private static readonly Lazy<TagHelperDescriptor> s_refTagHelper = new(CreateRefTagHelper);
 
-    public void Execute(TagHelperDescriptorProviderContext context)
+    public override void Execute(TagHelperDescriptorProviderContext context)
     {
-        if (context == null)
-        {
-            throw new ArgumentNullException(nameof(context));
-        }
+        ArgHelper.ThrowIfNull(context);
 
-        var compilation = context.GetCompilation();
-        if (compilation == null)
-        {
-            return;
-        }
+        var compilation = context.Compilation;
 
         var elementReference = compilation.GetTypeByMetadataName(ComponentsApi.ElementReference.FullTypeName);
         if (elementReference == null)
@@ -40,56 +28,50 @@ public void Execute(TagHelperDescriptorProviderContext context)
             return;
         }
 
-        var targetSymbol = context.Items.GetTargetSymbol();
-        if (targetSymbol is not null && !SymbolEqualityComparer.Default.Equals(targetSymbol, elementReference.ContainingAssembly))
+        if (context.TargetSymbol is { } targetSymbol && !SymbolEqualityComparer.Default.Equals(targetSymbol, elementReference.ContainingAssembly))
         {
             return;
         }
 
-        context.Results.Add(GetOrCreateRefTagHelper());
+        context.Results.Add(s_refTagHelper.Value);
     }
 
-    private static TagHelperDescriptor GetOrCreateRefTagHelper()
+    private static TagHelperDescriptor CreateRefTagHelper()
     {
-        return s_refTagHelper ??= CreateRefTagHelper();
+        using var _ = TagHelperDescriptorBuilder.GetPooledInstance(
+            ComponentMetadata.Ref.TagHelperKind, "Ref", ComponentsApi.AssemblyName,
+            out var builder);
 
-        static TagHelperDescriptor CreateRefTagHelper()
-        {
-            using var _ = TagHelperDescriptorBuilder.GetPooledInstance(
-                ComponentMetadata.Ref.TagHelperKind, "Ref", ComponentsApi.AssemblyName,
-                out var builder);
+        builder.CaseSensitive = true;
+        builder.SetDocumentation(DocumentationDescriptor.RefTagHelper);
 
-            builder.CaseSensitive = true;
-            builder.SetDocumentation(DocumentationDescriptor.RefTagHelper);
+        builder.SetMetadata(
+            SpecialKind(ComponentMetadata.Ref.TagHelperKind),
+            MakeTrue(TagHelperMetadata.Common.ClassifyAttributesOnly),
+            RuntimeName(ComponentMetadata.Ref.RuntimeName),
+            TypeName("Microsoft.AspNetCore.Components.Ref"));
 
-            builder.SetMetadata(
-                SpecialKind(ComponentMetadata.Ref.TagHelperKind),
-                MakeTrue(TagHelperMetadata.Common.ClassifyAttributesOnly),
-                RuntimeName(ComponentMetadata.Ref.RuntimeName),
-                TypeName("Microsoft.AspNetCore.Components.Ref"));
-
-            builder.TagMatchingRule(rule =>
+        builder.TagMatchingRule(rule =>
+        {
+            rule.TagName = "*";
+            rule.Attribute(attribute =>
             {
-                rule.TagName = "*";
-                rule.Attribute(attribute =>
-                {
-                    attribute.Name = "@ref";
-                    attribute.SetMetadata(Attributes.IsDirectiveAttribute);
-                });
+                attribute.Name = "@ref";
+                attribute.SetMetadata(Attributes.IsDirectiveAttribute);
             });
+        });
 
-            builder.BindAttribute(attribute =>
-            {
-                attribute.SetDocumentation(DocumentationDescriptor.RefTagHelper);
-                attribute.Name = "@ref";
+        builder.BindAttribute(attribute =>
+        {
+            attribute.SetDocumentation(DocumentationDescriptor.RefTagHelper);
+            attribute.Name = "@ref";
 
-                attribute.TypeName = typeof(object).FullName;
-                attribute.SetMetadata(
-                    PropertyName("Ref"),
-                    IsDirectiveAttribute);
-            });
+            attribute.TypeName = typeof(object).FullName;
+            attribute.SetMetadata(
+                PropertyName("Ref"),
+                IsDirectiveAttribute);
+        });
 
-            return builder.Build();
-        }
+        return builder.Build();
     }
 }
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/RenderModeTagHelperDescriptorProvider.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/RenderModeTagHelperDescriptorProvider.cs
index 81d214463e7..a18227a82dd 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/RenderModeTagHelperDescriptorProvider.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/RenderModeTagHelperDescriptorProvider.cs
@@ -1,36 +1,24 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable enable
-
 using System;
+using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Components;
 using static Microsoft.AspNetCore.Razor.Language.CommonMetadata;
 
 namespace Microsoft.CodeAnalysis.Razor;
 
-internal sealed class RenderModeTagHelperDescriptorProvider : ITagHelperDescriptorProvider
+// Run after the component tag helper provider
+internal sealed class RenderModeTagHelperDescriptorProvider() : TagHelperDescriptorProviderBase(order: 1000)
 {
-    private static readonly Lazy<TagHelperDescriptor> s_refTagHelper = new(CreateRenderModeTagHelper);
-
-    // Run after the component tag helper provider
-    public int Order { get; set; } = 1000;
+    private static readonly Lazy<TagHelperDescriptor> s_renderModeTagHelper = new(CreateRenderModeTagHelper);
 
-    public RazorEngine? Engine { get; set; }
-
-    public void Execute(TagHelperDescriptorProviderContext context)
+    public override void Execute(TagHelperDescriptorProviderContext context)
     {
-        if (context == null)
-        {
-            throw new ArgumentNullException(nameof(context));
-        }
+        ArgHelper.ThrowIfNull(context);
 
-        var compilation = context.GetCompilation();
-        if (compilation == null)
-        {
-            return;
-        }
+        var compilation = context.Compilation;
 
         var iComponentRenderMode = compilation.GetTypeByMetadataName(ComponentsApi.IComponentRenderMode.FullTypeName);
         if (iComponentRenderMode == null)
@@ -40,13 +28,12 @@ public void Execute(TagHelperDescriptorProviderContext context)
             return;
         }
 
-        var targetSymbol = context.Items.GetTargetSymbol();
-        if (targetSymbol is not null && !SymbolEqualityComparer.Default.Equals(targetSymbol, iComponentRenderMode.ContainingAssembly))
+        if (context.TargetSymbol is { } targetSymbol && !SymbolEqualityComparer.Default.Equals(targetSymbol, iComponentRenderMode.ContainingAssembly))
         {
             return;
         }
 
-        context.Results.Add(s_refTagHelper.Value);
+        context.Results.Add(s_renderModeTagHelper.Value);
     }
 
     private static TagHelperDescriptor CreateRenderModeTagHelper()
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/SplatTagHelperDescriptorProvider.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/SplatTagHelperDescriptorProvider.cs
index e1d44045aa0..2db0111c0b7 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/SplatTagHelperDescriptorProvider.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/SplatTagHelperDescriptorProvider.cs
@@ -1,36 +1,23 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
 using System;
+using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Components;
 using static Microsoft.AspNetCore.Razor.Language.CommonMetadata;
 
 namespace Microsoft.CodeAnalysis.Razor;
 
-internal class SplatTagHelperDescriptorProvider : ITagHelperDescriptorProvider
+internal sealed class SplatTagHelperDescriptorProvider : TagHelperDescriptorProviderBase
 {
-    private static TagHelperDescriptor s_splatTagHelper;
-
-    // Order doesn't matter
-    public int Order { get; set; }
-
-    public RazorEngine Engine { get; set; }
+    private static readonly Lazy<TagHelperDescriptor> s_splatTagHelper = new(CreateSplatTagHelper);
 
-    public void Execute(TagHelperDescriptorProviderContext context)
+    public override void Execute(TagHelperDescriptorProviderContext context)
     {
-        if (context == null)
-        {
-            throw new ArgumentNullException(nameof(context));
-        }
+        ArgHelper.ThrowIfNull(context);
 
-        var compilation = context.GetCompilation();
-        if (compilation == null)
-        {
-            return;
-        }
+        var compilation = context.Compilation;
 
         var renderTreeBuilder = compilation.GetTypeByMetadataName(ComponentsApi.RenderTreeBuilder.FullTypeName);
         if (renderTreeBuilder == null)
@@ -40,56 +27,50 @@ public void Execute(TagHelperDescriptorProviderContext context)
             return;
         }
 
-        var targetSymbol = context.Items.GetTargetSymbol();
-        if (targetSymbol is not null && !SymbolEqualityComparer.Default.Equals(targetSymbol, renderTreeBuilder.ContainingAssembly))
+        if (context.TargetSymbol is { } targetSymbol && !SymbolEqualityComparer.Default.Equals(targetSymbol, renderTreeBuilder.ContainingAssembly))
         {
             return;
         }
 
-        context.Results.Add(GetOrCreateSplatTagHelper());
+        context.Results.Add(s_splatTagHelper.Value);
     }
 
-    private static TagHelperDescriptor GetOrCreateSplatTagHelper()
+    private static TagHelperDescriptor CreateSplatTagHelper()
     {
-        return s_splatTagHelper ??= CreateSplatTagHelper();
+        using var _ = TagHelperDescriptorBuilder.GetPooledInstance(
+            ComponentMetadata.Splat.TagHelperKind, "Attributes", ComponentsApi.AssemblyName,
+            out var builder);
 
-        static TagHelperDescriptor CreateSplatTagHelper()
-        {
-            using var _ = TagHelperDescriptorBuilder.GetPooledInstance(
-                ComponentMetadata.Splat.TagHelperKind, "Attributes", ComponentsApi.AssemblyName,
-                out var builder);
+        builder.CaseSensitive = true;
+        builder.SetDocumentation(DocumentationDescriptor.SplatTagHelper);
 
-            builder.CaseSensitive = true;
-            builder.SetDocumentation(DocumentationDescriptor.SplatTagHelper);
+        builder.SetMetadata(
+            SpecialKind(ComponentMetadata.Splat.TagHelperKind),
+            MakeTrue(TagHelperMetadata.Common.ClassifyAttributesOnly),
+            RuntimeName(ComponentMetadata.Splat.RuntimeName),
+            TypeName("Microsoft.AspNetCore.Components.Attributes"));
 
-            builder.SetMetadata(
-                SpecialKind(ComponentMetadata.Splat.TagHelperKind),
-                MakeTrue(TagHelperMetadata.Common.ClassifyAttributesOnly),
-                RuntimeName(ComponentMetadata.Splat.RuntimeName),
-                TypeName("Microsoft.AspNetCore.Components.Attributes"));
-
-            builder.TagMatchingRule(rule =>
+        builder.TagMatchingRule(rule =>
+        {
+            rule.TagName = "*";
+            rule.Attribute(attribute =>
             {
-                rule.TagName = "*";
-                rule.Attribute(attribute =>
-                {
-                    attribute.Name = "@attributes";
-                    attribute.SetMetadata(Attributes.IsDirectiveAttribute);
-                });
+                attribute.Name = "@attributes";
+                attribute.SetMetadata(Attributes.IsDirectiveAttribute);
             });
+        });
 
-            builder.BindAttribute(attribute =>
-            {
-                attribute.SetDocumentation(DocumentationDescriptor.SplatTagHelper);
-                attribute.Name = "@attributes";
+        builder.BindAttribute(attribute =>
+        {
+            attribute.SetDocumentation(DocumentationDescriptor.SplatTagHelper);
+            attribute.Name = "@attributes";
 
-                attribute.TypeName = typeof(object).FullName;
-                attribute.SetMetadata(
-                    PropertyName("Attributes"),
-                    IsDirectiveAttribute);
-            });
+            attribute.TypeName = typeof(object).FullName;
+            attribute.SetMetadata(
+                PropertyName("Attributes"),
+                IsDirectiveAttribute);
+        });
 
-            return builder.Build();
-        }
+        return builder.Build();
     }
 }
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/SymbolExtensions.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/SymbolExtensions.cs
index e9bc59e3480..a280e8db8a4 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/SymbolExtensions.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/SymbolExtensions.cs
@@ -13,6 +13,9 @@ internal static class SymbolExtensions
             .WithGlobalNamespaceStyle(SymbolDisplayGlobalNamespaceStyle.Omitted)
             .RemoveMiscellaneousOptions(SymbolDisplayMiscellaneousOptions.UseSpecialTypes);
 
+    internal static bool HasFullName(this AttributeData attribute, string fullName)
+        => attribute.AttributeClass is { } attributeClass && attributeClass.HasFullName(fullName);
+
     /// <summary>
     /// Checks if <paramref name="typeSymbol"/> has the same fully qualified name as <paramref name="fullName"/>.
     /// </summary>
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/TagHelperDescriptorProviderContextExtensions.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/TagHelperDescriptorProviderContextExtensions.cs
deleted file mode 100644
index 23273e15454..00000000000
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/TagHelperDescriptorProviderContextExtensions.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-#nullable disable
-
-using System;
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.CodeAnalysis.Razor;
-
-public static class TagHelperDescriptorProviderContextExtensions
-{
-    public static Compilation GetCompilation(this TagHelperDescriptorProviderContext context)
-    {
-        if (context == null)
-        {
-            throw new ArgumentNullException(nameof(context));
-        }
-
-        return (Compilation)context.Items[typeof(Compilation)];
-    }
-
-    public static void SetCompilation(this TagHelperDescriptorProviderContext context, Compilation compilation)
-    {
-        if (context == null)
-        {
-            throw new ArgumentNullException(nameof(context));
-        }
-
-        context.Items[typeof(Compilation)] = compilation;
-    }
-}
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/TagHelperTargetSymbolExtensions.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/TagHelperTargetSymbolExtensions.cs
deleted file mode 100644
index 6e9b1609e7f..00000000000
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/TagHelperTargetSymbolExtensions.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using Microsoft.AspNetCore.Razor.Language;
-
-namespace Microsoft.CodeAnalysis.Razor;
-
-internal static class TagHelperTargetSymbolExtensions
-{
-    private static readonly object TargetSymbolKey = new object();
-
-    public static ISymbol? GetTargetSymbol(this ItemCollection items)
-    {
-        if (items.Count == 0 || items[TargetSymbolKey] is not ISymbol symbol)
-        {
-            return null;
-        }
-
-        return symbol;
-    }
-
-    public static void SetTargetSymbol(this ItemCollection items, ISymbol symbol)
-    {
-        items[TargetSymbolKey] = symbol;
-    }
-}
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/TagHelperDescriptorProviderBase.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/TagHelperDescriptorProviderBase.cs
new file mode 100644
index 00000000000..0ab7a8355cb
--- /dev/null
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/TagHelperDescriptorProviderBase.cs
@@ -0,0 +1,11 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace Microsoft.AspNetCore.Razor.Language;
+
+public abstract class TagHelperDescriptorProviderBase(int order = 0) : RazorEngineFeatureBase, ITagHelperDescriptorProvider
+{
+    public int Order { get; } = order;
+
+    public abstract void Execute(TagHelperDescriptorProviderContext context);
+}
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/TagHelperDescriptorProviderContext.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/TagHelperDescriptorProviderContext.cs
index d89fde61427..1305d7888af 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/TagHelperDescriptorProviderContext.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/TagHelperDescriptorProviderContext.cs
@@ -1,49 +1,27 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
-using System;
 using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
 
 namespace Microsoft.AspNetCore.Razor.Language;
 
-public abstract class TagHelperDescriptorProviderContext
+public sealed class TagHelperDescriptorProviderContext(Compilation compilation, ISymbol? targetSymbol, ICollection<TagHelperDescriptor> results)
 {
-    public virtual bool ExcludeHidden { get; set; }
-
-    public virtual bool IncludeDocumentation { get; set; }
-
-    public abstract ItemCollection Items { get; }
+    public Compilation Compilation { get; } = compilation;
+    public ISymbol? TargetSymbol { get; } = targetSymbol;
+    public ICollection<TagHelperDescriptor> Results { get; } = results;
 
-    public abstract ICollection<TagHelperDescriptor> Results { get; }
-
-    public static TagHelperDescriptorProviderContext Create()
-    {
-        return new DefaultContext(new List<TagHelperDescriptor>());
-    }
+    public bool ExcludeHidden { get; init; }
+    public bool IncludeDocumentation { get; init; }
 
-    public static TagHelperDescriptorProviderContext Create(ICollection<TagHelperDescriptor> results)
+    public TagHelperDescriptorProviderContext(Compilation compilation, ISymbol? targetSymbol = null)
+        : this(compilation, targetSymbol, results: [])
     {
-        if (results == null)
-        {
-            throw new ArgumentNullException(nameof(results));
-        }
-
-        return new DefaultContext(results);
     }
 
-    private class DefaultContext : TagHelperDescriptorProviderContext
+    public TagHelperDescriptorProviderContext(Compilation compilation, ICollection<TagHelperDescriptor> results)
+        : this(compilation, targetSymbol: null, results)
     {
-        public DefaultContext(ICollection<TagHelperDescriptor> results)
-        {
-            Results = results;
-
-            Items = new ItemCollection();
-        }
-
-        public override ItemCollection Items { get; }
-
-        public override ICollection<TagHelperDescriptor> Results { get; }
     }
 }
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc.Version1_X/ViewComponentTagHelperDescriptorProvider.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc.Version1_X/ViewComponentTagHelperDescriptorProvider.cs
index f53efafa6e8..abddce93827 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc.Version1_X/ViewComponentTagHelperDescriptorProvider.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc.Version1_X/ViewComponentTagHelperDescriptorProvider.cs
@@ -1,34 +1,21 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
-using System;
 using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.PooledObjects;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X;
 
-public sealed class ViewComponentTagHelperDescriptorProvider : RazorEngineFeatureBase, ITagHelperDescriptorProvider
+public sealed class ViewComponentTagHelperDescriptorProvider : TagHelperDescriptorProviderBase
 {
-    public int Order { get; set; }
-
-    public void Execute(TagHelperDescriptorProviderContext context)
+    public override void Execute(TagHelperDescriptorProviderContext context)
     {
-        if (context == null)
-        {
-            throw new ArgumentNullException(nameof(context));
-        }
+        ArgHelper.ThrowIfNull(context);
 
-        var compilation = context.GetCompilation();
-        if (compilation == null)
-        {
-            // No compilation, nothing to do.
-            return;
-        }
+        var compilation = context.Compilation;
 
         var vcAttribute = compilation.GetTypeByMetadataName(ViewComponentTypes.ViewComponentAttribute);
         var nonVCAttribute = compilation.GetTypeByMetadataName(ViewComponentTypes.NonViewComponentAttribute);
@@ -48,12 +35,12 @@ private class Collector(
         Compilation compilation,
         ViewComponentTagHelperDescriptorFactory factory,
         INamedTypeSymbol vcAttribute,
-        INamedTypeSymbol nonVCAttribute)
+        INamedTypeSymbol? nonVCAttribute)
         : TagHelperCollector<Collector>(compilation, targetSymbol: null)
     {
         private readonly ViewComponentTagHelperDescriptorFactory _factory = factory;
         private readonly INamedTypeSymbol _vcAttribute = vcAttribute;
-        private readonly INamedTypeSymbol _nonVCAttribute = nonVCAttribute;
+        private readonly INamedTypeSymbol? _nonVCAttribute = nonVCAttribute;
 
         protected override void Collect(ISymbol symbol, ICollection<TagHelperDescriptor> results)
         {
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc.Version1_X/ViewComponentTypeVisitor.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc.Version1_X/ViewComponentTypeVisitor.cs
index 2baa96bc20e..610fa47c60b 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc.Version1_X/ViewComponentTypeVisitor.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc.Version1_X/ViewComponentTypeVisitor.cs
@@ -1,23 +1,21 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using Microsoft.CodeAnalysis;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X;
 
-internal class ViewComponentTypeVisitor : SymbolVisitor
+internal sealed class ViewComponentTypeVisitor : SymbolVisitor
 {
     private readonly INamedTypeSymbol _viewComponentAttribute;
-    private readonly INamedTypeSymbol _nonViewComponentAttribute;
+    private readonly INamedTypeSymbol? _nonViewComponentAttribute;
     private readonly List<INamedTypeSymbol> _results;
 
     public ViewComponentTypeVisitor(
         INamedTypeSymbol viewComponentAttribute,
-        INamedTypeSymbol nonViewComponentAttribute,
+        INamedTypeSymbol? nonViewComponentAttribute,
         List<INamedTypeSymbol> results)
     {
         _viewComponentAttribute = viewComponentAttribute;
@@ -65,7 +63,7 @@ internal bool IsViewComponent(INamedTypeSymbol symbol)
             AttributeIsDefined(symbol, _viewComponentAttribute);
     }
 
-    private static bool AttributeIsDefined(INamedTypeSymbol type, INamedTypeSymbol queryAttribute)
+    private static bool AttributeIsDefined(INamedTypeSymbol? type, INamedTypeSymbol? queryAttribute)
     {
         if (type == null || queryAttribute == null)
         {
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc.Version2_X/ViewComponentTagHelperDescriptorProvider.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc.Version2_X/ViewComponentTagHelperDescriptorProvider.cs
index 1b699e6aa40..6058ae7ae52 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc.Version2_X/ViewComponentTagHelperDescriptorProvider.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc.Version2_X/ViewComponentTagHelperDescriptorProvider.cs
@@ -1,34 +1,21 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
-using System;
 using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.PooledObjects;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X;
 
-public sealed class ViewComponentTagHelperDescriptorProvider : RazorEngineFeatureBase, ITagHelperDescriptorProvider
+public sealed class ViewComponentTagHelperDescriptorProvider : TagHelperDescriptorProviderBase
 {
-    public int Order { get; set; }
-
-    public void Execute(TagHelperDescriptorProviderContext context)
+    public override void Execute(TagHelperDescriptorProviderContext context)
     {
-        if (context == null)
-        {
-            throw new ArgumentNullException(nameof(context));
-        }
+        ArgHelper.ThrowIfNull(context);
 
-        var compilation = context.GetCompilation();
-        if (compilation == null)
-        {
-            // No compilation, nothing to do.
-            return;
-        }
+        var compilation = context.Compilation;
 
         var vcAttribute = compilation.GetTypeByMetadataName(ViewComponentTypes.ViewComponentAttribute);
         var nonVCAttribute = compilation.GetTypeByMetadataName(ViewComponentTypes.NonViewComponentAttribute);
@@ -48,12 +35,12 @@ private class Collector(
         Compilation compilation,
         ViewComponentTagHelperDescriptorFactory factory,
         INamedTypeSymbol vcAttribute,
-        INamedTypeSymbol nonVCAttribute)
+        INamedTypeSymbol? nonVCAttribute)
         : TagHelperCollector<Collector>(compilation, targetSymbol: null)
     {
         private readonly ViewComponentTagHelperDescriptorFactory _factory = factory;
         private readonly INamedTypeSymbol _vcAttribute = vcAttribute;
-        private readonly INamedTypeSymbol _nonVCAttribute = nonVCAttribute;
+        private readonly INamedTypeSymbol? _nonVCAttribute = nonVCAttribute;
 
         protected override void Collect(ISymbol symbol, ICollection<TagHelperDescriptor> results)
         {
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc.Version2_X/ViewComponentTypeVisitor.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc.Version2_X/ViewComponentTypeVisitor.cs
index cb1ff06f5ca..7e2b8240fb5 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc.Version2_X/ViewComponentTypeVisitor.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc.Version2_X/ViewComponentTypeVisitor.cs
@@ -1,23 +1,21 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using Microsoft.CodeAnalysis;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X;
 
-internal class ViewComponentTypeVisitor : SymbolVisitor
+internal sealed class ViewComponentTypeVisitor : SymbolVisitor
 {
     private readonly INamedTypeSymbol _viewComponentAttribute;
-    private readonly INamedTypeSymbol _nonViewComponentAttribute;
+    private readonly INamedTypeSymbol? _nonViewComponentAttribute;
     private readonly List<INamedTypeSymbol> _results;
 
     public ViewComponentTypeVisitor(
         INamedTypeSymbol viewComponentAttribute,
-        INamedTypeSymbol nonViewComponentAttribute,
+        INamedTypeSymbol? nonViewComponentAttribute,
         List<INamedTypeSymbol> results)
     {
         _viewComponentAttribute = viewComponentAttribute;
@@ -70,7 +68,7 @@ internal bool IsViewComponent(INamedTypeSymbol symbol)
             AttributeIsDefined(symbol, _viewComponentAttribute);
     }
 
-    private static bool AttributeIsDefined(INamedTypeSymbol type, INamedTypeSymbol queryAttribute)
+    private static bool AttributeIsDefined(INamedTypeSymbol? type, INamedTypeSymbol? queryAttribute)
     {
         if (type == null || queryAttribute == null)
         {
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc/ViewComponentTagHelperDescriptorProvider.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc/ViewComponentTagHelperDescriptorProvider.cs
index ead9211e953..2159ce7a07b 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc/ViewComponentTagHelperDescriptorProvider.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc/ViewComponentTagHelperDescriptorProvider.cs
@@ -1,34 +1,21 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
-using System;
 using System.Collections.Generic;
+using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.PooledObjects;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions;
 
-public sealed class ViewComponentTagHelperDescriptorProvider : RazorEngineFeatureBase, ITagHelperDescriptorProvider
+public sealed class ViewComponentTagHelperDescriptorProvider : TagHelperDescriptorProviderBase
 {
-    public int Order { get; set; }
-
-    public void Execute(TagHelperDescriptorProviderContext context)
+    public override void Execute(TagHelperDescriptorProviderContext context)
     {
-        if (context == null)
-        {
-            throw new ArgumentNullException(nameof(context));
-        }
+        ArgHelper.ThrowIfNull(context);
 
-        var compilation = context.GetCompilation();
-        if (compilation == null)
-        {
-            // No compilation, nothing to do.
-            return;
-        }
+        var compilation = context.Compilation;
 
         var vcAttribute = compilation.GetTypeByMetadataName(ViewComponentTypes.ViewComponentAttribute);
         var nonVCAttribute = compilation.GetTypeByMetadataName(ViewComponentTypes.NonViewComponentAttribute);
@@ -48,12 +35,12 @@ private class Collector(
         Compilation compilation,
         ViewComponentTagHelperDescriptorFactory factory,
         INamedTypeSymbol vcAttribute,
-        INamedTypeSymbol nonVCAttribute)
+        INamedTypeSymbol? nonVCAttribute)
         : TagHelperCollector<Collector>(compilation, targetSymbol: null)
     {
         private readonly ViewComponentTagHelperDescriptorFactory _factory = factory;
         private readonly INamedTypeSymbol _vcAttribute = vcAttribute;
-        private readonly INamedTypeSymbol _nonVCAttribute = nonVCAttribute;
+        private readonly INamedTypeSymbol? _nonVCAttribute = nonVCAttribute;
 
         protected override void Collect(ISymbol symbol, ICollection<TagHelperDescriptor> results)
         {
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc/ViewComponentTypeVisitor.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc/ViewComponentTypeVisitor.cs
index d7a48e6494f..96f3982c579 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc/ViewComponentTypeVisitor.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Mvc/ViewComponentTypeVisitor.cs
@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using Microsoft.CodeAnalysis;
@@ -12,12 +10,12 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions;
 internal class ViewComponentTypeVisitor : SymbolVisitor
 {
     private readonly INamedTypeSymbol _viewComponentAttribute;
-    private readonly INamedTypeSymbol _nonViewComponentAttribute;
+    private readonly INamedTypeSymbol? _nonViewComponentAttribute;
     private readonly List<INamedTypeSymbol> _results;
 
     public ViewComponentTypeVisitor(
         INamedTypeSymbol viewComponentAttribute,
-        INamedTypeSymbol nonViewComponentAttribute,
+        INamedTypeSymbol? nonViewComponentAttribute,
         List<INamedTypeSymbol> results)
     {
         _viewComponentAttribute = viewComponentAttribute;
@@ -75,7 +73,7 @@ internal bool IsViewComponent(INamedTypeSymbol symbol)
             AttributeIsDefined(symbol, _viewComponentAttribute);
     }
 
-    private static bool AttributeIsDefined(INamedTypeSymbol type, INamedTypeSymbol queryAttribute)
+    private static bool AttributeIsDefined(INamedTypeSymbol? type, INamedTypeSymbol? queryAttribute)
     {
         if (type == null || queryAttribute == null)
         {
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/SourceGenerators/StaticCompilationTagHelperFeature.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/SourceGenerators/StaticCompilationTagHelperFeature.cs
index 15f35d54f51..812c7bb3381 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/SourceGenerators/StaticCompilationTagHelperFeature.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/SourceGenerators/StaticCompilationTagHelperFeature.cs
@@ -6,7 +6,6 @@
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor;
 
 namespace Microsoft.NET.Sdk.Razor.SourceGenerators
 {
@@ -22,13 +21,7 @@ public void CollectDescriptors(ISymbol? targetSymbol, List<TagHelperDescriptor>
                 return;
             }
 
-            var context = TagHelperDescriptorProviderContext.Create(results);
-            context.SetCompilation(compilation);
-
-            if (targetSymbol is not null)
-            {
-                context.Items.SetTargetSymbol(targetSymbol);
-            }
+            var context = new TagHelperDescriptorProviderContext(compilation, targetSymbol, results);
 
             foreach (var provider in _providers)
             {
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
index 35fc97d894f..6b568a1b353 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor/test/BindTagHelperDescriptorProviderTest.cs
@@ -5,7 +5,6 @@
 
 using System;
 using System.Linq;
-using System.Threading;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Components;
 using Xunit;
@@ -49,8 +48,7 @@ public Task SetParametersAsync(ParameterView parameters)
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
+        var context = new TagHelperDescriptorProviderContext(compilation);
 
         // We run after component discovery and depend on the results.
         var componentProvider = new ComponentTagHelperDescriptorProvider();
@@ -184,8 +182,7 @@ public void Execute_BindTagHelperReturnsValuesWhenProvidedNoTargetSymbol()
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
+        var context = new TagHelperDescriptorProviderContext(compilation);
 
         var bindTagHelperProvider = new BindTagHelperDescriptorProvider();
 
@@ -209,11 +206,8 @@ public void Execute_BindTagHelperReturnsValuesWhenProvidedCorrectAssemblyTargetS
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
         var bindConverterSymbol = compilation.GetTypeByMetadataName(ComponentsApi.BindConverter.FullTypeName);
-        context.Items.SetTargetSymbol(bindConverterSymbol.ContainingAssembly);
+        var context = new TagHelperDescriptorProviderContext(compilation, bindConverterSymbol.ContainingAssembly);
 
         var bindTagHelperProvider = new BindTagHelperDescriptorProvider();
 
@@ -237,9 +231,7 @@ public void Execute_BindTagHelperReturnsEmptyWhenCompilationAssemblyTargetSymbol
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-        context.Items.SetTargetSymbol(compilation.Assembly);
+        var context = new TagHelperDescriptorProviderContext(compilation, compilation.Assembly);
 
         var bindTagHelperProvider = new BindTagHelperDescriptorProvider();
 
@@ -281,8 +273,7 @@ public Task SetParametersAsync(ParameterView parameters)
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
+        var context = new TagHelperDescriptorProviderContext(compilation);
 
         // We run after component discovery and depend on the results.
         var componentProvider = new ComponentTagHelperDescriptorProvider();
@@ -432,8 +423,7 @@ public Task SetParametersAsync(ParameterView parameters)
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
+        var context = new TagHelperDescriptorProviderContext(compilation);
 
         // We run after component discovery and depend on the results.
         var componentProvider = new ComponentTagHelperDescriptorProvider();
@@ -468,9 +458,7 @@ public class BindAttributes
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new BindTagHelperDescriptorProvider();
 
         // Act
@@ -729,9 +717,7 @@ public class BindAttributes
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new BindTagHelperDescriptorProvider();
 
         // Act
@@ -814,9 +800,7 @@ public class BindAttributes
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new BindTagHelperDescriptorProvider();
 
         // Act
@@ -890,9 +874,7 @@ public class BindAttributes
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new BindTagHelperDescriptorProvider();
 
         // Act
@@ -987,9 +969,7 @@ public class BindAttributes
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new BindTagHelperDescriptorProvider();
 
         // Act
@@ -1086,9 +1066,7 @@ public class BindAttributes
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new BindTagHelperDescriptorProvider();
 
         // Act
@@ -1115,9 +1093,7 @@ public void Execute_BindFallback_CreatesDescriptor()
         var compilation = BaseCompilation;
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new BindTagHelperDescriptorProvider();
 
         // Act
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor/test/CompilationTagHelperFeatureTest.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor/test/CompilationTagHelperFeatureTest.cs
index 052185a68f6..e93e5617c6e 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor/test/CompilationTagHelperFeatureTest.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor/test/CompilationTagHelperFeatureTest.cs
@@ -70,11 +70,8 @@ public void IsValidCompilation_ReturnsTrueIfWellKnownTypesAreFound()
     public void GetDescriptors_DoesNotSetCompilation_IfCompilationIsInvalid()
     {
         // Arrange
-        Compilation compilation = null;
         var provider = new Mock<ITagHelperDescriptorProvider>();
-        provider.Setup(c => c.Execute(It.IsAny<TagHelperDescriptorProviderContext>()))
-            .Callback<TagHelperDescriptorProviderContext>(c => compilation = c.GetCompilation())
-            .Verifiable();
+        provider.Setup(c => c.Execute(It.IsAny<TagHelperDescriptorProviderContext>()));
 
         var engine = RazorProjectEngine.Create(
             configure =>
@@ -91,8 +88,7 @@ public void GetDescriptors_DoesNotSetCompilation_IfCompilationIsInvalid()
 
         // Assert
         Assert.Empty(result);
-        provider.Verify();
-        Assert.Null(compilation);
+        provider.Verify(c => c.Execute(It.IsAny<TagHelperDescriptorProviderContext>()), Times.Never);
     }
 
     [Fact]
@@ -101,8 +97,9 @@ public void GetDescriptors_SetsCompilation_IfCompilationIsValid()
         // Arrange
         Compilation compilation = null;
         var provider = new Mock<ITagHelperDescriptorProvider>();
-        provider.Setup(c => c.Execute(It.IsAny<TagHelperDescriptorProviderContext>()))
-            .Callback<TagHelperDescriptorProviderContext>(c => compilation = c.GetCompilation())
+        provider
+            .Setup(c => c.Execute(It.IsAny<TagHelperDescriptorProviderContext>()))
+            .Callback<TagHelperDescriptorProviderContext>(c => compilation = c.Compilation)
             .Verifiable();
 
         var references = new[]
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
index 2786fd31756..3a37a47cd1b 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor/test/ComponentTagHelperDescriptorProviderTest.cs
@@ -41,9 +41,7 @@ public Task SetParametersAsync(ParameterView parameters)
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -166,9 +164,7 @@ public Task SetParametersAsync(ParameterView parameters)
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -230,9 +226,7 @@ public class MyComponent : ComponentBase
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -272,9 +266,7 @@ public class MyComponent : ComponentBase
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -312,9 +304,7 @@ public class MyComponent : ComponentBase
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -352,9 +342,7 @@ public class MyComponent : ComponentBase
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -405,9 +393,7 @@ public class MyComponent : ComponentBase
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -453,9 +439,7 @@ public class MyComponent : ComponentBase
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -501,9 +485,7 @@ public class MyComponent<T> : ComponentBase
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -565,9 +547,7 @@ public class MyComponent<T, U, V> : ComponentBase
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -640,9 +620,7 @@ public class MyComponent : ComponentBase
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -690,9 +668,7 @@ public class MyComponent<T> : ComponentBase
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -752,9 +728,7 @@ public class MyComponent : ComponentBase
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -803,9 +777,7 @@ public class MyComponent : ComponentBase
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -858,9 +830,7 @@ public class MyComponent<T> : ComponentBase
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -921,9 +891,7 @@ public class MyComponent : ComponentBase
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -978,9 +946,7 @@ public class MyComponent : ComponentBase
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -1053,9 +1019,7 @@ public class MyComponent : ComponentBase
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -1125,9 +1089,7 @@ public class MyComponent<T> : ComponentBase
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -1207,9 +1169,7 @@ public class MyComponent<T> : ComponentBase
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -1289,9 +1249,7 @@ public class MyComponent<T> : ComponentBase
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -1375,9 +1333,7 @@ public class Context
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -1461,9 +1417,7 @@ public class MyComponent : ComponentBase
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -1553,9 +1507,7 @@ public string this[int i]
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -1609,9 +1561,7 @@ public class MyDerivedComponent2 : MyDerivedComponent1
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -1669,9 +1619,10 @@ public Task SetParametersAsync(ParameterView parameters)
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-        context.Items.SetTargetSymbol((IAssemblySymbol)compilation.GetAssemblyOrModuleSymbol(compilation.References.First(r => r.Display.Contains("Microsoft.CodeAnalysis.Razor.Test.dll"))));
+        var targetSymbol = (IAssemblySymbol)compilation.GetAssemblyOrModuleSymbol(
+            compilation.References.First(static r => r.Display.Contains("Microsoft.CodeAnalysis.Razor.Test.dll")));
+
+        var context = new TagHelperDescriptorProviderContext(compilation, targetSymbol);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
@@ -1715,8 +1666,7 @@ public Task SetParametersAsync(ParameterView parameters)
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new ComponentTagHelperDescriptorProvider();
 
         // Act
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor/test/DefaultTagHelperDescriptorProviderTest.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor/test/DefaultTagHelperDescriptorProviderTest.cs
index eec507e0ae8..f5d46a59aec 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor/test/DefaultTagHelperDescriptorProviderTest.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor/test/DefaultTagHelperDescriptorProviderTest.cs
@@ -3,10 +3,8 @@
 
 #nullable disable
 
-using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
-using System.Threading;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis.CSharp;
 using Xunit;
@@ -25,9 +23,10 @@ public void Execute_DoesNotAddEditorBrowsableNeverDescriptorsAtDesignTime()
         var compilation = TestCompilation.Create(_assembly);
         var descriptorProvider = new DefaultTagHelperDescriptorProvider();
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-        context.ExcludeHidden = true;
+        var context = new TagHelperDescriptorProviderContext(compilation)
+        {
+            ExcludeHidden = true
+        };
 
         // Act
         descriptorProvider.Execute(context);
@@ -40,21 +39,6 @@ public void Execute_DoesNotAddEditorBrowsableNeverDescriptorsAtDesignTime()
         Assert.Empty(editorBrowsableDescriptor);
     }
 
-    [Fact]
-    public void Execute_NoOpsIfCompilationIsNotSet()
-    {
-        // Arrange
-        var descriptorProvider = new DefaultTagHelperDescriptorProvider();
-
-        var context = TagHelperDescriptorProviderContext.Create();
-
-        // Act
-        descriptorProvider.Execute(context);
-
-        // Assert
-        Assert.Empty(context.Results);
-    }
-
     [Fact]
     public void Execute_WithDefaultDiscoversTagHelpersFromAssemblyAndReference()
     {
@@ -73,8 +57,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output) {
         var compilation = TestCompilation.Create(_assembly, CSharpSyntaxTree.ParseText(csharp));
         var descriptorProvider = new DefaultTagHelperDescriptorProvider();
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
+        var context = new TagHelperDescriptorProviderContext(compilation);
 
         // Act
         descriptorProvider.Execute(context);
@@ -104,9 +87,10 @@ public override void Process(TagHelperContext context, TagHelperOutput output) {
         var compilation = TestCompilation.Create(_assembly, CSharpSyntaxTree.ParseText(csharp));
         var descriptorProvider = new DefaultTagHelperDescriptorProvider();
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-        context.Items.SetTargetSymbol((IAssemblySymbol)compilation.GetAssemblyOrModuleSymbol(compilation.References.First(r => r.Display.Contains("Microsoft.CodeAnalysis.Razor.Test.dll"))));
+        var targetSymbol = (IAssemblySymbol)compilation.GetAssemblyOrModuleSymbol(
+            compilation.References.First(static r => r.Display.Contains("Microsoft.CodeAnalysis.Razor.Test.dll")));
+
+        var context = new TagHelperDescriptorProviderContext(compilation, targetSymbol);
 
         // Act
         descriptorProvider.Execute(context);
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
index b5d097adc6d..101927ad544 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor/test/EventHandlerTagHelperDescriptorProviderTest.cs
@@ -33,9 +33,7 @@ public class EventHandlers
 
         Assert.Empty(compilation.GetDiagnostics());
 
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(compilation);
-
+        var context = new TagHelperDescriptorProviderContext(compilation);
         var provider = new EventHandlerTagHelperDescriptorProvider();
 
         // Act
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor/test/KeyTagHelperDescriptorProviderTest.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor/test/KeyTagHelperDescriptorProviderTest.cs
index 8d3fbc8a7a7..a9238bd8afe 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor/test/KeyTagHelperDescriptorProviderTest.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor/test/KeyTagHelperDescriptorProviderTest.cs
@@ -16,9 +16,7 @@ public class KeyTagHelperDescriptorProviderTest : TagHelperDescriptorProviderTes
     public void Execute_CreatesDescriptor()
     {
         // Arrange
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(BaseCompilation);
-
+        var context = new TagHelperDescriptorProviderContext(BaseCompilation);
         var provider = new KeyTagHelperDescriptorProvider();
 
         // Act
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
index 82246df560e..5109439c9cf 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor/test/RefTagHelperDescriptorProviderTest.cs
@@ -16,9 +16,7 @@ public class RefTagHelperDescriptorProviderTest : TagHelperDescriptorProviderTes
     public void Execute_CreatesDescriptor()
     {
         // Arrange
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(BaseCompilation);
-
+        var context = new TagHelperDescriptorProviderContext(BaseCompilation);
         var provider = new RefTagHelperDescriptorProvider();
 
         // Act
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor/test/SplatTagHelperDescriptorProviderTest.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor/test/SplatTagHelperDescriptorProviderTest.cs
index 66e5380a54c..19e2c970bfd 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor/test/SplatTagHelperDescriptorProviderTest.cs
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor/test/SplatTagHelperDescriptorProviderTest.cs
@@ -16,9 +16,7 @@ public class SplatTagHelperDescriptorProviderTest : TagHelperDescriptorProviderT
     public void Execute_CreatesDescriptor()
     {
         // Arrange
-        var context = TagHelperDescriptorProviderContext.Create();
-        context.SetCompilation(BaseCompilation);
-
+        var context = new TagHelperDescriptorProviderContext(BaseCompilation);
         var provider = new SplatTagHelperDescriptorProvider();
 
         // Act
diff --git a/src/Compiler/perf/Microbenchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks.Compiler.csproj b/src/Compiler/perf/Microbenchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks.Compiler.csproj
index 1db9307113d..ff25b1f3ace 100644
--- a/src/Compiler/perf/Microbenchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks.Compiler.csproj
+++ b/src/Compiler/perf/Microbenchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks.Compiler.csproj
@@ -13,6 +13,7 @@
     <ProjectReference Include="..\..\Microsoft.CodeAnalysis.Razor.Compiler\src\Microsoft.CodeAnalysis.Razor.Compiler.csproj" />
     <PackageReference Include="BenchmarkDotNet" />
     <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="System.Security.Cryptography.Xml" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Compiler/perf/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator.csproj b/src/Compiler/perf/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator.csproj
index 67034ffdb99..aebe9633fef 100644
--- a/src/Compiler/perf/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator.csproj
+++ b/src/Compiler/perf/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator/Microsoft.AspNetCore.Razor.Microbenchmarks.Generator.csproj
@@ -21,8 +21,10 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" />
     <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" VersionOverride="$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" VersionOverride="$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" VersionOverride="$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" VersionOverride="$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" />
     <PackageReference Include="Microsoft.Build.Locator" />
     <PackageReference Include="System.Security.Cryptography.Xml" />
   </ItemGroup>
diff --git a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/Microsoft.NET.Sdk.Razor.SourceGenerators.Test.csproj b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/Microsoft.NET.Sdk.Razor.SourceGenerators.Test.csproj
index 73ee7b956d3..4d1acf312b7 100644
--- a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/Microsoft.NET.Sdk.Razor.SourceGenerators.Test.csproj
+++ b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/Microsoft.NET.Sdk.Razor.SourceGenerators.Test.csproj
@@ -25,6 +25,8 @@
     <PackageReference Include="Microsoft.Build.Framework" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" />
     <PackageReference Include="Moq" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" VersionOverride="$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" VersionOverride="$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" VersionOverride="$(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion)" />
     <PackageReference Include="xunit.extensibility.execution" />
   </ItemGroup>
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 8f8a680ae8f..efeead6a96e 100644
--- a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorCodeActionsBenchmark.cs
+++ b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorCodeActionsBenchmark.cs
@@ -49,7 +49,7 @@ public enum FileTypes
     public async Task SetupAsync()
     {
         CodeActionEndpoint = new CodeActionEndpoint(
-            documentMappingService: RazorLanguageServerHost.GetRequiredService<IRazorDocumentMappingService>(),
+            documentMappingService: RazorLanguageServerHost.GetRequiredService<IDocumentMappingService>(),
             razorCodeActionProviders: RazorLanguageServerHost.GetRequiredService<IEnumerable<IRazorCodeActionProvider>>(),
             csharpCodeActionProviders: RazorLanguageServerHost.GetRequiredService<IEnumerable<ICSharpCodeActionProvider>>(),
             htmlCodeActionProviders: RazorLanguageServerHost.GetRequiredService<IEnumerable<IHtmlCodeActionProvider>>(),
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 f9baad11704..0bf6c9fea83 100644
--- a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorCompletionBenchmark.cs
+++ b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorCompletionBenchmark.cs
@@ -38,7 +38,7 @@ public async Task SetupAsync()
         var razorCompletionListProvider = RazorLanguageServerHost.GetRequiredService<RazorCompletionListProvider>();
         var lspServices = RazorLanguageServerHost.GetRequiredService<ILspServices>();
         var responseRewriters = lspServices.GetRequiredServices<DelegatedCompletionResponseRewriter>();
-        var documentMappingService = lspServices.GetRequiredService<IRazorDocumentMappingService>();
+        var documentMappingService = lspServices.GetRequiredService<IDocumentMappingService>();
         var clientConnection = lspServices.GetRequiredService<IClientConnection>();
         var completionListCache = lspServices.GetRequiredService<CompletionListCache>();
         var loggerFactory = lspServices.GetRequiredService<ILoggerFactory>();
@@ -141,7 +141,7 @@ public async Task RazorCompletionAsync()
 
     private class TestDelegatedCompletionListProvider : DelegatedCompletionListProvider
     {
-        public TestDelegatedCompletionListProvider(IEnumerable<DelegatedCompletionResponseRewriter> responseRewriters, IRazorDocumentMappingService documentMappingService, IClientConnection clientConnection, CompletionListCache completionListCache)
+        public TestDelegatedCompletionListProvider(IEnumerable<DelegatedCompletionResponseRewriter> responseRewriters, IDocumentMappingService documentMappingService, IClientConnection clientConnection, CompletionListCache completionListCache)
             : base(responseRewriters, documentMappingService, clientConnection, completionListCache)
         {
         }
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 7cb21677aa5..9e50156d7f5 100644
--- a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorDiagnosticsBenchmark.cs
+++ b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorDiagnosticsBenchmark.cs
@@ -115,9 +115,9 @@ private protected override LanguageServerFeatureOptions BuildFeatureOptions()
             MockBehavior.Strict);
     }
 
-    private IRazorDocumentMappingService BuildRazorDocumentMappingService()
+    private IDocumentMappingService BuildRazorDocumentMappingService()
     {
-        var razorDocumentMappingService = new Mock<IRazorDocumentMappingService>(MockBehavior.Strict);
+        var razorDocumentMappingService = new Mock<IDocumentMappingService>(MockBehavior.Strict);
 
         Range? hostDocumentRange;
         razorDocumentMappingService.Setup(
diff --git a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorDocumentMappingBenchmark.cs b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorDocumentMappingBenchmark.cs
index d489b9ec124..c3371b04891 100644
--- a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorDocumentMappingBenchmark.cs
+++ b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorDocumentMappingBenchmark.cs
@@ -19,7 +19,7 @@ public class RazorDocumentMappingBenchmark : RazorLanguageServerBenchmarkBase
 {
     private string _filePath;
 
-    private IRazorDocumentMappingService DocumentMappingService { get; set; }
+    private IDocumentMappingService DocumentMappingService { get; set; }
 
     private IDocumentSnapshot DocumentSnapshot { get; set; }
 
@@ -171,6 +171,6 @@ public async Task CleanupServerAsync()
 
     private void EnsureServicesInitialized()
     {
-        DocumentMappingService = RazorLanguageServerHost.GetRequiredService<IRazorDocumentMappingService>();
+        DocumentMappingService = RazorLanguageServerHost.GetRequiredService<IDocumentMappingService>();
     }
 }
diff --git a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorSemanticTokensBenchmark.cs b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorSemanticTokensBenchmark.cs
index 6f053edeadc..d7825241214 100644
--- a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorSemanticTokensBenchmark.cs
+++ b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorSemanticTokensBenchmark.cs
@@ -108,7 +108,7 @@ internal class TestRazorSemanticTokensInfoService : RazorSemanticTokensInfoServi
     {
         public TestRazorSemanticTokensInfoService(
             LanguageServerFeatureOptions languageServerFeatureOptions,
-            IRazorDocumentMappingService documentMappingService,
+            IDocumentMappingService documentMappingService,
             RazorSemanticTokensLegendService razorSemanticTokensLegendService,
             ILoggerFactory loggerFactory)
             : base(documentMappingService, razorSemanticTokensLegendService, csharpSemanticTokensProvider: null!, languageServerFeatureOptions, loggerFactory)
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 6bd676543de..8258f197fc8 100644
--- a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorSemanticTokensRangeEndpointBenchmark.cs
+++ b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorSemanticTokensRangeEndpointBenchmark.cs
@@ -140,7 +140,7 @@ internal class TestCustomizableRazorSemanticTokensInfoService : RazorSemanticTok
     {
         public TestCustomizableRazorSemanticTokensInfoService(
             LanguageServerFeatureOptions languageServerFeatureOptions,
-            IRazorDocumentMappingService documentMappingService,
+            IDocumentMappingService documentMappingService,
             RazorSemanticTokensLegendService razorSemanticTokensLegendService,
             ILoggerFactory loggerFactory)
             : base(documentMappingService, razorSemanticTokensLegendService, csharpSemanticTokensProvider: null!, languageServerFeatureOptions, loggerFactory)
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/AbstractRazorDelegatingEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/AbstractRazorDelegatingEndpoint.cs
index 88574c846ba..dfef778fe71 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/AbstractRazorDelegatingEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/AbstractRazorDelegatingEndpoint.cs
@@ -22,13 +22,13 @@ internal abstract class AbstractRazorDelegatingEndpoint<TRequest, TResponse> : I
    where TRequest : ITextDocumentPositionParams
 {
     private readonly LanguageServerFeatureOptions _languageServerFeatureOptions;
-    private readonly IRazorDocumentMappingService _documentMappingService;
+    private readonly IDocumentMappingService _documentMappingService;
     private readonly IClientConnection _clientConnection;
     protected readonly ILogger Logger;
 
     protected AbstractRazorDelegatingEndpoint(
         LanguageServerFeatureOptions languageServerFeatureOptions,
-        IRazorDocumentMappingService documentMappingService,
+        IDocumentMappingService documentMappingService,
         IClientConnection clientConnection,
         ILogger logger)
     {
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/AutoInsert/OnAutoInsertEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/AutoInsert/OnAutoInsertEndpoint.cs
index ea7d46e8e45..30565f8c181 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/AutoInsert/OnAutoInsertEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/AutoInsert/OnAutoInsertEndpoint.cs
@@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.AutoInsert;
 [RazorLanguageServerEndpoint(VSInternalMethods.OnAutoInsertName)]
 internal class OnAutoInsertEndpoint(
     LanguageServerFeatureOptions languageServerFeatureOptions,
-    IRazorDocumentMappingService documentMappingService,
+    IDocumentMappingService documentMappingService,
     IClientConnection clientConnection,
     IEnumerable<IOnAutoInsertProvider> onAutoInsertProvider,
     RazorLSPOptionsMonitor optionsMonitor,
@@ -170,7 +170,7 @@ public void ApplyCapabilities(VSInternalServerCapabilities serverCapabilities, V
         }
 
         return Task.FromResult<IDelegatedParams?>(new DelegatedOnAutoInsertParams(
-            documentContext.Identifier,
+            documentContext.GetTextDocumentIdentifierAndVersion(),
             positionInfo.Position,
             positionInfo.LanguageKind,
             request.Character,
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/AutoInsert/PreferHtmlInAttributeValuesDocumentPositionStrategy.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/AutoInsert/PreferHtmlInAttributeValuesDocumentPositionStrategy.cs
index 3169a1d7648..8df88d48145 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/AutoInsert/PreferHtmlInAttributeValuesDocumentPositionStrategy.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/AutoInsert/PreferHtmlInAttributeValuesDocumentPositionStrategy.cs
@@ -20,7 +20,7 @@ internal class PreferHtmlInAttributeValuesDocumentPositionInfoStrategy : IDocume
 {
     public static IDocumentPositionInfoStrategy Instance { get; } = new PreferHtmlInAttributeValuesDocumentPositionInfoStrategy();
 
-    public async Task<DocumentPositionInfo?> TryGetPositionInfoAsync(IRazorDocumentMappingService documentMappingService, DocumentContext documentContext, Position position, CancellationToken cancellationToken)
+    public async Task<DocumentPositionInfo?> TryGetPositionInfoAsync(IDocumentMappingService documentMappingService, DocumentContext documentContext, Position position, CancellationToken cancellationToken)
     {
         var defaultDocumentPositionInfo = await DefaultDocumentPositionInfoStrategy.Instance.TryGetPositionInfoAsync(documentMappingService, documentContext, position, cancellationToken).ConfigureAwait(false);
         if (defaultDocumentPositionInfo is null)
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/CSharp/UnformattedRemappingCSharpCodeActionResolver.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/CSharp/UnformattedRemappingCSharpCodeActionResolver.cs
index df9aaf7fe45..964f576f653 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/CSharp/UnformattedRemappingCSharpCodeActionResolver.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/CSharp/UnformattedRemappingCSharpCodeActionResolver.cs
@@ -23,10 +23,10 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.CodeActions;
 internal sealed class UnformattedRemappingCSharpCodeActionResolver(
     IDocumentContextFactory documentContextFactory,
     IClientConnection clientConnection,
-    IRazorDocumentMappingService documentMappingService) : CSharpCodeActionResolver(clientConnection)
+    IDocumentMappingService documentMappingService) : CSharpCodeActionResolver(clientConnection)
 {
     private readonly IDocumentContextFactory _documentContextFactory = documentContextFactory;
-    private readonly IRazorDocumentMappingService _documentMappingService = documentMappingService;
+    private readonly IDocumentMappingService _documentMappingService = documentMappingService;
 
     public override string Action => LanguageServerConstants.CodeActions.UnformattedRemap;
 
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/CodeActionEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/CodeActionEndpoint.cs
index 124f3fc5935..4a72ea63208 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/CodeActionEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/CodeActionEndpoint.cs
@@ -30,7 +30,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.CodeActions;
 
 [RazorLanguageServerEndpoint(LspEndpointName)]
 internal sealed class CodeActionEndpoint(
-    IRazorDocumentMappingService documentMappingService,
+    IDocumentMappingService documentMappingService,
     IEnumerable<IRazorCodeActionProvider> razorCodeActionProviders,
     IEnumerable<ICSharpCodeActionProvider> csharpCodeActionProviders,
     IEnumerable<IHtmlCodeActionProvider> htmlCodeActionProviders,
@@ -42,7 +42,7 @@ internal sealed class CodeActionEndpoint(
 {
     private const string LspEndpointName = Methods.TextDocumentCodeActionName;
 
-    private readonly IRazorDocumentMappingService _documentMappingService = documentMappingService ?? throw new ArgumentNullException(nameof(documentMappingService));
+    private readonly IDocumentMappingService _documentMappingService = documentMappingService ?? throw new ArgumentNullException(nameof(documentMappingService));
     private readonly IEnumerable<IRazorCodeActionProvider> _razorCodeActionProviders = razorCodeActionProviders ?? throw new ArgumentNullException(nameof(razorCodeActionProviders));
     private readonly IEnumerable<ICSharpCodeActionProvider> _csharpCodeActionProviders = csharpCodeActionProviders ?? throw new ArgumentNullException(nameof(csharpCodeActionProviders));
     private readonly IEnumerable<IHtmlCodeActionProvider> _htmlCodeActionProviders = htmlCodeActionProviders ?? throw new ArgumentNullException(nameof(htmlCodeActionProviders));
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Html/DefaultHtmlCodeActionProvider.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Html/DefaultHtmlCodeActionProvider.cs
index 5f7f6d007e0..87ecec1b541 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Html/DefaultHtmlCodeActionProvider.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Html/DefaultHtmlCodeActionProvider.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
-using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Threading;
 using System.Threading.Tasks;
@@ -14,9 +13,9 @@
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.CodeActions;
 
-internal sealed class DefaultHtmlCodeActionProvider(IRazorDocumentMappingService documentMappingService) : IHtmlCodeActionProvider
+internal sealed class DefaultHtmlCodeActionProvider(IEditMappingService editMappingService) : IHtmlCodeActionProvider
 {
-    private readonly IRazorDocumentMappingService _documentMappingService = documentMappingService;
+    private readonly IEditMappingService _editMappingService = editMappingService;
 
     public async Task<ImmutableArray<RazorVSInternalCodeAction>> ProvideAsync(
         RazorCodeActionContext context,
@@ -28,7 +27,7 @@ public async Task<ImmutableArray<RazorVSInternalCodeAction>> ProvideAsync(
         {
             if (codeAction.Edit is not null)
             {
-                await RemapAndFixHtmlCodeActionEditAsync(_documentMappingService, context.CodeDocument, codeAction, cancellationToken).ConfigureAwait(false);
+                await RemapAndFixHtmlCodeActionEditAsync(_editMappingService, context.CodeDocument, codeAction, cancellationToken).ConfigureAwait(false);
 
                 results.Add(codeAction);
             }
@@ -41,11 +40,11 @@ public async Task<ImmutableArray<RazorVSInternalCodeAction>> ProvideAsync(
         return results.ToImmutable();
     }
 
-    public static async Task RemapAndFixHtmlCodeActionEditAsync(IRazorDocumentMappingService documentMappingService, RazorCodeDocument codeDocument, CodeAction codeAction, CancellationToken cancellationToken)
+    public static async Task RemapAndFixHtmlCodeActionEditAsync(IEditMappingService editMappingService, RazorCodeDocument codeDocument, CodeAction codeAction, CancellationToken cancellationToken)
     {
         Assumes.NotNull(codeAction.Edit);
 
-        codeAction.Edit = await documentMappingService.RemapWorkspaceEditAsync(codeAction.Edit, cancellationToken).ConfigureAwait(false);
+        codeAction.Edit = await editMappingService.RemapWorkspaceEditAsync(codeAction.Edit, cancellationToken).ConfigureAwait(false);
 
         if (codeAction.Edit.TryGetDocumentChanges(out var documentEdits) == true)
         {
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Html/DefaultHtmlCodeActionResolver.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Html/DefaultHtmlCodeActionResolver.cs
index 604f02a3458..0fce29fdc6f 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Html/DefaultHtmlCodeActionResolver.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Html/DefaultHtmlCodeActionResolver.cs
@@ -16,10 +16,10 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.CodeActions;
 internal sealed class DefaultHtmlCodeActionResolver(
     IDocumentContextFactory documentContextFactory,
     IClientConnection clientConnection,
-    IRazorDocumentMappingService documentMappingService) : HtmlCodeActionResolver(clientConnection)
+    IEditMappingService editMappingService) : HtmlCodeActionResolver(clientConnection)
 {
     private readonly IDocumentContextFactory _documentContextFactory = documentContextFactory;
-    private readonly IRazorDocumentMappingService _documentMappingService = documentMappingService;
+    private readonly IEditMappingService _editMappingService = editMappingService;
 
     public override string Action => LanguageServerConstants.CodeActions.Default;
 
@@ -41,7 +41,7 @@ public async override Task<CodeAction> ResolveAsync(
         }
 
         var codeDocument = await documentContext.GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
-        await DefaultHtmlCodeActionProvider.RemapAndFixHtmlCodeActionEditAsync(_documentMappingService, codeDocument, resolvedCodeAction, cancellationToken).ConfigureAwait(false);
+        await DefaultHtmlCodeActionProvider.RemapAndFixHtmlCodeActionEditAsync(_editMappingService, codeDocument, resolvedCodeAction, cancellationToken).ConfigureAwait(false);
 
         return resolvedCodeAction;
     }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Razor/ComponentAccessibilityCodeActionProvider.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Razor/ComponentAccessibilityCodeActionProvider.cs
index 1404d1910a9..2e8ec37c2f9 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Razor/ComponentAccessibilityCodeActionProvider.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Razor/ComponentAccessibilityCodeActionProvider.cs
@@ -16,6 +16,7 @@
 using Microsoft.AspNetCore.Razor.PooledObjects;
 using Microsoft.AspNetCore.Razor.Utilities;
 using Microsoft.CodeAnalysis.Razor;
+using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.VisualStudio.Editor.Razor;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 
@@ -157,7 +158,7 @@ private static async Task AddComponentAccessFromTagAsync(RazorCodeActionContext
             {
                 // if fqn contains a generic typeparam, we should strip it out. Otherwise, replacing tag name will leave generic parameters in razor code, which are illegal
                 // e.g. <Component /> -> <Component<T> />
-                var fullyQualifiedName = DefaultRazorComponentSearchEngine.RemoveGenericContent(tagHelperPair.Short.Name.AsMemory()).ToString();
+                var fullyQualifiedName = RazorComponentSearchEngine.RemoveGenericContent(tagHelperPair.Short.Name.AsMemory()).ToString();
 
                 // If the match was case insensitive, then see if we can work out a new tag name to use as part of adding a using statement
                 TextDocumentEdit? additionalEdit = null;
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Razor/GenerateMethodCodeActionResolver.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Razor/GenerateMethodCodeActionResolver.cs
index f79fe80a516..86af5075d71 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Razor/GenerateMethodCodeActionResolver.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Razor/GenerateMethodCodeActionResolver.cs
@@ -29,13 +29,13 @@ internal sealed class GenerateMethodCodeActionResolver(
     IDocumentContextFactory documentContextFactory,
     RazorLSPOptionsMonitor razorLSPOptionsMonitor,
     IClientConnection clientConnection,
-    IRazorDocumentMappingService razorDocumentMappingService,
+    IDocumentMappingService documentMappingService,
     IRazorFormattingService razorFormattingService) : IRazorCodeActionResolver
 {
     private readonly IDocumentContextFactory _documentContextFactory = documentContextFactory;
     private readonly RazorLSPOptionsMonitor _razorLSPOptionsMonitor = razorLSPOptionsMonitor;
     private readonly IClientConnection _clientConnection = clientConnection;
-    private readonly IRazorDocumentMappingService _documentMappingService = razorDocumentMappingService;
+    private readonly IDocumentMappingService _documentMappingService = documentMappingService;
     private readonly IRazorFormattingService _razorFormattingService = razorFormattingService;
 
     private const string ReturnType = "$$ReturnType$$";
@@ -166,7 +166,7 @@ private async Task<WorkspaceEdit> GenerateMethodInCodeBlockAsync(
                 character: 0,
                 editToSendToRoslyn.NewText);
 
-            var delegatedParams = new DelegatedSimplifyMethodParams(documentContext.Identifier, RequiresVirtualDocument: true, tempTextEdit);
+            var delegatedParams = new DelegatedSimplifyMethodParams(documentContext.GetTextDocumentIdentifierAndVersion(), RequiresVirtualDocument: true, tempTextEdit);
             var result = await _clientConnection.SendRequestAsync<DelegatedSimplifyMethodParams, TextEdit[]?>(
                 CustomMessageNames.RazorSimplifyMethodEndpointName,
                 delegatedParams,
@@ -194,7 +194,7 @@ private async Task<WorkspaceEdit> GenerateMethodInCodeBlockAsync(
 
             var remappedEdit = VsLspFactory.CreateTextEdit(remappedRange, unformattedMethodSignature);
 
-            var delegatedParams = new DelegatedSimplifyMethodParams(documentContext.Identifier, RequiresVirtualDocument: true, remappedEdit);
+            var delegatedParams = new DelegatedSimplifyMethodParams(documentContext.GetTextDocumentIdentifierAndVersion(), RequiresVirtualDocument: true, remappedEdit);
             var result = await _clientConnection.SendRequestAsync<DelegatedSimplifyMethodParams, TextEdit[]?>(
                 CustomMessageNames.RazorSimplifyMethodEndpointName,
                 delegatedParams,
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/Delegation/DelegatedCompletionItemResolver.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/Delegation/DelegatedCompletionItemResolver.cs
index 7d58f7bfbd6..f977eb4b4ff 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/Delegation/DelegatedCompletionItemResolver.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/Delegation/DelegatedCompletionItemResolver.cs
@@ -105,7 +105,13 @@ private async Task<VSInternalCompletionItem> PostProcessCompletionItemAsync(
             return resolvedCompletionItem;
         }
 
-        var formattingOptions = await _clientConnection.SendRequestAsync<TextDocumentIdentifierAndVersion, FormattingOptions?>(CodeAnalysis.Razor.Protocol.LanguageServerConstants.RazorGetFormattingOptionsEndpointName, documentContext.Identifier, cancellationToken).ConfigureAwait(false);
+        var formattingOptions = await _clientConnection
+            .SendRequestAsync<TextDocumentIdentifierAndVersion, FormattingOptions?>(
+                LanguageServerConstants.RazorGetFormattingOptionsEndpointName,
+                documentContext.GetTextDocumentIdentifierAndVersion(),
+                cancellationToken)
+            .ConfigureAwait(false);
+
         if (formattingOptions is null)
         {
             return resolvedCompletionItem;
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/Delegation/DelegatedCompletionListProvider.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/Delegation/DelegatedCompletionListProvider.cs
index e830fee0ff0..2c8e023b46d 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/Delegation/DelegatedCompletionListProvider.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/Delegation/DelegatedCompletionListProvider.cs
@@ -28,13 +28,13 @@ internal class DelegatedCompletionListProvider
             .Union(s_razorTriggerCharacters);
 
     private readonly ImmutableArray<DelegatedCompletionResponseRewriter> _responseRewriters;
-    private readonly IRazorDocumentMappingService _documentMappingService;
+    private readonly IDocumentMappingService _documentMappingService;
     private readonly IClientConnection _clientConnection;
     private readonly CompletionListCache _completionListCache;
 
     public DelegatedCompletionListProvider(
         IEnumerable<DelegatedCompletionResponseRewriter> responseRewriters,
-        IRazorDocumentMappingService documentMappingService,
+        IDocumentMappingService documentMappingService,
         IClientConnection clientConnection,
         CompletionListCache completionListCache)
     {
@@ -77,7 +77,7 @@ public DelegatedCompletionListProvider(
         var shouldIncludeSnippets = await ShouldIncludeSnippetsAsync(documentContext, absoluteIndex, cancellationToken).ConfigureAwait(false);
 
         var delegatedParams = new DelegatedCompletionParams(
-            documentContext.Identifier,
+            documentContext.GetTextDocumentIdentifierAndVersion(),
             positionInfo.Position,
             positionInfo.LanguageKind,
             completionContext,
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Debugging/RazorBreakpointSpanEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Debugging/RazorBreakpointSpanEndpoint.cs
index f28856851d3..1bcb7c82ec0 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Debugging/RazorBreakpointSpanEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Debugging/RazorBreakpointSpanEndpoint.cs
@@ -21,13 +21,13 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Debugging;
 [RazorLanguageServerEndpoint(LanguageServerConstants.RazorBreakpointSpanEndpoint)]
 internal class RazorBreakpointSpanEndpoint : IRazorDocumentlessRequestHandler<RazorBreakpointSpanParams, RazorBreakpointSpanResponse?>, ITextDocumentIdentifierHandler<RazorBreakpointSpanParams, Uri>
 {
-    private readonly IRazorDocumentMappingService _documentMappingService;
+    private readonly IDocumentMappingService _documentMappingService;
     private readonly ILogger _logger;
 
     public bool MutatesSolutionState => false;
 
     public RazorBreakpointSpanEndpoint(
-        IRazorDocumentMappingService documentMappingService,
+        IDocumentMappingService documentMappingService,
         ILoggerFactory loggerFactory)
     {
         if (loggerFactory is null)
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Debugging/RazorProximityExpressionsEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Debugging/RazorProximityExpressionsEndpoint.cs
index cf6700e9a68..844da19f1a8 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Debugging/RazorProximityExpressionsEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Debugging/RazorProximityExpressionsEndpoint.cs
@@ -22,11 +22,11 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Debugging;
 [RazorLanguageServerEndpoint(LanguageServerConstants.RazorProximityExpressionsEndpoint)]
 internal class RazorProximityExpressionsEndpoint : IRazorDocumentlessRequestHandler<RazorProximityExpressionsParams, RazorProximityExpressionsResponse?>, ITextDocumentIdentifierHandler<RazorProximityExpressionsParams, Uri>
 {
-    private readonly IRazorDocumentMappingService _documentMappingService;
+    private readonly IDocumentMappingService _documentMappingService;
     private readonly ILogger _logger;
 
     public RazorProximityExpressionsEndpoint(
-        IRazorDocumentMappingService documentMappingService,
+        IDocumentMappingService documentMappingService,
         ILoggerFactory loggerFactory)
     {
         if (documentMappingService is null)
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Debugging/ValidateBreakpointRangeEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Debugging/ValidateBreakpointRangeEndpoint.cs
index 5f5c32bb01d..fb811f96c82 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Debugging/ValidateBreakpointRangeEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Debugging/ValidateBreakpointRangeEndpoint.cs
@@ -17,7 +17,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Debugging;
 
 [RazorLanguageServerEndpoint(VSInternalMethods.TextDocumentValidateBreakableRangeName)]
 internal class ValidateBreakpointRangeEndpoint(
-    IRazorDocumentMappingService documentMappingService,
+    IDocumentMappingService documentMappingService,
     LanguageServerFeatureOptions languageServerFeatureOptions,
     IClientConnection clientConnection,
     ILoggerFactory loggerFactory)
@@ -27,7 +27,7 @@ internal class ValidateBreakpointRangeEndpoint(
         clientConnection,
         loggerFactory.GetOrCreateLogger<ValidateBreakpointRangeEndpoint>()), ICapabilitiesProvider
 {
-    private readonly IRazorDocumentMappingService _documentMappingService = documentMappingService;
+    private readonly IDocumentMappingService _documentMappingService = documentMappingService;
 
     protected override bool OnlySingleServer => false;
 
@@ -67,7 +67,7 @@ public void ApplyCapabilities(VSInternalServerCapabilities serverCapabilities, V
         }
 
         return new DelegatedValidateBreakpointRangeParams(
-            documentContext.Identifier,
+            documentContext.GetTextDocumentIdentifierAndVersion(),
             projectedRange,
             positionInfo.LanguageKind);
     }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultDocumentPositionInfoStrategy.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultDocumentPositionInfoStrategy.cs
index a9ebe134264..976829713ad 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultDocumentPositionInfoStrategy.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultDocumentPositionInfoStrategy.cs
@@ -15,7 +15,7 @@ internal class DefaultDocumentPositionInfoStrategy : IDocumentPositionInfoStrate
     public static IDocumentPositionInfoStrategy Instance { get; } = new DefaultDocumentPositionInfoStrategy();
 
     public async Task<DocumentPositionInfo?> TryGetPositionInfoAsync(
-        IRazorDocumentMappingService documentMappingService,
+        IDocumentMappingService documentMappingService,
         DocumentContext documentContext,
         Position position,
         CancellationToken cancellationToken)
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 3a6aad8e6f6..304c7729526 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Definition/DefinitionEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Definition/DefinitionEndpoint.cs
@@ -29,15 +29,15 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Definition;
 
 [RazorLanguageServerEndpoint(Methods.TextDocumentDefinitionName)]
 internal sealed class DefinitionEndpoint(
-    RazorComponentSearchEngine componentSearchEngine,
-    IRazorDocumentMappingService documentMappingService,
+    IRazorComponentSearchEngine componentSearchEngine,
+    IDocumentMappingService documentMappingService,
     LanguageServerFeatureOptions languageServerFeatureOptions,
     IClientConnection clientConnection,
     ILoggerFactory loggerFactory)
     : AbstractRazorDelegatingEndpoint<TextDocumentPositionParams, DefinitionResult?>(languageServerFeatureOptions, documentMappingService, clientConnection, loggerFactory.GetOrCreateLogger<DefinitionEndpoint>()), ICapabilitiesProvider
 {
-    private readonly RazorComponentSearchEngine _componentSearchEngine = componentSearchEngine ?? throw new ArgumentNullException(nameof(componentSearchEngine));
-    private readonly IRazorDocumentMappingService _documentMappingService = documentMappingService ?? throw new ArgumentNullException(nameof(documentMappingService));
+    private readonly IRazorComponentSearchEngine _componentSearchEngine = componentSearchEngine;
+    private readonly IDocumentMappingService _documentMappingService = documentMappingService;
 
     protected override bool PreferCSharpOverHtmlIfPossible => true;
 
@@ -73,7 +73,7 @@ public void ApplyCapabilities(VSInternalServerCapabilities serverCapabilities, V
             return default;
         }
 
-        var originComponentDocumentSnapshot = await _componentSearchEngine.TryLocateComponentAsync(originTagDescriptor).ConfigureAwait(false);
+        var originComponentDocumentSnapshot = await _componentSearchEngine.TryLocateComponentAsync(documentContext.Snapshot, originTagDescriptor).ConfigureAwait(false);
         if (originComponentDocumentSnapshot is null)
         {
             Logger.LogInformation($"Origin TagHelper document snapshot is null.");
@@ -112,9 +112,9 @@ public void ApplyCapabilities(VSInternalServerCapabilities serverCapabilities, V
         }
 
         return Task.FromResult<IDelegatedParams?>(new DelegatedPositionParams(
-                documentContext.Identifier,
-                positionInfo.Position,
-                positionInfo.LanguageKind));
+            documentContext.GetTextDocumentIdentifierAndVersion(),
+            positionInfo.Position,
+            positionInfo.LanguageKind));
     }
 
     protected async override Task<DefinitionResult?> HandleDelegatedResponseAsync(DefinitionResult? response, TextDocumentPositionParams originalRequest, RazorRequestContext requestContext, DocumentPositionInfo positionInfo, CancellationToken cancellationToken)
@@ -267,7 +267,7 @@ private async Task<Range> GetNavigateRangeAsync(IDocumentSnapshot documentSnapsh
         return VsLspFactory.DefaultRange;
     }
 
-    internal static async Task<Range?> TryGetPropertyRangeAsync(RazorCodeDocument codeDocument, string propertyName, IRazorDocumentMappingService documentMappingService, ILogger logger, CancellationToken cancellationToken)
+    internal static async Task<Range?> TryGetPropertyRangeAsync(RazorCodeDocument codeDocument, string propertyName, IDocumentMappingService documentMappingService, ILogger logger, CancellationToken cancellationToken)
     {
         // Parse the C# file and find the property that matches the name.
         // We don't worry about parameter attributes here for two main reasons:
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Diagnostics/DocumentPullDiagnosticsEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Diagnostics/DocumentPullDiagnosticsEndpoint.cs
index b4277742608..68d893f9b24 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Diagnostics/DocumentPullDiagnosticsEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Diagnostics/DocumentPullDiagnosticsEndpoint.cs
@@ -147,7 +147,7 @@ public TextDocumentIdentifier GetTextDocumentIdentifier(VSInternalDocumentDiagno
 
     private async Task<(VSInternalDiagnosticReport[]? CSharpDiagnostics, VSInternalDiagnosticReport[]? HtmlDiagnostics)> GetHtmlCSharpDiagnosticsAsync(VersionedDocumentContext documentContext, Guid correlationId, CancellationToken cancellationToken)
     {
-        var delegatedParams = new DelegatedDiagnosticParams(documentContext.Identifier, correlationId);
+        var delegatedParams = new DelegatedDiagnosticParams(documentContext.GetTextDocumentIdentifierAndVersion(), correlationId);
         var delegatedResponse = await _clientConnection.SendRequestAsync<DelegatedDiagnosticParams, RazorPullDiagnosticResponse?>(
             CustomMessageNames.RazorPullDiagnosticEndpointName,
             delegatedParams,
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Diagnostics/RazorTranslateDiagnosticsService.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Diagnostics/RazorTranslateDiagnosticsService.cs
index 7831e806f0b..9efb5b39ee5 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Diagnostics/RazorTranslateDiagnosticsService.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Diagnostics/RazorTranslateDiagnosticsService.cs
@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
 using System;
+using System.Collections.Frozen;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
@@ -28,20 +29,19 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Diagnostics;
 /// Contains several methods for mapping and filtering Razor and C# diagnostics. It allows for
 /// translating code diagnostics from one representation into another, such as from C# to Razor.
 /// </summary>
-/// <param name="documentMappingService">The <see cref="IRazorDocumentMappingService"/>.</param>
+/// <param name="documentMappingService">The <see cref="IDocumentMappingService"/>.</param>
 /// <param name="loggerFactory">The <see cref="ILoggerFactory"/>.</param>
 /// <exception cref="ArgumentNullException"/>
-internal class RazorTranslateDiagnosticsService(IRazorDocumentMappingService documentMappingService, ILoggerFactory loggerFactory)
+internal class RazorTranslateDiagnosticsService(IDocumentMappingService documentMappingService, ILoggerFactory loggerFactory)
 {
     private readonly ILogger _logger = loggerFactory.GetOrCreateLogger<RazorTranslateDiagnosticsService>();
-    private readonly IRazorDocumentMappingService _documentMappingService = documentMappingService;
+    private readonly IDocumentMappingService _documentMappingService = documentMappingService;
 
-    // Internal for testing
-    internal static readonly IReadOnlyCollection<string> CSharpDiagnosticsToIgnore = new HashSet<string>()
-    {
+    private static readonly FrozenSet<string> s_cSharpDiagnosticsToIgnore = new HashSet<string>(
+    [
         "RemoveUnnecessaryImportsFixable",
         "IDE0005_gen", // Using directive is unnecessary
-    };
+    ]).ToFrozenSet();
 
     /// <summary>
     /// Translates code diagnostics from one representation into another.
@@ -64,11 +64,9 @@ internal async Task<Diagnostic[]> TranslateAsync(
             return [];
         }
 
-        var sourceText = await documentContext.GetSourceTextAsync(cancellationToken).ConfigureAwait(false);
-
         var filteredDiagnostics = diagnosticKind == RazorLanguageKind.CSharp
-            ? FilterCSharpDiagnostics(diagnostics, codeDocument, sourceText)
-            : FilterHTMLDiagnostics(diagnostics, codeDocument, sourceText);
+            ? FilterCSharpDiagnostics(diagnostics, codeDocument)
+            : FilterHTMLDiagnostics(diagnostics, codeDocument);
         if (filteredDiagnostics.Length == 0)
         {
             _logger.LogDebug($"No diagnostics remaining after filtering.");
@@ -81,24 +79,23 @@ internal async Task<Diagnostic[]> TranslateAsync(
             diagnosticKind,
             filteredDiagnostics,
             documentContext.Snapshot,
-            codeDocument,
-            sourceText);
+            codeDocument);
 
         return mappedDiagnostics;
     }
 
-    private Diagnostic[] FilterCSharpDiagnostics(Diagnostic[] unmappedDiagnostics, RazorCodeDocument codeDocument, SourceText sourceText)
+    private Diagnostic[] FilterCSharpDiagnostics(Diagnostic[] unmappedDiagnostics, RazorCodeDocument codeDocument)
     {
         return unmappedDiagnostics.Where(d =>
-            !ShouldFilterCSharpDiagnosticBasedOnErrorCode(d, codeDocument, sourceText)).ToArray();
+            !ShouldFilterCSharpDiagnosticBasedOnErrorCode(d, codeDocument)).ToArray();
     }
 
     private static Diagnostic[] FilterHTMLDiagnostics(
         Diagnostic[] unmappedDiagnostics,
-        RazorCodeDocument codeDocument,
-        SourceText sourceText)
+        RazorCodeDocument codeDocument)
     {
         var syntaxTree = codeDocument.GetSyntaxTree();
+        var sourceText = codeDocument.Source.Text;
 
         var processedAttributes = new Dictionary<TextSpan, bool>();
 
@@ -115,22 +112,19 @@ private static Diagnostic[] FilterHTMLDiagnostics(
 
     private Diagnostic[] MapDiagnostics(
         RazorLanguageKind languageKind,
-        IReadOnlyList<Diagnostic> diagnostics,
+        Diagnostic[] diagnostics,
         IDocumentSnapshot documentSnapshot,
-        RazorCodeDocument codeDocument,
-        SourceText sourceText)
+        RazorCodeDocument codeDocument)
     {
         var projects = RazorDiagnosticConverter.GetProjectInformation(documentSnapshot);
         using var mappedDiagnostics = new PooledArrayBuilder<Diagnostic>();
 
-        for (var i = 0; i < diagnostics.Count; i++)
+        foreach (var diagnostic in diagnostics)
         {
-            var diagnostic = diagnostics[i];
-
             // C# requests don't map directly to where they are in the document.
             if (languageKind == RazorLanguageKind.CSharp)
             {
-                if (!TryGetOriginalDiagnosticRange(diagnostic, codeDocument, sourceText, out var originalRange))
+                if (!TryGetOriginalDiagnosticRange(diagnostic, codeDocument, out var originalRange))
                 {
                     continue;
                 }
@@ -253,7 +247,8 @@ static bool IsCSharpInStyleBlock(Diagnostic diagnostic, SourceText sourceText, R
             var element = owner.FirstAncestorOrSelf<MarkupElementSyntax>(static n => n.StartTag?.Name.Content == "style");
             var csharp = owner.FirstAncestorOrSelf<CSharpCodeBlockSyntax>();
 
-            return element?.Body.Any(static c => c is CSharpCodeBlockSyntax) ?? false || csharp is not null;
+            return csharp is not null ||
+                (element?.Body.Any(static c => c is CSharpCodeBlockSyntax) ?? false);
         }
 
         // Ideally this would be solved instead by not emitting the "!" at the HTML backing file,
@@ -405,26 +400,26 @@ n is GenericBlockSyntax ||
         }
     }
 
-    private bool ShouldFilterCSharpDiagnosticBasedOnErrorCode(Diagnostic diagnostic, RazorCodeDocument codeDocument, SourceText sourceText)
+    private bool ShouldFilterCSharpDiagnosticBasedOnErrorCode(Diagnostic diagnostic, RazorCodeDocument codeDocument)
     {
-        if (!diagnostic.Code.HasValue)
+        if (diagnostic.Code is not { } code ||
+            !code.TryGetSecond(out var str) ||
+            str is null)
         {
             return false;
         }
 
-        diagnostic.Code.Value.TryGetSecond(out var str);
-
         return str switch
         {
-            "CS1525" => ShouldIgnoreCS1525(diagnostic, codeDocument, sourceText),
-            _ => CSharpDiagnosticsToIgnore.Contains(str) &&
-                    diagnostic.Severity != DiagnosticSeverity.Error,
+            "CS1525" => ShouldIgnoreCS1525(diagnostic, codeDocument),
+            _ => s_cSharpDiagnosticsToIgnore.Contains(str) &&
+                diagnostic.Severity != DiagnosticSeverity.Error
         };
 
-        bool ShouldIgnoreCS1525(Diagnostic diagnostic, RazorCodeDocument codeDocument, SourceText sourceText)
+        bool ShouldIgnoreCS1525(Diagnostic diagnostic, RazorCodeDocument codeDocument)
         {
             if (CheckIfDocumentHasRazorDiagnostic(codeDocument, RazorDiagnosticFactory.TagHelper_EmptyBoundAttribute.Id) &&
-                TryGetOriginalDiagnosticRange(diagnostic, codeDocument, sourceText, out var originalRange) &&
+                TryGetOriginalDiagnosticRange(diagnostic, codeDocument, out var originalRange) &&
                 originalRange.IsUndefined())
             {
                 // Empty attribute values will take the following form in the generated C# document:
@@ -440,17 +435,16 @@ bool ShouldIgnoreCS1525(Diagnostic diagnostic, RazorCodeDocument codeDocument, S
         }
     }
 
-    // Internal & virtual for testing
-    internal virtual bool CheckIfDocumentHasRazorDiagnostic(RazorCodeDocument codeDocument, string razorDiagnosticCode)
+    private static bool CheckIfDocumentHasRazorDiagnostic(RazorCodeDocument codeDocument, string razorDiagnosticCode)
     {
         return codeDocument.GetSyntaxTree().Diagnostics.Any(d => d.Id.Equals(razorDiagnosticCode, StringComparison.Ordinal));
     }
 
-    private bool TryGetOriginalDiagnosticRange(Diagnostic diagnostic, RazorCodeDocument codeDocument, SourceText sourceText, [NotNullWhen(true)] out Range? originalRange)
+    private bool TryGetOriginalDiagnosticRange(Diagnostic diagnostic, RazorCodeDocument codeDocument, [NotNullWhen(true)] out Range? originalRange)
     {
         if (IsRudeEditDiagnostic(diagnostic))
         {
-            if (TryRemapRudeEditRange(diagnostic.Range, codeDocument, sourceText, out originalRange))
+            if (TryRemapRudeEditRange(diagnostic.Range, codeDocument, out originalRange))
             {
                 return true;
             }
@@ -487,14 +481,15 @@ private static bool IsRudeEditDiagnostic(Diagnostic diagnostic)
             str.StartsWith("ENC");
     }
 
-    private bool TryRemapRudeEditRange(Range diagnosticRange, RazorCodeDocument codeDocument, SourceText sourceText, [NotNullWhen(true)] out Range? remappedRange)
+    private bool TryRemapRudeEditRange(Range diagnosticRange, RazorCodeDocument codeDocument, [NotNullWhen(true)] out Range? remappedRange)
     {
         // This is a rude edit diagnostic that has already been mapped to the Razor document. The mapping isn't absolutely correct though,
         // it's based on the runtime code generation of the Razor document therefore we need to re-map the already mapped diagnostic in a
         // semi-intelligent way.
 
         var syntaxTree = codeDocument.GetSyntaxTree();
-        var span = codeDocument.Source.Text.GetTextSpan(diagnosticRange);
+        var sourceText = codeDocument.Source.Text;
+        var span = sourceText.GetTextSpan(diagnosticRange);
         var owner = syntaxTree.Root.FindNode(span, getInnermostNodeForTie: true);
 
         switch (owner?.Kind)
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentHighlighting/DocumentHighlightEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentHighlighting/DocumentHighlightEndpoint.cs
index 5854d01677e..65537539ec2 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentHighlighting/DocumentHighlightEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentHighlighting/DocumentHighlightEndpoint.cs
@@ -19,11 +19,11 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.DocumentHighlighting;
 [RazorLanguageServerEndpoint(Methods.TextDocumentDocumentHighlightName)]
 internal class DocumentHighlightEndpoint : AbstractRazorDelegatingEndpoint<DocumentHighlightParams, DocumentHighlight[]?>, ICapabilitiesProvider
 {
-    private readonly IRazorDocumentMappingService _documentMappingService;
+    private readonly IDocumentMappingService _documentMappingService;
 
     public DocumentHighlightEndpoint(
         LanguageServerFeatureOptions languageServerFeatureOptions,
-        IRazorDocumentMappingService documentMappingService,
+        IDocumentMappingService documentMappingService,
         IClientConnection clientConnection,
         ILoggerFactory loggerFactory)
         : base(languageServerFeatureOptions, documentMappingService, clientConnection, loggerFactory.GetOrCreateLogger<DocumentHighlightEndpoint>())
@@ -56,9 +56,9 @@ public void ApplyCapabilities(VSInternalServerCapabilities serverCapabilities, V
         }
 
         return Task.FromResult<IDelegatedParams?>(new DelegatedPositionParams(
-                documentContext.Identifier,
-                positionInfo.Position,
-                positionInfo.LanguageKind));
+            documentContext.GetTextDocumentIdentifierAndVersion(),
+            positionInfo.Position,
+            positionInfo.LanguageKind));
     }
 
     protected override async Task<DocumentHighlight[]?> HandleDelegatedResponseAsync(DocumentHighlight[]? response, DocumentHighlightParams request, RazorRequestContext requestContext, DocumentPositionInfo positionInfo, CancellationToken cancellationToken)
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 e2134c10ed2..b61b08aa239 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentPresentation/AbstractTextDocumentPresentationEndpointBase.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentPresentation/AbstractTextDocumentPresentationEndpointBase.cs
@@ -25,18 +25,18 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.DocumentPresentation;
 internal abstract class AbstractTextDocumentPresentationEndpointBase<TParams> : IRazorRequestHandler<TParams, WorkspaceEdit?>, ICapabilitiesProvider
     where TParams : IPresentationParams
 {
-    private readonly IRazorDocumentMappingService _razorDocumentMappingService;
+    private readonly IDocumentMappingService _documentMappingService;
     private readonly IClientConnection _clientConnection;
     private readonly IFilePathService _filePathService;
     private readonly ILogger _logger;
 
     protected AbstractTextDocumentPresentationEndpointBase(
-        IRazorDocumentMappingService razorDocumentMappingService,
+        IDocumentMappingService documentMappingService,
         IClientConnection clientConnection,
         IFilePathService filePathService,
         ILogger logger)
     {
-        _razorDocumentMappingService = razorDocumentMappingService;
+        _documentMappingService = documentMappingService;
         _clientConnection = clientConnection;
         _filePathService = filePathService;
         _logger = logger;
@@ -79,7 +79,7 @@ protected AbstractTextDocumentPresentationEndpointBase(
             return null;
         }
 
-        var languageKind = _razorDocumentMappingService.GetLanguageKind(codeDocument, hostDocumentIndex, rightAssociative: false);
+        var languageKind = _documentMappingService.GetLanguageKind(codeDocument, hostDocumentIndex, rightAssociative: false);
         // See if we can handle this directly in Razor. If not, we'll let things flow to the below delegated handling.
         var result = await TryGetRazorWorkspaceEditAsync(languageKind, request, cancellationToken).ConfigureAwait(false);
         if (result is not null)
@@ -107,7 +107,7 @@ protected AbstractTextDocumentPresentationEndpointBase(
         // For CSharp we need to map the range to the generated document
         if (languageKind == RazorLanguageKind.CSharp)
         {
-            if (!_razorDocumentMappingService.TryMapToGeneratedDocumentRange(codeDocument.GetCSharpDocument(), request.Range, out var projectedRange))
+            if (!_documentMappingService.TryMapToGeneratedDocumentRange(codeDocument.GetCSharpDocument(), request.Range, out var projectedRange))
             {
                 return null;
             }
@@ -233,7 +233,7 @@ private TextEdit[] MapTextEdits(bool mapRanges, RazorCodeDocument codeDocument,
         using var mappedEdits = new PooledArrayBuilder<TextEdit>();
         foreach (var edit in edits)
         {
-            if (!_razorDocumentMappingService.TryMapToHostDocumentRange(codeDocument.GetCSharpDocument(), edit.Range, out var newRange))
+            if (!_documentMappingService.TryMapToHostDocumentRange(codeDocument.GetCSharpDocument(), edit.Range, out var newRange))
             {
                 return [];
             }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentPresentation/TextDocumentTextPresentationEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentPresentation/TextDocumentTextPresentationEndpoint.cs
index 69aea0a8c69..c01cc3dbe92 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentPresentation/TextDocumentTextPresentationEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentPresentation/TextDocumentTextPresentationEndpoint.cs
@@ -15,11 +15,11 @@
 namespace Microsoft.AspNetCore.Razor.LanguageServer.DocumentPresentation;
 
 internal class TextDocumentTextPresentationEndpoint(
-    IRazorDocumentMappingService razorDocumentMappingService,
+    IDocumentMappingService documentMappingService,
     IClientConnection clientConnection,
     IFilePathService filePathService,
     ILoggerFactory loggerFactory)
-    : AbstractTextDocumentPresentationEndpointBase<TextPresentationParams>(razorDocumentMappingService, clientConnection, filePathService, loggerFactory.GetOrCreateLogger<TextDocumentTextPresentationEndpoint>()), ITextDocumentTextPresentationHandler
+    : AbstractTextDocumentPresentationEndpointBase<TextPresentationParams>(documentMappingService, clientConnection, filePathService, loggerFactory.GetOrCreateLogger<TextDocumentTextPresentationEndpoint>()), ITextDocumentTextPresentationHandler
 {
     public override string EndpointName => CustomMessageNames.RazorTextPresentationEndpoint;
 
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 72cf2558498..cb8937d4a19 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentPresentation/TextDocumentUriPresentationEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentPresentation/TextDocumentUriPresentationEndpoint.cs
@@ -17,12 +17,12 @@
 namespace Microsoft.AspNetCore.Razor.LanguageServer.DocumentPresentation;
 
 internal class TextDocumentUriPresentationEndpoint(
-    IRazorDocumentMappingService razorDocumentMappingService,
+    IDocumentMappingService documentMappingService,
     IClientConnection clientConnection,
     IFilePathService filePathService,
     IDocumentContextFactory documentContextFactory,
     ILoggerFactory loggerFactory)
-    : AbstractTextDocumentPresentationEndpointBase<UriPresentationParams>(razorDocumentMappingService, clientConnection, filePathService, loggerFactory.GetOrCreateLogger<TextDocumentUriPresentationEndpoint>()), ITextDocumentUriPresentationHandler
+    : AbstractTextDocumentPresentationEndpointBase<UriPresentationParams>(documentMappingService, clientConnection, filePathService, loggerFactory.GetOrCreateLogger<TextDocumentUriPresentationEndpoint>()), ITextDocumentUriPresentationHandler
 {
     private readonly IDocumentContextFactory _documentContextFactory = documentContextFactory ?? throw new ArgumentNullException(nameof(documentContextFactory));
 
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSymbols/DocumentSymbolEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSymbols/DocumentSymbolEndpoint.cs
index e64bb4e1df1..6a783934424 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSymbols/DocumentSymbolEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DocumentSymbols/DocumentSymbolEndpoint.cs
@@ -21,12 +21,12 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.DocumentSymbols;
 internal class DocumentSymbolEndpoint : IRazorRequestHandler<DocumentSymbolParams, SumType<DocumentSymbol[], SymbolInformation[]>?>, ICapabilitiesProvider
 {
     private readonly IClientConnection _clientConnection;
-    private readonly IRazorDocumentMappingService _documentMappingService;
+    private readonly IDocumentMappingService _documentMappingService;
     private readonly LanguageServerFeatureOptions _languageServerFeatureOptions;
 
     public DocumentSymbolEndpoint(
         IClientConnection clientConnection,
-        IRazorDocumentMappingService documentMappingService,
+        IDocumentMappingService documentMappingService,
         LanguageServerFeatureOptions languageServerFeatureOptions)
     {
         _clientConnection = clientConnection ?? throw new ArgumentNullException(nameof(clientConnection));
@@ -62,7 +62,7 @@ public TextDocumentIdentifier GetTextDocumentIdentifier(DocumentSymbolParams req
             return null;
         }
 
-        var delegatedParams = new DelegatedDocumentSymbolParams(documentContext.Identifier);
+        var delegatedParams = new DelegatedDocumentSymbolParams(documentContext.GetTextDocumentIdentifierAndVersion());
 
         var result = await _clientConnection.SendRequestAsync<DelegatedDocumentSymbolParams, SumType<DocumentSymbol[], SymbolInformation[]>?>(
             CustomMessageNames.RazorDocumentSymbolEndpoint,
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/EditMappingService.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/EditMappingService.cs
new file mode 100644
index 00000000000..da57af39f48
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/EditMappingService.cs
@@ -0,0 +1,157 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.PooledObjects;
+using Microsoft.CodeAnalysis.Razor.DocumentMapping;
+using Microsoft.CodeAnalysis.Razor.ProjectSystem;
+using Microsoft.CodeAnalysis.Razor.Workspaces;
+using Microsoft.VisualStudio.LanguageServer.Protocol;
+
+namespace Microsoft.AspNetCore.Razor.LanguageServer;
+
+internal sealed class EditMappingService(
+    IDocumentMappingService documentMappingService,
+    IFilePathService filePathService,
+    IDocumentContextFactory documentContextFactory) : IEditMappingService
+{
+    private readonly IDocumentMappingService _documentMappingService = documentMappingService;
+    private readonly IFilePathService _filePathService = filePathService;
+    private readonly IDocumentContextFactory _documentContextFactory = documentContextFactory;
+
+    public async Task<WorkspaceEdit> RemapWorkspaceEditAsync(WorkspaceEdit workspaceEdit, CancellationToken cancellationToken)
+    {
+        if (workspaceEdit.TryGetDocumentChanges(out var documentChanges))
+        {
+            // The LSP spec says, we should prefer `DocumentChanges` property over `Changes` if available.
+            var remappedEdits = await RemapVersionedDocumentEditsAsync(documentChanges, cancellationToken).ConfigureAwait(false);
+
+            return new WorkspaceEdit()
+            {
+                DocumentChanges = remappedEdits
+            };
+        }
+
+        if (workspaceEdit.Changes is { } changeMap)
+        {
+            var remappedEdits = await RemapDocumentEditsAsync(changeMap, cancellationToken).ConfigureAwait(false);
+
+            return new WorkspaceEdit()
+            {
+                Changes = remappedEdits
+            };
+        }
+
+        return workspaceEdit;
+    }
+
+    private async Task<TextDocumentEdit[]> RemapVersionedDocumentEditsAsync(TextDocumentEdit[] documentEdits, CancellationToken cancellationToken)
+    {
+        using var remappedDocumentEdits = new PooledArrayBuilder<TextDocumentEdit>(documentEdits.Length);
+
+        foreach (var entry in documentEdits)
+        {
+            var generatedDocumentUri = entry.TextDocument.Uri;
+
+            // Check if the edit is actually for a generated document, because if not we don't need to do anything
+            if (!_filePathService.IsVirtualDocumentUri(generatedDocumentUri))
+            {
+                // This location doesn't point to a background razor file. No need to remap.
+                remappedDocumentEdits.Add(entry);
+                continue;
+            }
+
+            var razorDocumentUri = _filePathService.GetRazorDocumentUri(generatedDocumentUri);
+
+            if (!_documentContextFactory.TryCreateForOpenDocument(razorDocumentUri, entry.TextDocument.GetProjectContext(), out var documentContext))
+            {
+                continue;
+            }
+
+            var codeDocument = await documentContext.GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
+
+            var remappedEdits = RemapTextEditsCore(generatedDocumentUri, codeDocument, entry.Edits);
+            if (remappedEdits.Length == 0)
+            {
+                // Nothing to do.
+                continue;
+            }
+
+            remappedDocumentEdits.Add(new()
+            {
+                TextDocument = new OptionalVersionedTextDocumentIdentifier()
+                {
+                    Uri = razorDocumentUri,
+                    Version = documentContext.Version
+                },
+                Edits = remappedEdits
+            });
+        }
+
+        return remappedDocumentEdits.ToArray();
+    }
+
+    private async Task<Dictionary<string, TextEdit[]>> RemapDocumentEditsAsync(Dictionary<string, TextEdit[]> changes, CancellationToken cancellationToken)
+    {
+        var remappedChanges = new Dictionary<string, TextEdit[]>(capacity: changes.Count);
+
+        foreach (var (uriString, edits) in changes)
+        {
+            var uri = new Uri(uriString);
+
+            // Check if the edit is actually for a generated document, because if not we don't need to do anything
+            if (!_filePathService.IsVirtualDocumentUri(uri))
+            {
+                remappedChanges[uriString] = edits;
+                continue;
+            }
+
+            if (!_documentContextFactory.TryCreate(uri, out var documentContext))
+            {
+                continue;
+            }
+
+            var codeDocument = await documentContext.GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
+            var remappedEdits = RemapTextEditsCore(uri, codeDocument, edits);
+            if (remappedEdits.Length == 0)
+            {
+                // Nothing to do.
+                continue;
+            }
+
+            var razorDocumentUri = _filePathService.GetRazorDocumentUri(uri);
+            remappedChanges[razorDocumentUri.AbsoluteUri] = remappedEdits;
+        }
+
+        return remappedChanges;
+    }
+
+    private TextEdit[] RemapTextEditsCore(Uri generatedDocumentUri, RazorCodeDocument codeDocument, TextEdit[] edits)
+    {
+        if (!codeDocument.TryGetGeneratedDocument(generatedDocumentUri, _filePathService, out var generatedDocument))
+        {
+            return edits;
+        }
+
+        using var remappedEdits = new PooledArrayBuilder<TextEdit>(edits.Length);
+
+        foreach (var edit in edits)
+        {
+            var generatedRange = edit.Range;
+            if (!_documentMappingService.TryMapToHostDocumentRange(generatedDocument, generatedRange, MappingBehavior.Strict, out var hostDocumentRange))
+            {
+                // Can't map range. Discard this edit.
+                continue;
+            }
+
+            var remappedEdit = VsLspFactory.CreateTextEdit(hostDocumentRange, edit.NewText);
+            remappedEdits.Add(remappedEdit);
+        }
+
+        return remappedEdits.ToArray();
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Extensions/IServiceCollectionExtensions.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Extensions/IServiceCollectionExtensions.cs
index 167a0c55101..be6e74d6c5d 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Extensions/IServiceCollectionExtensions.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Extensions/IServiceCollectionExtensions.cs
@@ -202,7 +202,8 @@ public static void AddDocumentManagementServices(this IServiceCollection service
         services.AddSingleton<IRazorProjectService, RazorProjectService>();
         services.AddSingleton<IRazorStartupService>((services) => (RazorProjectService)services.GetRequiredService<IRazorProjectService>());
         services.AddSingleton<IRazorStartupService, OpenDocumentGenerator>();
-        services.AddSingleton<IRazorDocumentMappingService, RazorDocumentMappingService>();
+        services.AddSingleton<IDocumentMappingService, LspDocumentMappingService>();
+        services.AddSingleton<IEditMappingService, EditMappingService>();
         services.AddSingleton<RazorFileChangeDetectorManager>();
         services.AddSingleton<IOnInitialized>(sp => sp.GetRequiredService<RazorFileChangeDetectorManager>());
 
@@ -226,6 +227,7 @@ public static void AddDocumentManagementServices(this IServiceCollection service
         // Add project snapshot manager
         services.AddSingleton<IProjectEngineFactoryProvider, LspProjectEngineFactoryProvider>();
         services.AddSingleton<IProjectSnapshotManager, LspProjectSnapshotManager>();
+        services.AddSingleton<IProjectCollectionResolver>(sp => (LspProjectSnapshotManager)sp.GetRequiredService<IProjectSnapshotManager>());
     }
 
     public static void AddHandlerWithCapabilities<T>(this IServiceCollection services)
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 b3b9da23856..ccd2e6e93a1 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/FindAllReferences/FindAllReferencesEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/FindAllReferences/FindAllReferencesEndpoint.cs
@@ -23,11 +23,11 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.FindAllReferences;
 internal sealed class FindAllReferencesEndpoint : AbstractRazorDelegatingEndpoint<ReferenceParams, VSInternalReferenceItem[]>, ICapabilitiesProvider
 {
     private readonly IFilePathService _filePathService;
-    private readonly IRazorDocumentMappingService _documentMappingService;
+    private readonly IDocumentMappingService _documentMappingService;
 
     public FindAllReferencesEndpoint(
         LanguageServerFeatureOptions languageServerFeatureOptions,
-        IRazorDocumentMappingService documentMappingService,
+        IDocumentMappingService documentMappingService,
         IClientConnection clientConnection,
         ILoggerFactory loggerFactory,
         IFilePathService filePathService)
@@ -67,9 +67,9 @@ public void ApplyCapabilities(VSInternalServerCapabilities serverCapabilities, V
         }
 
         return Task.FromResult<IDelegatedParams?>(new DelegatedPositionParams(
-                documentContext.Identifier,
-                positionInfo.Position,
-                positionInfo.LanguageKind));
+            documentContext.GetTextDocumentIdentifierAndVersion(),
+            positionInfo.Position,
+            positionInfo.LanguageKind));
     }
 
     protected override async Task<VSInternalReferenceItem[]> HandleDelegatedResponseAsync(VSInternalReferenceItem[] delegatedResponse, ReferenceParams originalRequest, RazorRequestContext requestContext, DocumentPositionInfo positionInfo, CancellationToken cancellationToken)
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/CSharpFormatter.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/CSharpFormatter.cs
index 47089246f24..f87c51192c1 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/CSharpFormatter.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/CSharpFormatter.cs
@@ -19,11 +19,11 @@
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.Formatting;
 
-internal sealed class CSharpFormatter(IRazorDocumentMappingService documentMappingService)
+internal sealed class CSharpFormatter(IDocumentMappingService documentMappingService)
 {
     private const string MarkerId = "RazorMarker";
 
-    private readonly IRazorDocumentMappingService _documentMappingService = documentMappingService;
+    private readonly IDocumentMappingService _documentMappingService = documentMappingService;
 
     public async Task<TextEdit[]> FormatAsync(FormattingContext context, Range rangeToFormat, CancellationToken cancellationToken)
     {
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/CSharpFormattingPass.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/CSharpFormattingPass.cs
index ae44807e53d..7db855f9bd1 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/CSharpFormattingPass.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/CSharpFormattingPass.cs
@@ -18,7 +18,7 @@
 namespace Microsoft.AspNetCore.Razor.LanguageServer.Formatting;
 
 internal sealed class CSharpFormattingPass(
-    IRazorDocumentMappingService documentMappingService,
+    IDocumentMappingService documentMappingService,
     ILoggerFactory loggerFactory)
     : CSharpFormattingPassBase(documentMappingService)
 {
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/CSharpFormattingPassBase.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/CSharpFormattingPassBase.cs
index ab97332f801..590189a5362 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/CSharpFormattingPassBase.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/CSharpFormattingPassBase.cs
@@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Formatting;
 
 internal abstract class CSharpFormattingPassBase : FormattingPassBase
 {
-    protected CSharpFormattingPassBase(IRazorDocumentMappingService documentMappingService)
+    protected CSharpFormattingPassBase(IDocumentMappingService documentMappingService)
         : base(documentMappingService)
     {
         CSharpFormatter = new CSharpFormatter(documentMappingService);
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/CSharpOnTypeFormattingPass.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/CSharpOnTypeFormattingPass.cs
index 1c60b4fa464..bad1194d899 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/CSharpOnTypeFormattingPass.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/CSharpOnTypeFormattingPass.cs
@@ -26,7 +26,7 @@
 namespace Microsoft.AspNetCore.Razor.LanguageServer.Formatting;
 
 internal sealed class CSharpOnTypeFormattingPass(
-    IRazorDocumentMappingService documentMappingService,
+    IDocumentMappingService documentMappingService,
     ILoggerFactory loggerFactory)
     : CSharpFormattingPassBase(documentMappingService)
 {
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 71389874fcc..77c5b6a37ae 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/DocumentOnTypeFormattingEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/DocumentOnTypeFormattingEndpoint.cs
@@ -20,13 +20,13 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Formatting;
 [RazorLanguageServerEndpoint(Methods.TextDocumentOnTypeFormattingName)]
 internal class DocumentOnTypeFormattingEndpoint(
     IRazorFormattingService razorFormattingService,
-    IRazorDocumentMappingService razorDocumentMappingService,
+    IDocumentMappingService documentMappingService,
     RazorLSPOptionsMonitor optionsMonitor,
     ILoggerFactory loggerFactory)
     : IRazorRequestHandler<DocumentOnTypeFormattingParams, TextEdit[]?>, ICapabilitiesProvider
 {
     private readonly IRazorFormattingService _razorFormattingService = razorFormattingService ?? throw new ArgumentNullException(nameof(razorFormattingService));
-    private readonly IRazorDocumentMappingService _razorDocumentMappingService = razorDocumentMappingService ?? throw new ArgumentNullException(nameof(razorDocumentMappingService));
+    private readonly IDocumentMappingService _documentMappingService = documentMappingService ?? throw new ArgumentNullException(nameof(documentMappingService));
     private readonly RazorLSPOptionsMonitor _optionsMonitor = optionsMonitor ?? throw new ArgumentNullException(nameof(optionsMonitor));
     private readonly ILogger _logger = loggerFactory.GetOrCreateLogger<DocumentOnTypeFormattingEndpoint>();
 
@@ -95,7 +95,7 @@ public TextDocumentIdentifier GetTextDocumentIdentifier(DocumentOnTypeFormatting
             return null;
         }
 
-        var triggerCharacterKind = _razorDocumentMappingService.GetLanguageKind(codeDocument, hostDocumentIndex, rightAssociative: false);
+        var triggerCharacterKind = _documentMappingService.GetLanguageKind(codeDocument, hostDocumentIndex, rightAssociative: false);
         if (triggerCharacterKind is not (RazorLanguageKind.CSharp or RazorLanguageKind.Html))
         {
             _logger.LogInformation($"Unsupported trigger character language {triggerCharacterKind:G}.");
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/FormattingContentValidationPass.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/FormattingContentValidationPass.cs
index ec990b20f27..ff1eccb1f1c 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/FormattingContentValidationPass.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/FormattingContentValidationPass.cs
@@ -14,7 +14,7 @@
 namespace Microsoft.AspNetCore.Razor.LanguageServer.Formatting;
 
 internal sealed class FormattingContentValidationPass(
-    IRazorDocumentMappingService documentMappingService,
+    IDocumentMappingService documentMappingService,
     ILoggerFactory loggerFactory)
     : FormattingPassBase(documentMappingService)
 {
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/FormattingDiagnosticValidationPass.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/FormattingDiagnosticValidationPass.cs
index ed7d5014b05..8f7cfda5c60 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/FormattingDiagnosticValidationPass.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/FormattingDiagnosticValidationPass.cs
@@ -16,7 +16,7 @@
 namespace Microsoft.AspNetCore.Razor.LanguageServer.Formatting;
 
 internal sealed class FormattingDiagnosticValidationPass(
-    IRazorDocumentMappingService documentMappingService,
+    IDocumentMappingService documentMappingService,
     ILoggerFactory loggerFactory)
     : FormattingPassBase(documentMappingService)
 {
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/FormattingPassBase.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/FormattingPassBase.cs
index 79a5af2ee64..8f0f6e1dc86 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/FormattingPassBase.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/FormattingPassBase.cs
@@ -12,7 +12,7 @@
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.Formatting;
 
-internal abstract class FormattingPassBase(IRazorDocumentMappingService documentMappingService) : IFormattingPass
+internal abstract class FormattingPassBase(IDocumentMappingService documentMappingService) : IFormattingPass
 {
     protected static readonly int DefaultOrder = 1000;
 
@@ -20,7 +20,7 @@ internal abstract class FormattingPassBase(IRazorDocumentMappingService document
 
     public virtual int Order => DefaultOrder;
 
-    protected IRazorDocumentMappingService DocumentMappingService { get; } = documentMappingService;
+    protected IDocumentMappingService DocumentMappingService { get; } = documentMappingService;
 
     public abstract Task<FormattingResult> ExecuteAsync(FormattingContext context, FormattingResult result, CancellationToken cancellationToken);
 
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/HtmlFormattingPass.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/HtmlFormattingPass.cs
index 988494d9858..f522ea5790c 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/HtmlFormattingPass.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/HtmlFormattingPass.cs
@@ -17,7 +17,7 @@
 namespace Microsoft.AspNetCore.Razor.LanguageServer.Formatting;
 
 internal sealed class HtmlFormattingPass(
-    IRazorDocumentMappingService documentMappingService,
+    IDocumentMappingService documentMappingService,
     IClientConnection clientConnection,
     IDocumentVersionCache documentVersionCache,
     ILoggerFactory loggerFactory)
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/RazorFormattingPass.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/RazorFormattingPass.cs
index d4d86a468c9..0fe7872f2d9 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/RazorFormattingPass.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/RazorFormattingPass.cs
@@ -17,7 +17,7 @@
 namespace Microsoft.AspNetCore.Razor.LanguageServer.Formatting;
 
 internal sealed class RazorFormattingPass(
-    IRazorDocumentMappingService documentMappingService,
+    IDocumentMappingService documentMappingService,
     RazorLSPOptionsMonitor optionsMonitor)
     : FormattingPassBase(documentMappingService)
 {
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/RazorFormattingService.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/RazorFormattingService.cs
index 007250d2bdd..7989815323b 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/RazorFormattingService.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Formatting/RazorFormattingService.cs
@@ -153,7 +153,7 @@ private async Task<TextEdit[]> ApplyFormattedEditsAsync(
         collapseEdits |= formattedEdits.Length == 1;
 
         var documentSnapshot = documentContext.Snapshot;
-        var uri = documentContext.Identifier.Uri;
+        var uri = documentContext.Uri;
         var codeDocument = await documentSnapshot.GetGeneratedOutputAsync().ConfigureAwait(false);
         using var context = FormattingContext.CreateForOnTypeFormatting(uri, documentSnapshot, codeDocument, options, _workspaceFactory, automaticallyAddUsings: automaticallyAddUsings, hostDocumentIndex, triggerCharacter);
         var result = new FormattingResult(formattedEdits, kind);
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Hover/HoverEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Hover/HoverEndpoint.cs
index 956c0fec725..82455da7d44 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Hover/HoverEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Hover/HoverEndpoint.cs
@@ -23,7 +23,7 @@ internal sealed class HoverEndpoint : AbstractRazorDelegatingEndpoint<TextDocume
     public HoverEndpoint(
         IHoverService hoverService,
         LanguageServerFeatureOptions languageServerFeatureOptions,
-        IRazorDocumentMappingService documentMappingService,
+        IDocumentMappingService documentMappingService,
         IClientConnection clientConnection,
         ILoggerFactory loggerFactory)
         : base(languageServerFeatureOptions, documentMappingService, clientConnection, loggerFactory.GetOrCreateLogger<HoverEndpoint>())
@@ -51,9 +51,9 @@ public void ApplyCapabilities(VSInternalServerCapabilities serverCapabilities, V
         }
 
         return Task.FromResult<IDelegatedParams?>(new DelegatedPositionParams(
-                documentContext.Identifier,
-                positionInfo.Position,
-                positionInfo.LanguageKind));
+            documentContext.GetTextDocumentIdentifierAndVersion(),
+            positionInfo.Position,
+            positionInfo.LanguageKind));
     }
 
     protected override Task<VSInternalHover?> TryHandleAsync(TextDocumentPositionParams request, RazorRequestContext requestContext, DocumentPositionInfo positionInfo, CancellationToken cancellationToken)
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Hover/HoverService.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Hover/HoverService.cs
index fe063b11312..4fb546a09d6 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Hover/HoverService.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Hover/HoverService.cs
@@ -27,12 +27,12 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Hover;
 internal sealed partial class HoverService(
     LSPTagHelperTooltipFactory lspTagHelperTooltipFactory,
     VSLSPTagHelperTooltipFactory vsLspTagHelperTooltipFactory,
-    IRazorDocumentMappingService mappingService,
+    IDocumentMappingService documentMappingService,
     IClientCapabilitiesService clientCapabilitiesService) : IHoverService
 {
     private readonly LSPTagHelperTooltipFactory _lspTagHelperTooltipFactory = lspTagHelperTooltipFactory;
     private readonly VSLSPTagHelperTooltipFactory _vsLspTagHelperTooltipFactory = vsLspTagHelperTooltipFactory;
-    private readonly IRazorDocumentMappingService _mappingService = mappingService;
+    private readonly IDocumentMappingService _documentMappingService = documentMappingService;
     private readonly IClientCapabilitiesService _clientCapabilitiesService = clientCapabilitiesService;
 
     public async Task<VSInternalHover?> GetRazorHoverInfoAsync(VersionedDocumentContext documentContext, DocumentPositionInfo positionInfo, Position position, CancellationToken cancellationToken)
@@ -48,7 +48,7 @@ internal sealed partial class HoverService(
 
         // Sometimes what looks like a html attribute can actually map to C#, in which case its better to let Roslyn try to handle this.
         // We can only do this if we're in single server mode though, otherwise we won't be delegating to Roslyn at all
-        if (_mappingService.TryMapToGeneratedDocumentPosition(codeDocument.GetCSharpDocument(), positionInfo.HostDocumentIndex, out _, out _))
+        if (_documentMappingService.TryMapToGeneratedDocumentPosition(codeDocument.GetCSharpDocument(), positionInfo.HostDocumentIndex, out _, out _))
         {
             return null;
         }
@@ -76,7 +76,7 @@ internal sealed partial class HoverService(
         }
         else if (positionInfo.LanguageKind == RazorLanguageKind.CSharp)
         {
-            if (_mappingService.TryMapToHostDocumentRange(codeDocument.GetCSharpDocument(), response.Range, out var projectedRange))
+            if (_documentMappingService.TryMapToHostDocumentRange(codeDocument.GetCSharpDocument(), response.Range, out var projectedRange))
             {
                 response.Range = projectedRange;
             }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/IDocumentMappingServiceExtensions.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/IDocumentMappingServiceExtensions.cs
new file mode 100644
index 00000000000..57a1d184ab4
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/IDocumentMappingServiceExtensions.cs
@@ -0,0 +1,55 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Razor.DocumentMapping;
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.VisualStudio.LanguageServer.Protocol;
+using LspRange = Microsoft.VisualStudio.LanguageServer.Protocol.Range;
+
+namespace Microsoft.AspNetCore.Razor.LanguageServer;
+
+internal static class IDocumentMappingServiceExtensions
+{
+    /// <summary>
+    /// Maps a range in the specified generated document uri to a range in the Razor document that owns the
+    /// generated document. If the uri passed in is not for a generated document, or the range cannot be mapped
+    /// for some other reason, the original passed in range is returned unchanged.
+    /// </summary>
+    public static Task<(Uri MappedDocumentUri, LinePositionSpan MappedRange)> MapToHostDocumentUriAndRangeAsync(
+        this IDocumentMappingService service,
+        Uri generatedDocumentUri,
+        LinePositionSpan generatedDocumentRange,
+        CancellationToken cancellationToken)
+    {
+        if (service is LspDocumentMappingService lspService)
+        {
+            return lspService.MapToHostDocumentUriAndRangeAsync(generatedDocumentUri, generatedDocumentRange, cancellationToken);
+        }
+
+        return Assumed.Unreachable<Task<(Uri, LinePositionSpan)>>();
+    }
+
+    /// <summary>
+    /// Maps a range in the specified generated document uri to a range in the Razor document that owns the
+    /// generated document. If the uri passed in is not for a generated document, or the range cannot be mapped
+    /// for some other reason, the original passed in range is returned unchanged.
+    /// </summary>
+    public static async Task<(Uri MappedDocumentUri, LspRange MappedRange)> MapToHostDocumentUriAndRangeAsync(
+        this IDocumentMappingService service,
+        Uri generatedDocumentUri,
+        LspRange generatedDocumentRange,
+        CancellationToken cancellationToken)
+    {
+        var (mappedDocumentUri, mappedRange) = await service
+            .MapToHostDocumentUriAndRangeAsync(
+                generatedDocumentUri,
+                generatedDocumentRange.ToLinePositionSpan(),
+                cancellationToken)
+            .ConfigureAwait(false);
+
+        return (mappedDocumentUri, mappedRange.ToRange());
+    }
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/IDocumentPositionInfoStrategy.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/IDocumentPositionInfoStrategy.cs
index c575fc47796..dc7b13c4880 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/IDocumentPositionInfoStrategy.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/IDocumentPositionInfoStrategy.cs
@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer;
 internal interface IDocumentPositionInfoStrategy
 {
     Task<DocumentPositionInfo?> TryGetPositionInfoAsync(
-        IRazorDocumentMappingService documentMappingService,
+        IDocumentMappingService documentMappingService,
         DocumentContext documentContext,
         Position position,
         CancellationToken cancellationToken);
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 fc5c3807078..a2e89c2bbf7 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Implementation/ImplementationEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Implementation/ImplementationEndpoint.cs
@@ -21,11 +21,11 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Implementation;
 [RazorLanguageServerEndpoint(Methods.TextDocumentImplementationName)]
 internal sealed class ImplementationEndpoint : AbstractRazorDelegatingEndpoint<TextDocumentPositionParams, ImplementationResult>, ICapabilitiesProvider
 {
-    private readonly IRazorDocumentMappingService _documentMappingService;
+    private readonly IDocumentMappingService _documentMappingService;
 
     public ImplementationEndpoint(
         LanguageServerFeatureOptions languageServerFeatureOptions,
-        IRazorDocumentMappingService documentMappingService,
+        IDocumentMappingService documentMappingService,
         IClientConnection clientConnection,
         ILoggerFactory loggerFactory)
         : base(languageServerFeatureOptions, documentMappingService, clientConnection, loggerFactory.GetOrCreateLogger<ImplementationEndpoint>())
@@ -53,9 +53,9 @@ public void ApplyCapabilities(VSInternalServerCapabilities serverCapabilities, V
         }
 
         return Task.FromResult<IDelegatedParams?>(new DelegatedPositionParams(
-                documentContext.Identifier,
-                positionInfo.Position,
-                positionInfo.LanguageKind));
+            documentContext.GetTextDocumentIdentifierAndVersion(),
+            positionInfo.Position,
+            positionInfo.LanguageKind));
     }
 
     protected async override Task<ImplementationResult> HandleDelegatedResponseAsync(ImplementationResult delegatedResponse, TextDocumentPositionParams request, RazorRequestContext requestContext, DocumentPositionInfo positionInfo, CancellationToken cancellationToken)
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/InlayHints/InlayHintEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/InlayHints/InlayHintEndpoint.cs
index 3a4f746604a..1df042a9964 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/InlayHints/InlayHintEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/InlayHints/InlayHintEndpoint.cs
@@ -6,16 +6,14 @@
 using Microsoft.AspNetCore.Razor.LanguageServer.EndpointContracts;
 using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
 using Microsoft.AspNetCore.Razor.Threading;
-using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.InlayHints;
 
 [RazorLanguageServerEndpoint(Methods.TextDocumentInlayHintName)]
-internal sealed class InlayHintEndpoint(LanguageServerFeatureOptions featureOptions, IInlayHintService inlayHintService, IClientConnection clientConnection)
+internal sealed class InlayHintEndpoint(IInlayHintService inlayHintService, IClientConnection clientConnection)
     : IRazorRequestHandler<InlayHintParams, InlayHint[]?>, ICapabilitiesProvider
 {
-    private readonly LanguageServerFeatureOptions _featureOptions = featureOptions;
     private readonly IInlayHintService _inlayHintService = inlayHintService;
     private readonly IClientConnection _clientConnection = clientConnection;
 
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/InlayHints/InlayHintService.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/InlayHints/InlayHintService.cs
index c0debade37d..294a6adc827 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/InlayHints/InlayHintService.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/InlayHints/InlayHintService.cs
@@ -18,9 +18,9 @@
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.InlayHints;
 
-internal sealed class InlayHintService(IRazorDocumentMappingService documentMappingService) : IInlayHintService
+internal sealed class InlayHintService(IDocumentMappingService documentMappingService) : IInlayHintService
 {
-    private readonly IRazorDocumentMappingService _documentMappingService = documentMappingService;
+    private readonly IDocumentMappingService _documentMappingService = documentMappingService;
 
     public async Task<InlayHint[]?> GetInlayHintsAsync(IClientConnection clientConnection, VersionedDocumentContext documentContext, Range range, CancellationToken cancellationToken)
     {
@@ -42,7 +42,7 @@ internal sealed class InlayHintService(IRazorDocumentMappingService documentMapp
         // For now we only support C# inlay hints. Once Web Tools adds support we'll need to request from both servers and combine
         // the results, much like folding ranges.
         var delegatedRequest = new DelegatedInlayHintParams(
-            Identifier: documentContext.Identifier,
+            Identifier: documentContext.GetTextDocumentIdentifierAndVersion(),
             ProjectedRange: projectedLinePositionSpan.ToRange(),
             ProjectedKind: RazorLanguageKind.CSharp
         );
@@ -78,7 +78,7 @@ internal sealed class InlayHintService(IRazorDocumentMappingService documentMapp
 
                 hint.Data = new RazorInlayHintWrapper
                 {
-                    TextDocument = documentContext.Identifier,
+                    TextDocument = documentContext.GetTextDocumentIdentifierAndVersion(),
                     OriginalData = hint.Data,
                     OriginalPosition = hint.Position
                 };
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 9593b528e87..0a452d66217 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/InlineCompletion/InlineCompletionEndPoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/InlineCompletion/InlineCompletionEndPoint.cs
@@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.InlineCompletion;
 
 [RazorLanguageServerEndpoint(VSInternalMethods.TextDocumentInlineCompletionName)]
 internal sealed class InlineCompletionEndpoint(
-    IRazorDocumentMappingService documentMappingService,
+    IDocumentMappingService documentMappingService,
     IClientConnection clientConnection,
     IAdhocWorkspaceFactory adhocWorkspaceFactory,
     ILoggerFactory loggerFactory)
@@ -36,7 +36,7 @@ internal sealed class InlineCompletionEndpoint(
         "if", "indexer", "interface", "invoke", "iterator", "iterindex", "lock", "mbox", "namespace", "#if", "#region", "prop",
         "propfull", "propg", "sim", "struct", "svm", "switch", "try", "tryf", "unchecked", "unsafe", "using", "while");
 
-    private readonly IRazorDocumentMappingService _documentMappingService = documentMappingService ?? throw new ArgumentNullException(nameof(documentMappingService));
+    private readonly IDocumentMappingService _documentMappingService = documentMappingService ?? throw new ArgumentNullException(nameof(documentMappingService));
     private readonly IClientConnection _clientConnection = clientConnection ?? throw new ArgumentNullException(nameof(clientConnection));
     private readonly IAdhocWorkspaceFactory _adhocWorkspaceFactory = adhocWorkspaceFactory ?? throw new ArgumentNullException(nameof(adhocWorkspaceFactory));
     private readonly ILogger _logger = loggerFactory.GetOrCreateLogger<InlineCompletionEndpoint>();
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/LspDocumentMappingService.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/LspDocumentMappingService.cs
new file mode 100644
index 00000000000..23df0beeb18
--- /dev/null
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/LspDocumentMappingService.cs
@@ -0,0 +1,62 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.CodeAnalysis.Razor.DocumentMapping;
+using Microsoft.CodeAnalysis.Razor.Logging;
+using Microsoft.CodeAnalysis.Razor.ProjectSystem;
+using Microsoft.CodeAnalysis.Razor.Workspaces;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.AspNetCore.Razor.LanguageServer;
+
+internal sealed class LspDocumentMappingService(
+    IFilePathService filePathService,
+    IDocumentContextFactory documentContextFactory,
+    ILoggerFactory loggerFactory)
+    : AbstractDocumentMappingService(filePathService, loggerFactory.GetOrCreateLogger<LspDocumentMappingService>())
+{
+    private readonly IDocumentContextFactory _documentContextFactory = documentContextFactory;
+
+    public async Task<(Uri MappedDocumentUri, LinePositionSpan MappedRange)> MapToHostDocumentUriAndRangeAsync(
+        Uri generatedDocumentUri,
+        LinePositionSpan generatedDocumentRange,
+        CancellationToken cancellationToken)
+    {
+        var razorDocumentUri = FilePathService.GetRazorDocumentUri(generatedDocumentUri);
+
+        // For Html we just map the Uri, the range will be the same
+        if (FilePathService.IsVirtualHtmlFile(generatedDocumentUri))
+        {
+            return (razorDocumentUri, generatedDocumentRange);
+        }
+
+        // We only map from C# files
+        if (!FilePathService.IsVirtualCSharpFile(generatedDocumentUri))
+        {
+            return (generatedDocumentUri, generatedDocumentRange);
+        }
+
+        if (!_documentContextFactory.TryCreate(razorDocumentUri, out var documentContext))
+        {
+            return (generatedDocumentUri, generatedDocumentRange);
+        }
+
+        var codeDocument = await documentContext.GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
+
+        if (!codeDocument.TryGetGeneratedDocument(generatedDocumentUri, FilePathService, out var generatedDocument))
+        {
+            return Assumed.Unreachable<(Uri, LinePositionSpan)>();
+        }
+
+        if (TryMapToHostDocumentRange(generatedDocument, generatedDocumentRange, MappingBehavior.Strict, out var mappedRange))
+        {
+            return (razorDocumentUri, mappedRange);
+        }
+
+        return (generatedDocumentUri, generatedDocumentRange);
+    }
+}
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 f076c975592..e38ace89ca0 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/MapCode/MapCodeEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/MapCode/MapCodeEndpoint.cs
@@ -37,12 +37,12 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.MapCode;
 /// </remarks>
 [RazorLanguageServerEndpoint(VSInternalMethods.WorkspaceMapCodeName)]
 internal sealed class MapCodeEndpoint(
-    IRazorDocumentMappingService documentMappingService,
+    IDocumentMappingService documentMappingService,
     IDocumentContextFactory documentContextFactory,
     IClientConnection clientConnection,
     ITelemetryReporter telemetryReporter) : IRazorDocumentlessRequestHandler<VSInternalMapCodeParams, WorkspaceEdit?>, ICapabilitiesProvider
 {
-    private readonly IRazorDocumentMappingService _documentMappingService = documentMappingService ?? throw new ArgumentNullException(nameof(documentMappingService));
+    private readonly IDocumentMappingService _documentMappingService = documentMappingService ?? throw new ArgumentNullException(nameof(documentMappingService));
     private readonly IDocumentContextFactory _documentContextFactory = documentContextFactory ?? throw new ArgumentNullException(nameof(documentContextFactory));
     private readonly IClientConnection _clientConnection = clientConnection ?? throw new ArgumentNullException(nameof(clientConnection));
     private readonly ITelemetryReporter _telemetryReporter = telemetryReporter ?? throw new ArgumentNullException(nameof(telemetryReporter));
@@ -202,7 +202,7 @@ private async Task<bool> TryMapCodeAsync(
                         }
 
                         var csharpMappingSuccessful = await TrySendCSharpDelegatedMappingRequestAsync(
-                            documentContext.Identifier,
+                            documentContext.GetTextDocumentIdentifierAndVersion(),
                             csharpBody,
                             csharpFocusLocations,
                             mapCodeCorrelationId,
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 b4e6da2b476..62f55e00a19 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Mapping/RazorLanguageQueryEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Mapping/RazorLanguageQueryEndpoint.cs
@@ -14,10 +14,10 @@
 namespace Microsoft.AspNetCore.Razor.LanguageServer.Mapping;
 
 [RazorLanguageServerEndpoint(LanguageServerConstants.RazorLanguageQueryEndpoint)]
-internal sealed class RazorLanguageQueryEndpoint(IRazorDocumentMappingService documentMappingService, ILoggerFactory loggerFactory)
+internal sealed class RazorLanguageQueryEndpoint(IDocumentMappingService documentMappingService, ILoggerFactory loggerFactory)
     : IRazorRequestHandler<RazorLanguageQueryParams, RazorLanguageQueryResponse?>
 {
-    private readonly IRazorDocumentMappingService _documentMappingService = documentMappingService;
+    private readonly IDocumentMappingService _documentMappingService = documentMappingService;
     private readonly ILogger _logger = loggerFactory.GetOrCreateLogger<RazorLanguageQueryEndpoint>();
 
     public bool MutatesSolutionState { get; } = false;
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Mapping/RazorMapToDocumentRangesEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Mapping/RazorMapToDocumentRangesEndpoint.cs
index 18f308dc13c..a6e0c6f6a29 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Mapping/RazorMapToDocumentRangesEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Mapping/RazorMapToDocumentRangesEndpoint.cs
@@ -20,9 +20,9 @@ internal sealed class RazorMapToDocumentRangesEndpoint :
     IRazorDocumentlessRequestHandler<RazorMapToDocumentRangesParams, RazorMapToDocumentRangesResponse?>,
     ITextDocumentIdentifierHandler<RazorMapToDocumentRangesParams, Uri>
 {
-    private readonly IRazorDocumentMappingService _documentMappingService;
+    private readonly IDocumentMappingService _documentMappingService;
 
-    public RazorMapToDocumentRangesEndpoint(IRazorDocumentMappingService documentMappingService)
+    public RazorMapToDocumentRangesEndpoint(IDocumentMappingService documentMappingService)
     {
         _documentMappingService = documentMappingService;
     }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/PreferAttributeNameDocumentPositionInfoStrategy.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/PreferAttributeNameDocumentPositionInfoStrategy.cs
index 3bd88203f85..98b8fcac5d1 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/PreferAttributeNameDocumentPositionInfoStrategy.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/PreferAttributeNameDocumentPositionInfoStrategy.cs
@@ -20,7 +20,7 @@ internal class PreferAttributeNameDocumentPositionInfoStrategy : IDocumentPositi
     public static IDocumentPositionInfoStrategy Instance { get; } = new PreferAttributeNameDocumentPositionInfoStrategy();
 
     public async Task<DocumentPositionInfo?> TryGetPositionInfoAsync(
-        IRazorDocumentMappingService documentMappingService,
+        IDocumentMappingService documentMappingService,
         DocumentContext documentContext,
         Position position,
         CancellationToken cancellationToken)
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/LspProjectSnapshotManager.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/LspProjectSnapshotManager.cs
index fbde37237cd..ba2bbca8924 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/LspProjectSnapshotManager.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/LspProjectSnapshotManager.cs
@@ -9,16 +9,22 @@
 using Microsoft.AspNetCore.Razor.ProjectEngineHost;
 using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
+using Microsoft.CodeAnalysis.Razor.Workspaces;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
 
 internal class LspProjectSnapshotManager(
     IProjectEngineFactoryProvider projectEngineFactoryProvider,
     ILoggerFactory loggerFactory)
-    : ProjectSnapshotManager(projectEngineFactoryProvider, loggerFactory, initializer: AddMiscFilesProject)
+    : ProjectSnapshotManager(projectEngineFactoryProvider, loggerFactory, initializer: AddMiscFilesProject), IProjectCollectionResolver
 {
     private static void AddMiscFilesProject(Updater updater)
     {
         updater.ProjectAdded(MiscFilesHostProject.Instance);
     }
+
+    public IEnumerable<IProjectSnapshot> EnumerateProjects(IDocumentSnapshot snapshot)
+    {
+        return GetProjects();
+    }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDocumentMappingService.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDocumentMappingService.cs
deleted file mode 100644
index 61d7886acef..00000000000
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorDocumentMappingService.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the MIT license. See License.txt in the project root for license information.
-
-using Microsoft.CodeAnalysis.Razor.DocumentMapping;
-using Microsoft.CodeAnalysis.Razor.Logging;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.CodeAnalysis.Razor.Workspaces;
-
-namespace Microsoft.AspNetCore.Razor.LanguageServer;
-
-internal sealed class RazorDocumentMappingService(
-        IFilePathService filePathService,
-        IDocumentContextFactory documentContextFactory,
-        ILoggerFactory loggerFactory)
-         : AbstractRazorDocumentMappingService(filePathService, documentContextFactory, loggerFactory.GetOrCreateLogger<RazorDocumentMappingService>())
-{
-}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageServer.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageServer.cs
index f6c83b1a43a..3f8f6483676 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageServer.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorLanguageServer.cs
@@ -20,15 +20,12 @@
 using Microsoft.AspNetCore.Razor.LanguageServer.LinkedEditingRange;
 using Microsoft.AspNetCore.Razor.LanguageServer.MapCode;
 using Microsoft.AspNetCore.Razor.LanguageServer.ProjectContexts;
-using Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
 using Microsoft.AspNetCore.Razor.LanguageServer.Refactoring;
 using Microsoft.AspNetCore.Razor.LanguageServer.SignatureHelp;
 using Microsoft.AspNetCore.Razor.LanguageServer.WrapWithTag;
 using Microsoft.AspNetCore.Razor.Telemetry;
-using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.FoldingRanges;
 using Microsoft.CodeAnalysis.Razor.Logging;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.CommonLanguageServerProtocol.Framework;
 using Microsoft.Extensions.DependencyInjection;
@@ -153,7 +150,7 @@ protected override ILspServices ConstructLspServices()
         }
 
         // Other
-        services.AddSingleton<RazorComponentSearchEngine, DefaultRazorComponentSearchEngine>();
+        services.AddSingleton<IRazorComponentSearchEngine, RazorComponentSearchEngine>();
 
         // Get the DefaultSession for telemetry. This is set by VS with
         // TelemetryService.SetDefaultSession and provides the correct
@@ -189,6 +186,10 @@ static void AddHandlers(IServiceCollection services, LanguageServerFeatureOption
                 services.AddHandlerWithCapabilities<SignatureHelpEndpoint>();
                 services.AddHandlerWithCapabilities<LinkedEditingRangeEndpoint>();
                 services.AddHandlerWithCapabilities<FoldingRangeEndpoint>();
+
+                services.AddSingleton<IInlayHintService, InlayHintService>();
+                services.AddHandlerWithCapabilities<InlayHintEndpoint>();
+                services.AddHandler<InlayHintResolveEndpoint>();
             }
 
             services.AddHandler<WrapWithTagEndpoint>();
@@ -204,11 +205,6 @@ static void AddHandlers(IServiceCollection services, LanguageServerFeatureOption
             services.AddHandlerWithCapabilities<ProjectContextsEndpoint>();
             services.AddHandlerWithCapabilities<DocumentSymbolEndpoint>();
             services.AddHandlerWithCapabilities<MapCodeEndpoint>();
-
-            services.AddSingleton<IInlayHintService, InlayHintService>();
-
-            services.AddHandlerWithCapabilities<InlayHintEndpoint>();
-            services.AddHandler<InlayHintResolveEndpoint>();
         }
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Refactoring/RenameEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Refactoring/RenameEndpoint.cs
index 761ae07fc07..6960617a980 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Refactoring/RenameEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Refactoring/RenameEndpoint.cs
@@ -27,10 +27,11 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Refactoring;
 
 [RazorLanguageServerEndpoint(Methods.TextDocumentRenameName)]
 internal sealed class RenameEndpoint(
-    RazorComponentSearchEngine componentSearchEngine,
-    IProjectSnapshotManager projectManager,
+    IRazorComponentSearchEngine componentSearchEngine,
+    IProjectCollectionResolver projectResolver,
     LanguageServerFeatureOptions languageServerFeatureOptions,
-    IRazorDocumentMappingService documentMappingService,
+    IDocumentMappingService documentMappingService,
+    IEditMappingService editMappingService,
     IClientConnection clientConnection,
     ILoggerFactory loggerFactory)
     : AbstractRazorDelegatingEndpoint<RenameParams, WorkspaceEdit?>(
@@ -39,10 +40,10 @@ internal sealed class RenameEndpoint(
         clientConnection,
         loggerFactory.GetOrCreateLogger<RenameEndpoint>()), ICapabilitiesProvider
 {
-    private readonly IProjectSnapshotManager _projectManager = projectManager;
-    private readonly RazorComponentSearchEngine _componentSearchEngine = componentSearchEngine;
+    private readonly IProjectCollectionResolver _projectResolver = projectResolver;
+    private readonly IRazorComponentSearchEngine _componentSearchEngine = componentSearchEngine;
     private readonly LanguageServerFeatureOptions _languageServerFeatureOptions = languageServerFeatureOptions;
-    private readonly IRazorDocumentMappingService _documentMappingService = documentMappingService;
+    private readonly IEditMappingService _editMappingService = editMappingService;
 
     public void ApplyCapabilities(VSInternalServerCapabilities serverCapabilities, VSInternalClientCapabilities clientCapabilities)
     {
@@ -91,10 +92,10 @@ protected override bool IsSupported()
         }
 
         return Task.FromResult<IDelegatedParams?>(new DelegatedRenameParams(
-                documentContext.Identifier,
-                positionInfo.Position,
-                positionInfo.LanguageKind,
-                request.NewName));
+            documentContext.GetTextDocumentIdentifierAndVersion(),
+            positionInfo.Position,
+            positionInfo.LanguageKind,
+            request.NewName));
     }
 
     protected override async Task<WorkspaceEdit?> HandleDelegatedResponseAsync(WorkspaceEdit? response, RenameParams request, RazorRequestContext requestContext, DocumentPositionInfo positionInfo, CancellationToken cancellationToken)
@@ -104,7 +105,7 @@ protected override bool IsSupported()
             return null;
         }
 
-        return await _documentMappingService.RemapWorkspaceEditAsync(response, cancellationToken).ConfigureAwait(false);
+        return await _editMappingService.RemapWorkspaceEditAsync(response, cancellationToken).ConfigureAwait(false);
     }
 
     private async Task<WorkspaceEdit?> TryGetRazorComponentRenameEditsAsync(RenameParams request, int absoluteIndex, DocumentContext documentContext, CancellationToken cancellationToken)
@@ -117,7 +118,7 @@ protected override bool IsSupported()
             return null;
         }
 
-        var originComponentDocumentSnapshot = await _componentSearchEngine.TryLocateComponentAsync(originTagHelpers.First()).ConfigureAwait(false);
+        var originComponentDocumentSnapshot = await _componentSearchEngine.TryLocateComponentAsync(documentContext.Snapshot, originTagHelpers.First()).ConfigureAwait(false);
         if (originComponentDocumentSnapshot is null)
         {
             return null;
@@ -162,7 +163,7 @@ protected override bool IsSupported()
         using var documentSnapshots = new PooledArrayBuilder<IDocumentSnapshot?>();
         using var _ = StringHashSetPool.GetPooledObject(out var documentPaths);
 
-        var projects = _projectManager.GetProjects();
+        var projects = _projectResolver.EnumerateProjects(skipDocumentContext.Snapshot);
 
         foreach (var project in projects)
         {
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Semantic/Services/LSPCSharpSemanticTokensProvider.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Semantic/Services/LSPCSharpSemanticTokensProvider.cs
index 841b15ba463..6a2e9d8dceb 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Semantic/Services/LSPCSharpSemanticTokensProvider.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Semantic/Services/LSPCSharpSemanticTokensProvider.cs
@@ -41,7 +41,12 @@ internal class LSPCSharpSemanticTokensProvider(LanguageServerFeatureOptions lang
 
         var csharpRanges = csharpRangeList.ToArray();
 
-        var parameter = new ProvideSemanticTokensRangesParams(documentContext.Identifier.TextDocumentIdentifier, documentVersion, csharpRanges, correlationId);
+        var parameter = new ProvideSemanticTokensRangesParams(
+            documentContext.GetTextDocumentIdentifierAndVersion().TextDocumentIdentifier,
+            documentVersion,
+            csharpRanges,
+            correlationId);
+
         ProvideSemanticTokensResponse? csharpResponse;
         if (_languageServerFeatureOptions.UsePreciseSemanticTokenRanges)
         {
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Semantic/Services/RazorSemanticTokensInfoService.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Semantic/Services/RazorSemanticTokensInfoService.cs
index 4a2bd4da4e4..507671b5527 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Semantic/Services/RazorSemanticTokensInfoService.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Semantic/Services/RazorSemanticTokensInfoService.cs
@@ -9,7 +9,7 @@
 namespace Microsoft.AspNetCore.Razor.LanguageServer.Semantic;
 
 internal class RazorSemanticTokensInfoService(
-    IRazorDocumentMappingService documentMappingService,
+    IDocumentMappingService documentMappingService,
     ISemanticTokensLegendService semanticTokensLegendService,
     ICSharpSemanticTokensProvider csharpSemanticTokensProvider,
     LanguageServerFeatureOptions languageServerFeatureOptions,
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/SignatureHelp/SignatureHelpEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/SignatureHelp/SignatureHelpEndpoint.cs
index 790cd537f07..e7c488771e3 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/SignatureHelp/SignatureHelpEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/SignatureHelp/SignatureHelpEndpoint.cs
@@ -19,7 +19,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.SignatureHelp;
 [RazorLanguageServerEndpoint(Methods.TextDocumentSignatureHelpName)]
 internal sealed class SignatureHelpEndpoint(
         LanguageServerFeatureOptions languageServerFeatureOptions,
-        IRazorDocumentMappingService documentMappingService,
+        IDocumentMappingService documentMappingService,
         IClientConnection clientConnection,
         RazorLSPOptionsMonitor optionsMonitor,
         ILoggerFactory loggerProvider)
@@ -54,8 +54,8 @@ public void ApplyCapabilities(VSInternalServerCapabilities serverCapabilities, V
         }
 
         return Task.FromResult<IDelegatedParams?>(new DelegatedPositionParams(
-                documentContext.Identifier,
-                positionInfo.Position,
-                positionInfo.LanguageKind));
+            documentContext.GetTextDocumentIdentifierAndVersion(),
+            positionInfo.Position,
+            positionInfo.LanguageKind));
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/SpellCheck/DocumentSpellCheckEndpoint.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/SpellCheck/DocumentSpellCheckEndpoint.cs
index ca84457a042..3d2b69e43a5 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/SpellCheck/DocumentSpellCheckEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/SpellCheck/DocumentSpellCheckEndpoint.cs
@@ -21,12 +21,12 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.SpellCheck;
 [RazorLanguageServerEndpoint(VSInternalMethods.TextDocumentSpellCheckableRangesName)]
 internal sealed class DocumentSpellCheckEndpoint : IRazorRequestHandler<VSInternalDocumentSpellCheckableParams, VSInternalSpellCheckableRangeReport[]?>, ICapabilitiesProvider
 {
-    private readonly IRazorDocumentMappingService _documentMappingService;
+    private readonly IDocumentMappingService _documentMappingService;
     private readonly LanguageServerFeatureOptions _languageServerFeatureOptions;
     private readonly IClientConnection _clientConnection;
 
     public DocumentSpellCheckEndpoint(
-        IRazorDocumentMappingService documentMappingService,
+        IDocumentMappingService documentMappingService,
         LanguageServerFeatureOptions languageServerFeatureOptions,
         IClientConnection clientConnection)
     {
@@ -129,7 +129,7 @@ MarkupMinimizedTagHelperDirectiveAttributeSyntax or
 
     private async Task AddCSharpSpellCheckRangesAsync(List<SpellCheckRange> ranges, VersionedDocumentContext documentContext, CancellationToken cancellationToken)
     {
-        var delegatedParams = new DelegatedSpellCheckParams(documentContext.Identifier);
+        var delegatedParams = new DelegatedSpellCheckParams(documentContext.GetTextDocumentIdentifierAndVersion());
         var delegatedResponse = await _clientConnection.SendRequestAsync<DelegatedSpellCheckParams, VSInternalSpellCheckableRangeReport[]?>(
             CustomMessageNames.RazorSpellCheckEndpoint,
             delegatedParams,
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 b290be86aef..990dbc07a6e 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/WrapWithTag/WrapWithTagEndpoint.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/WrapWithTag/WrapWithTagEndpoint.cs
@@ -20,12 +20,12 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.WrapWithTag;
 [RazorLanguageServerEndpoint(LanguageServerConstants.RazorWrapWithTagEndpoint)]
 internal class WrapWithTagEndpoint(
     IClientConnection clientConnection,
-    IRazorDocumentMappingService razorDocumentMappingService,
+    IDocumentMappingService documentMappingService,
     ILoggerFactory loggerFactory)
     : IRazorRequestHandler<WrapWithTagParams, WrapWithTagResponse?>
 {
     private readonly IClientConnection _clientConnection = clientConnection ?? throw new ArgumentNullException(nameof(clientConnection));
-    private readonly IRazorDocumentMappingService _razorDocumentMappingService = razorDocumentMappingService ?? throw new ArgumentNullException(nameof(razorDocumentMappingService));
+    private readonly IDocumentMappingService _documentMappingService = documentMappingService ?? throw new ArgumentNullException(nameof(documentMappingService));
     private readonly ILogger _logger = loggerFactory.GetOrCreateLogger<WrapWithTagEndpoint>();
 
     public bool MutatesSolutionState => false;
@@ -69,7 +69,7 @@ public TextDocumentIdentifier GetTextDocumentIdentifier(WrapWithTagParams reques
         //
         // Instead of C#, which certainly would be expected to go in an if statement, we'll see HTML, which obviously
         // is the better choice for this operation.
-        var languageKind = _razorDocumentMappingService.GetLanguageKind(codeDocument, hostDocumentIndex, rightAssociative: true);
+        var languageKind = _documentMappingService.GetLanguageKind(codeDocument, hostDocumentIndex, rightAssociative: true);
         if (languageKind is not RazorLanguageKind.Html)
         {
             // In general, we don't support C# for obvious reasons, but we can support implicit expressions. ie
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/CompilationTagHelperResolver.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/CompilationTagHelperResolver.cs
index adf4da162be..05b2edf83cd 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/CompilationTagHelperResolver.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/CompilationTagHelperResolver.cs
@@ -1,8 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
-using System;
-using System.Collections.Generic;
+using System.Buffers;
 using System.Collections.Immutable;
 using System.Linq;
 using System.Threading;
@@ -15,68 +14,54 @@
 
 namespace Microsoft.AspNetCore.Razor;
 
-internal class CompilationTagHelperResolver(ITelemetryReporter? telemetryReporter)
+internal sealed class CompilationTagHelperResolver(ITelemetryReporter telemetryReporter)
 {
-    private readonly ITelemetryReporter? _telemetryReporter = telemetryReporter;
+    private readonly ITelemetryReporter _telemetryReporter = telemetryReporter;
 
     public async ValueTask<ImmutableArray<TagHelperDescriptor>> GetTagHelpersAsync(
-        Project workspaceProject,
+        Project project,
         RazorProjectEngine projectEngine,
         CancellationToken cancellationToken)
     {
-        if (workspaceProject is null)
-        {
-            throw new ArgumentNullException(nameof(workspaceProject));
-        }
+        var providers = projectEngine.Engine.Features
+            .OfType<ITagHelperDescriptorProvider>()
+            .OrderBy(static f => f.Order)
+            .ToImmutableArray();
 
-        if (projectEngine is null)
+        if (providers is [])
         {
-            throw new ArgumentNullException(nameof(projectEngine));
+            return [];
         }
 
-        var providers = projectEngine.Engine.Features.OfType<ITagHelperDescriptorProvider>().OrderBy(f => f.Order).ToArray();
-        if (providers.Length == 0)
+        var compilation = await project.GetCompilationAsync(cancellationToken).ConfigureAwait(false);
+        if (compilation is null || !CompilationTagHelperFeature.IsValidCompilation(compilation))
         {
-            return ImmutableArray<TagHelperDescriptor>.Empty;
+            return [];
         }
 
-        using var _ = HashSetPool<TagHelperDescriptor>.GetPooledObject(out var results);
-        var context = TagHelperDescriptorProviderContext.Create(results);
-        context.ExcludeHidden = true;
-        context.IncludeDocumentation = true;
+        using var pooledHashSet = HashSetPool<TagHelperDescriptor>.GetPooledObject(out var results);
+        using var pooledWatch = StopwatchPool.GetPooledObject(out var watch);
+        using var pooledSpan = ArrayPool<Property>.Shared.GetPooledArraySpan(minimumLength: providers.Length, out var properties);
 
-        var compilation = await workspaceProject.GetCompilationAsync(cancellationToken).ConfigureAwait(false);
-        if (CompilationTagHelperFeature.IsValidCompilation(compilation))
+        var context = new TagHelperDescriptorProviderContext(compilation, results)
         {
-            context.SetCompilation(compilation);
-        }
-
-        ExecuteProviders(providers, context, _telemetryReporter);
+            ExcludeHidden = true,
+            IncludeDocumentation = true
+        };
 
-        return results.ToImmutableArray();
-
-        static void ExecuteProviders(ITagHelperDescriptorProvider[] providers, TagHelperDescriptorProviderContext context, ITelemetryReporter? telemetryReporter)
+        for (var i = 0; i < providers.Length; i++)
         {
-            using var _ = StopwatchPool.GetPooledObject(out var watch);
+            var provider = providers[i];
 
-            Property[]? properties = null;
+            watch.Restart();
+            provider.Execute(context);
+            watch.Stop();
 
-            for (var i = 0; i < providers.Length; i++)
-            {
-                var provider = providers[i];
-                watch.Restart();
-                provider.Execute(context);
-                watch.Stop();
+            properties[i] = new($"{provider.GetType().Name}.elapsedtimems", watch.ElapsedMilliseconds);
+        }
 
-                if (telemetryReporter is not null)
-                {
-                    properties ??= new Property[providers.Length];
-                    var propertyName = $"{provider.GetType().Name}.elapsedtimems";
-                    properties[i] = new(propertyName, watch.ElapsedMilliseconds);
-                }
-            }
+        _telemetryReporter.ReportEvent("taghelperresolver/gettaghelpers", Severity.Normal, properties);
 
-            telemetryReporter?.ReportEvent("taghelperresolver/gettaghelpers", Severity.Normal, properties.AssumeNotNull());
-        }
+        return [.. results];
     }
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Telemetry/ITelemetryReporter.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Telemetry/ITelemetryReporter.cs
index 0530e181e21..7f0814a98b6 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Telemetry/ITelemetryReporter.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Telemetry/ITelemetryReporter.cs
@@ -19,7 +19,7 @@ internal interface ITelemetryReporter
     void ReportEvent(string name, Severity severity, Property property);
     void ReportEvent(string name, Severity severity, Property property1, Property property2);
     void ReportEvent(string name, Severity severity, Property property1, Property property2, Property property3);
-    void ReportEvent(string name, Severity severity, params Property[] properties);
+    void ReportEvent(string name, Severity severity, params ReadOnlySpan<Property> properties);
 
     void ReportFault(Exception exception, string? message, params object?[] @params);
 }
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Telemetry/NoOpTelemetryReporter.cs b/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Telemetry/NoOpTelemetryReporter.cs
index 29dcb3101a7..28a937da055 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Telemetry/NoOpTelemetryReporter.cs
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Telemetry/NoOpTelemetryReporter.cs
@@ -44,7 +44,7 @@ public void ReportEvent(string name, Severity severity, Property property1, Prop
     {
     }
 
-    public void ReportEvent(string name, Severity severity, params Property[] properties)
+    public void ReportEvent(string name, Severity severity, params ReadOnlySpan<Property> properties)
     {
     }
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/AbstractRazorDocumentMappingService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/AbstractDocumentMappingService.cs
similarity index 70%
rename from src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/AbstractRazorDocumentMappingService.cs
rename to src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/AbstractDocumentMappingService.cs
index 03a99f532c1..60949687b5e 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/AbstractRazorDocumentMappingService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/AbstractDocumentMappingService.cs
@@ -6,14 +6,12 @@
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Legacy;
 using Microsoft.AspNetCore.Razor.PooledObjects;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Razor.Logging;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.CodeAnalysis.Text;
@@ -21,39 +19,30 @@
 
 namespace Microsoft.CodeAnalysis.Razor.DocumentMapping;
 
-internal abstract class AbstractRazorDocumentMappingService(
-    IFilePathService filePathService,
-    IDocumentContextFactory documentContextFactory,
-    ILogger logger)
-    : IRazorDocumentMappingService
+internal abstract class AbstractDocumentMappingService(IFilePathService filePathService, ILogger logger) : IDocumentMappingService
 {
-    private readonly IFilePathService _documentFilePathService = filePathService ?? throw new ArgumentNullException(nameof(filePathService));
-    private readonly IDocumentContextFactory _documentContextFactory = documentContextFactory ?? throw new ArgumentNullException(nameof(documentContextFactory));
-    private readonly ILogger _logger = logger;
+    protected readonly IFilePathService FilePathService = filePathService;
+    protected readonly ILogger Logger = logger;
 
-    public TextEdit[] GetHostDocumentEdits(IRazorGeneratedDocument generatedDocument, TextEdit[] generatedDocumentEdits)
+    public IEnumerable<TextChange> GetHostDocumentEdits(IRazorGeneratedDocument generatedDocument, IEnumerable<TextChange> generatedDocumentChanges)
     {
-        using var _1 = ListPool<TextEdit>.GetPooledObject(out var hostDocumentEdits);
-        var generatedDocumentSourceText = GetGeneratedSourceText(generatedDocument);
+        var generatedDocumentSourceText = generatedDocument.GetGeneratedSourceText();
         var lastNewLineAddedToLine = 0;
 
-        foreach (var edit in generatedDocumentEdits)
+        foreach (var change in generatedDocumentChanges)
         {
-            var range = edit.Range;
-            if (!IsRangeWithinDocument(range.ToLinePositionSpan(), generatedDocumentSourceText))
+            var span = change.Span;
+            // Deliberately doing a naive check to avoid telemetry for truly bad data
+            if (span.Start <= 0 || span.Start >= generatedDocumentSourceText.Length || span.End <= 0 || span.End >= generatedDocumentSourceText.Length)
             {
                 continue;
             }
 
-            var startSync = generatedDocumentSourceText.TryGetAbsoluteIndex(range.Start, out var startIndex);
-            var endSync = generatedDocumentSourceText.TryGetAbsoluteIndex(range.End, out var endIndex);
-            if (startSync is false || endSync is false)
-            {
-                break;
-            }
+            var (startLine, startChar) = generatedDocumentSourceText.GetLinePosition(span.Start);
+            var (endLine, _) = generatedDocumentSourceText.GetLinePosition(span.End);
 
-            var mappedStart = this.TryMapToHostDocumentPosition(generatedDocument, startIndex, out Position? hostDocumentStart, out _);
-            var mappedEnd = this.TryMapToHostDocumentPosition(generatedDocument, endIndex, out Position? hostDocumentEnd, out _);
+            var mappedStart = this.TryMapToHostDocumentPosition(generatedDocument, span.Start, out var hostDocumentStart, out var hostStartIndex);
+            var mappedEnd = this.TryMapToHostDocumentPosition(generatedDocument, span.End, out var hostDocumentEnd, out var hostEndIndex);
 
             // Ideal case, both start and end can be mapped so just return the edit
             if (mappedStart && mappedEnd)
@@ -61,8 +50,8 @@ public TextEdit[] GetHostDocumentEdits(IRazorGeneratedDocument generatedDocument
                 // If the previous edit was on the same line, and added a newline, then we need to add a space
                 // between this edit and the previous one, because the normalization will have swallowed it. See
                 // below for a more info.
-                var newText = (lastNewLineAddedToLine == range.Start.Line ? " " : "") + edit.NewText;
-                hostDocumentEdits.Add(VsLspFactory.CreateTextEdit(hostDocumentStart!, hostDocumentEnd!, newText));
+                var newText = (lastNewLineAddedToLine == startLine ? " " : "") + change.NewText;
+                yield return new TextChange(TextSpan.FromBounds(hostStartIndex, hostEndIndex), newText);
                 continue;
             }
 
@@ -82,33 +71,30 @@ public TextEdit[] GetHostDocumentEdits(IRazorGeneratedDocument generatedDocument
             // To indent the 'var x' line the formatter will return an edit that starts the line before,
             // with a NewText of '\n            '. The start of that edit is outside our mapping, but we
             // still want to know how to format the 'var x' line, so we have to break up the edit.
-            if (!mappedStart && mappedEnd && range.SpansMultipleLines())
+            if (!mappedStart && mappedEnd && startLine != endLine)
             {
                 // Construct a theoretical edit that is just for the last line of the edit that the C# formatter
                 // gave us, and see if we can map that.
                 // The +1 here skips the newline character that is found, but also protects from Substring throwing
                 // if there are no newlines (which should be impossible anyway)
-                var lastNewLine = edit.NewText.LastIndexOfAny(new char[] { '\n', '\r' }) + 1;
+                var lastNewLine = change.NewText.AssumeNotNull().LastIndexOfAny(['\n', '\r']) + 1;
 
                 // Strictly speaking we could be dropping more lines than we need to, because our mapping point could be anywhere within the edit
                 // but we know that the C# formatter will only be returning blank lines up until the first bit of content that needs to be indented
                 // so we can ignore all but the last line. This assert ensures that is true, just in case something changes in Roslyn
-                Debug.Assert(lastNewLine == 0 || edit.NewText[..(lastNewLine - 1)].All(c => c == '\r' || c == '\n'), "We are throwing away part of an edit that has more than just empty lines!");
+                Debug.Assert(lastNewLine == 0 || change.NewText[..(lastNewLine - 1)].All(c => c == '\r' || c == '\n'), "We are throwing away part of an edit that has more than just empty lines!");
 
-                var proposedRange = VsLspFactory.CreateSingleLineRange(range.End.Line, character: 0, length: range.End.Character);
-                startSync = generatedDocumentSourceText.TryGetAbsoluteIndex(proposedRange.Start, out startIndex);
-                endSync = generatedDocumentSourceText.TryGetAbsoluteIndex(proposedRange.End, out endIndex);
-                if (startSync is false || endSync is false)
+                var startSync = generatedDocumentSourceText.TryGetAbsoluteIndex((endLine, 0), out var startIndex);
+                if (startSync is false)
                 {
                     break;
                 }
 
-                mappedStart = this.TryMapToHostDocumentPosition(generatedDocument, startIndex, out hostDocumentStart, out _);
-                mappedEnd = this.TryMapToHostDocumentPosition(generatedDocument, endIndex, out hostDocumentEnd, out _);
+                mappedStart = this.TryMapToHostDocumentPosition(generatedDocument, startIndex, out _, out hostStartIndex);
 
                 if (mappedStart && mappedEnd)
                 {
-                    hostDocumentEdits.Add(VsLspFactory.CreateTextEdit(hostDocumentStart!, hostDocumentEnd!, edit.NewText[lastNewLine..]));
+                    yield return new TextChange(TextSpan.FromBounds(hostStartIndex, hostEndIndex), change.NewText[lastNewLine..]);
                     continue;
                 }
             }
@@ -136,15 +122,15 @@ public TextEdit[] GetHostDocumentEdits(IRazorGeneratedDocument generatedDocument
             // with "public class Goo" would come in as one edit for "public", one for "class" and one for "Goo", all on the same line.
             // When we map the edit for "public" we will push everything down a line, so we don't want to do it for other edits
             // on that line.
-            if (!mappedStart && !mappedEnd && !range.SpansMultipleLines())
+            if (!mappedStart && !mappedEnd && startLine == endLine)
             {
                 // If the new text doesn't have any content we don't care - throwing away invisible whitespace is fine
-                if (string.IsNullOrWhiteSpace(edit.NewText))
+                if (string.IsNullOrWhiteSpace(change.NewText))
                 {
                     continue;
                 }
 
-                var line = generatedDocumentSourceText.Lines[range.Start.Line];
+                var line = generatedDocumentSourceText.Lines[startLine];
 
                 // If the line isn't blank, then this isn't a functions directive
                 if (line.GetFirstNonWhitespaceOffset() is not null)
@@ -153,40 +139,30 @@ public TextEdit[] GetHostDocumentEdits(IRazorGeneratedDocument generatedDocument
                 }
 
                 // Only do anything if the end of the line in question is a valid mapping point (ie, a transition)
-                var endOfLine = line.Span.End;
-                if (this.TryMapToHostDocumentPosition(generatedDocument, endOfLine, out Position? hostDocumentIndex, out _))
+                if (this.TryMapToHostDocumentPosition(generatedDocument, line.Span.End, out _, out hostEndIndex))
                 {
-                    if (range.Start.Line == lastNewLineAddedToLine)
+                    if (startLine == lastNewLineAddedToLine)
                     {
                         // If we already added a newline to this line, then we don't want to add another one, but
                         // we do need to add a space between this edit and the previous one, because the normalization
                         // will have swallowed it.
-                        hostDocumentEdits.Add(VsLspFactory.CreateTextEdit(hostDocumentIndex, " " + edit.NewText));
+                        yield return new TextChange(new TextSpan(hostEndIndex, 0), " " + change.NewText);
                     }
                     else
                     {
                         // Otherwise, add a newline and the real content, and remember where we added it
-                        lastNewLineAddedToLine = range.Start.Line;
-                        hostDocumentEdits.Add(VsLspFactory.CreateTextEdit(
-                            hostDocumentIndex,
-                            Environment.NewLine + new string(' ', range.Start.Character) + edit.NewText));
+                        lastNewLineAddedToLine = startLine;
+                        yield return new TextChange(new TextSpan(hostEndIndex, 0), " " + Environment.NewLine + new string(' ', startChar) + change.NewText);
                     }
 
                     continue;
                 }
             }
         }
-
-        return hostDocumentEdits.ToArray();
     }
 
     public bool TryMapToHostDocumentRange(IRazorGeneratedDocument generatedDocument, LinePositionSpan generatedDocumentRange, MappingBehavior mappingBehavior, out LinePositionSpan hostDocumentRange)
     {
-        if (generatedDocument is null)
-        {
-            throw new ArgumentNullException(nameof(generatedDocument));
-        }
-
         if (mappingBehavior == MappingBehavior.Strict)
         {
             return TryMapToHostDocumentRangeStrict(generatedDocument, generatedDocumentRange, out hostDocumentRange);
@@ -207,11 +183,6 @@ public bool TryMapToHostDocumentRange(IRazorGeneratedDocument generatedDocument,
 
     public bool TryMapToGeneratedDocumentRange(IRazorGeneratedDocument generatedDocument, LinePositionSpan hostDocumentRange, out LinePositionSpan generatedDocumentRange)
     {
-        if (generatedDocument is null)
-        {
-            throw new ArgumentNullException(nameof(generatedDocument));
-        }
-
         if (generatedDocument.CodeDocument is not { } codeDocument)
         {
             throw new InvalidOperationException("Cannot use document mapping service on a generated document that has a null CodeDocument.");
@@ -220,10 +191,10 @@ public bool TryMapToGeneratedDocumentRange(IRazorGeneratedDocument generatedDocu
         generatedDocumentRange = default;
 
         if (hostDocumentRange.End.Line < hostDocumentRange.Start.Line ||
-            hostDocumentRange.End.Line == hostDocumentRange.Start.Line &&
-             hostDocumentRange.End.Character < hostDocumentRange.Start.Character)
+            (hostDocumentRange.End.Line == hostDocumentRange.Start.Line &&
+             hostDocumentRange.End.Character < hostDocumentRange.Start.Character))
         {
-            _logger.LogWarning($"RazorDocumentMappingService:TryMapToGeneratedDocumentRange original range end < start '{hostDocumentRange}'");
+            Logger.LogWarning($"RazorDocumentMappingService:TryMapToGeneratedDocumentRange original range end < start '{hostDocumentRange}'");
             Debug.Fail($"RazorDocumentMappingService:TryMapToGeneratedDocumentRange original range end < start '{hostDocumentRange}'");
             return false;
         }
@@ -265,11 +236,6 @@ public bool TryMapToGeneratedDocumentRange(IRazorGeneratedDocument generatedDocu
 
     public bool TryMapToHostDocumentPosition(IRazorGeneratedDocument generatedDocument, int generatedDocumentIndex, out LinePosition hostDocumentPosition, out int hostDocumentIndex)
     {
-        if (generatedDocument is null)
-        {
-            throw new ArgumentNullException(nameof(generatedDocument));
-        }
-
         if (generatedDocument.CodeDocument is not { } codeDocument)
         {
             throw new InvalidOperationException("Cannot use document mapping service on a generated document that has a null CodeDocument.");
@@ -324,11 +290,6 @@ public bool TryMapToGeneratedDocumentPosition(IRazorGeneratedDocument generatedD
 
     private static bool TryMapToGeneratedDocumentPositionInternal(IRazorGeneratedDocument generatedDocument, int hostDocumentIndex, bool nextCSharpPositionOnFailure, out LinePosition generatedPosition, out int generatedIndex)
     {
-        if (generatedDocument is null)
-        {
-            throw new ArgumentNullException(nameof(generatedDocument));
-        }
-
         if (generatedDocument.CodeDocument is not { } codeDocument)
         {
             throw new InvalidOperationException("Cannot use document mapping service on a generated document that has a null CodeDocument.");
@@ -375,18 +336,13 @@ private static bool TryMapToGeneratedDocumentPositionInternal(IRazorGeneratedDoc
 
         static LinePosition GetGeneratedPosition(IRazorGeneratedDocument generatedDocument, int generatedIndex)
         {
-            var generatedSource = GetGeneratedSourceText(generatedDocument);
+            var generatedSource = generatedDocument.GetGeneratedSourceText();
             return generatedSource.GetLinePosition(generatedIndex);
         }
     }
 
     public RazorLanguageKind GetLanguageKind(RazorCodeDocument codeDocument, int hostDocumentIndex, bool rightAssociative)
     {
-        if (codeDocument is null)
-        {
-            throw new ArgumentNullException(nameof(codeDocument));
-        }
-
         var classifiedSpans = GetClassifiedSpans(codeDocument);
         var tagHelperSpans = GetTagHelperSpans(codeDocument);
         var documentLength = codeDocument.Source.Text.Length;
@@ -395,64 +351,6 @@ public RazorLanguageKind GetLanguageKind(RazorCodeDocument codeDocument, int hos
         return languageKind;
     }
 
-    public async Task<WorkspaceEdit> RemapWorkspaceEditAsync(WorkspaceEdit workspaceEdit, CancellationToken cancellationToken)
-    {
-        if (workspaceEdit.TryGetDocumentChanges(out var documentChanges))
-        {
-            // The LSP spec says, we should prefer `DocumentChanges` property over `Changes` if available.
-            var remappedEdits = await RemapVersionedDocumentEditsAsync(documentChanges, cancellationToken).ConfigureAwait(false);
-            return new WorkspaceEdit()
-            {
-                DocumentChanges = remappedEdits
-            };
-        }
-        else if (workspaceEdit.Changes != null)
-        {
-            var remappedEdits = await RemapDocumentEditsAsync(workspaceEdit.Changes, cancellationToken).ConfigureAwait(false);
-            return new WorkspaceEdit()
-            {
-                Changes = remappedEdits
-            };
-        }
-
-        return workspaceEdit;
-    }
-
-    public async Task<(Uri MappedDocumentUri, LinePositionSpan MappedRange)> MapToHostDocumentUriAndRangeAsync(Uri generatedDocumentUri, LinePositionSpan generatedDocumentRange, CancellationToken cancellationToken)
-    {
-        var razorDocumentUri = _documentFilePathService.GetRazorDocumentUri(generatedDocumentUri);
-
-        // For Html we just map the Uri, the range will be the same
-        if (_documentFilePathService.IsVirtualHtmlFile(generatedDocumentUri))
-        {
-            return (razorDocumentUri, generatedDocumentRange);
-        }
-
-        // We only map from C# files
-        if (!_documentFilePathService.IsVirtualCSharpFile(generatedDocumentUri))
-        {
-            return (generatedDocumentUri, generatedDocumentRange);
-        }
-
-        if (!_documentContextFactory.TryCreate(razorDocumentUri, out var documentContext))
-        {
-            return (generatedDocumentUri, generatedDocumentRange);
-        }
-
-        var codeDocument = await documentContext.GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
-        var generatedDocument = GetGeneratedDocumentFromGeneratedDocumentUri(generatedDocumentUri, codeDocument);
-
-        // We already checked that the uri was for a generated document, above
-        Assumes.NotNull(generatedDocument);
-
-        if (TryMapToHostDocumentRange(generatedDocument, generatedDocumentRange, MappingBehavior.Strict, out var mappedRange))
-        {
-            return (razorDocumentUri, mappedRange);
-        }
-
-        return (generatedDocumentUri, generatedDocumentRange);
-    }
-
     // Internal for testing
     internal static RazorLanguageKind GetLanguageKindCore(
         ImmutableArray<ClassifiedSpanInternal> classifiedSpans,
@@ -555,7 +453,7 @@ private bool TryMapToHostDocumentRangeStrict(IRazorGeneratedDocument generatedDo
     {
         hostDocumentRange = default;
 
-        var generatedSourceText = GetGeneratedSourceText(generatedDocument);
+        var generatedSourceText = generatedDocument.GetGeneratedSourceText();
         var range = generatedDocumentRange;
         if (!IsRangeWithinDocument(range, generatedSourceText))
         {
@@ -594,7 +492,7 @@ private bool TryMapToHostDocumentRangeInclusive(IRazorGeneratedDocument generate
 
         hostDocumentRange = default;
 
-        var generatedSourceText = GetGeneratedSourceText(generatedDocument);
+        var generatedSourceText = generatedDocument.GetGeneratedSourceText();
 
         if (!IsRangeWithinDocument(generatedDocumentRange, generatedSourceText))
         {
@@ -679,7 +577,7 @@ private bool TryMapToHostDocumentRangeInferred(IRazorGeneratedDocument generated
         // Doesn't map so lets try and infer some mappings
 
         hostDocumentRange = default;
-        var generatedSourceText = GetGeneratedSourceText(generatedDocument);
+        var generatedSourceText = generatedDocument.GetGeneratedSourceText();
 
         if (!IsRangeWithinDocument(generatedDocumentRange, generatedSourceText))
         {
@@ -758,7 +656,7 @@ private bool IsRangeWithinDocument(LinePositionSpan range, SourceText sourceText
         {
             s_haveAsserted = true;
             var sourceTextLinesCount = sourceText.Lines.Count;
-            _logger.LogWarning($"Attempted to map a range ({range.Start.Line},{range.Start.Character})-({range.End.Line},{range.End.Character}) outside of the Source (line count {sourceTextLinesCount}.) This could happen if the Roslyn and Razor LSP servers are not in sync.");
+            Logger.LogWarning($"Attempted to map a range ({range.Start.Line},{range.Start.Character})-({range.End.Line},{range.End.Character}) outside of the Source (line count {sourceTextLinesCount}.) This could happen if the Roslyn and Razor LSP servers are not in sync.");
         }
 
         return result;
@@ -769,137 +667,6 @@ static bool IsPositionWithinDocument(LinePosition linePosition, SourceText sourc
         }
     }
 
-    private async Task<TextDocumentEdit[]> RemapVersionedDocumentEditsAsync(TextDocumentEdit[] documentEdits, CancellationToken cancellationToken)
-    {
-        using var _ = ListPool<TextDocumentEdit>.GetPooledObject(out var remappedDocumentEdits);
-        foreach (var entry in documentEdits)
-        {
-            var generatedDocumentUri = entry.TextDocument.Uri;
-
-            // Check if the edit is actually for a generated document, because if not we don't need to do anything
-            if (!_documentFilePathService.IsVirtualDocumentUri(generatedDocumentUri))
-            {
-                // This location doesn't point to a background razor file. No need to remap.
-                remappedDocumentEdits.Add(entry);
-                continue;
-            }
-
-            var razorDocumentUri = _documentFilePathService.GetRazorDocumentUri(generatedDocumentUri);
-
-            if (!_documentContextFactory.TryCreateForOpenDocument(razorDocumentUri, entry.TextDocument.GetProjectContext(), out var documentContext))
-            {
-                continue;
-            }
-
-            var codeDocument = await documentContext.GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
-
-            var remappedEdits = RemapTextEditsCore(generatedDocumentUri, codeDocument, entry.Edits);
-            if (remappedEdits is null || remappedEdits.Length == 0)
-            {
-                // Nothing to do.
-                continue;
-            }
-
-            remappedDocumentEdits.Add(new TextDocumentEdit()
-            {
-                TextDocument = new OptionalVersionedTextDocumentIdentifier()
-                {
-                    Uri = razorDocumentUri,
-                    Version = documentContext.Version
-                },
-                Edits = remappedEdits
-            });
-        }
-
-        return remappedDocumentEdits.ToArray();
-    }
-
-    private async Task<Dictionary<string, TextEdit[]>> RemapDocumentEditsAsync(Dictionary<string, TextEdit[]> changes, CancellationToken cancellationToken)
-    {
-        var remappedChanges = new Dictionary<string, TextEdit[]>();
-        foreach (var entry in changes)
-        {
-            var uri = new Uri(entry.Key);
-            var edits = entry.Value;
-
-            // Check if the edit is actually for a generated document, because if not we don't need to do anything
-            if (!_documentFilePathService.IsVirtualDocumentUri(uri))
-            {
-                remappedChanges[entry.Key] = entry.Value;
-                continue;
-            }
-
-            if (!_documentContextFactory.TryCreate(uri, out var documentContext))
-            {
-                continue;
-            }
-
-            var codeDocument = await documentContext.GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
-            var remappedEdits = RemapTextEditsCore(uri, codeDocument, edits);
-            if (remappedEdits is null || remappedEdits.Length == 0)
-            {
-                // Nothing to do.
-                continue;
-            }
-
-            var razorDocumentUri = _documentFilePathService.GetRazorDocumentUri(uri);
-            remappedChanges[razorDocumentUri.AbsoluteUri] = remappedEdits;
-        }
-
-        return remappedChanges;
-    }
-
-    private TextEdit[] RemapTextEditsCore(Uri generatedDocumentUri, RazorCodeDocument codeDocument, TextEdit[] edits)
-    {
-        var generatedDocument = GetGeneratedDocumentFromGeneratedDocumentUri(generatedDocumentUri, codeDocument);
-        if (generatedDocument is null)
-        {
-            return edits;
-        }
-
-        using var _ = ListPool<TextEdit>.GetPooledObject(out var remappedEdits);
-        for (var i = 0; i < edits.Length; i++)
-        {
-            var generatedRange = edits[i].Range;
-            if (!this.TryMapToHostDocumentRange(generatedDocument, generatedRange, MappingBehavior.Strict, out var originalRange))
-            {
-                // Can't map range. Discard this edit.
-                continue;
-            }
-
-            var edit = VsLspFactory.CreateTextEdit(originalRange, edits[i].NewText);
-            remappedEdits.Add(edit);
-        }
-
-        return remappedEdits.ToArray();
-    }
-
-    private IRazorGeneratedDocument? GetGeneratedDocumentFromGeneratedDocumentUri(Uri generatedDocumentUri, RazorCodeDocument codeDocument)
-    {
-        if (_documentFilePathService.IsVirtualCSharpFile(generatedDocumentUri))
-        {
-            return codeDocument.GetCSharpDocument();
-        }
-        else if (_documentFilePathService.IsVirtualHtmlFile(generatedDocumentUri))
-        {
-            return codeDocument.GetHtmlDocument();
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    private static SourceText GetGeneratedSourceText(IRazorGeneratedDocument generatedDocument)
-    {
-        if (generatedDocument.CodeDocument is not { } codeDocument)
-        {
-            throw new InvalidOperationException("Cannot use document mapping service on a generated document that has a null CodeDocument.");
-        }
-
-        return codeDocument.GetGeneratedSourceText(generatedDocument);
-    }
-
     private static ImmutableArray<ClassifiedSpanInternal> GetClassifiedSpans(RazorCodeDocument document)
     {
         // Since this service is called so often, we get a good performance improvement by caching these values
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/IRazorDocumentMappingService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/IDocumentMappingService.cs
similarity index 58%
rename from src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/IRazorDocumentMappingService.cs
rename to src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/IDocumentMappingService.cs
index 358235732a6..486a7e28a67 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/IRazorDocumentMappingService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/IDocumentMappingService.cs
@@ -1,19 +1,16 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
-using System;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Text;
-using Microsoft.VisualStudio.LanguageServer.Protocol;
 
 namespace Microsoft.CodeAnalysis.Razor.DocumentMapping;
 
-internal interface IRazorDocumentMappingService
+internal interface IDocumentMappingService
 {
-    TextEdit[] GetHostDocumentEdits(IRazorGeneratedDocument generatedDocument, TextEdit[] generatedDocumentEdits);
+    IEnumerable<TextChange> GetHostDocumentEdits(IRazorGeneratedDocument generatedDocument, IEnumerable<TextChange> generatedDocumentEdits);
 
     bool TryMapToHostDocumentRange(IRazorGeneratedDocument generatedDocument, LinePositionSpan generatedDocumentRange, MappingBehavior mappingBehavior, out LinePositionSpan hostDocumentRange);
 
@@ -26,13 +23,4 @@ internal interface IRazorDocumentMappingService
     bool TryMapToGeneratedDocumentOrNextCSharpPosition(IRazorGeneratedDocument generatedDocument, int hostDocumentIndex, out LinePosition generatedPosition, out int generatedIndex);
 
     RazorLanguageKind GetLanguageKind(RazorCodeDocument codeDocument, int hostDocumentIndex, bool rightAssociative);
-
-    Task<WorkspaceEdit> RemapWorkspaceEditAsync(WorkspaceEdit workspaceEdit, CancellationToken cancellationToken);
-
-    /// <summary>
-    /// Maps a range in the specified generated document uri to a range in the Razor document that owns the
-    /// generated document. If the uri passed in is not for a generated document, or the range cannot be mapped
-    /// for some other reason, the original passed in range is returned unchanged.
-    /// </summary>
-    Task<(Uri MappedDocumentUri, LinePositionSpan MappedRange)> MapToHostDocumentUriAndRangeAsync(Uri generatedDocumentUri, LinePositionSpan generatedDocumentRange, CancellationToken cancellationToken);
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/IRazorDocumentMappingServiceExtensions.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/IDocumentMappingServiceExtensions.cs
similarity index 59%
rename from src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/IRazorDocumentMappingServiceExtensions.cs
rename to src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/IDocumentMappingServiceExtensions.cs
index 0fdc80e24b4..ce8bf2f4218 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/IRazorDocumentMappingServiceExtensions.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/IDocumentMappingServiceExtensions.cs
@@ -1,10 +1,11 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
-using System;
 using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.Protocol;
@@ -14,28 +15,37 @@
 
 namespace Microsoft.CodeAnalysis.Razor.DocumentMapping;
 
-internal static class IRazorDocumentMappingServiceExtensions
+internal static class IDocumentMappingServiceExtensions
 {
-    public static bool TryMapToHostDocumentRange(this IRazorDocumentMappingService service, IRazorGeneratedDocument generatedDocument, LinePositionSpan projectedRange, out LinePositionSpan originalRange)
+    public static TextEdit[] GetHostDocumentEdits(this IDocumentMappingService service, IRazorGeneratedDocument generatedDocument, TextEdit[] generatedDocumentEdits)
+    {
+        var generatedDocumentSourceText = generatedDocument.GetGeneratedSourceText();
+        var documentText = generatedDocument.CodeDocument.AssumeNotNull().Source.Text;
+
+        var changes = generatedDocumentEdits.Select(generatedDocumentSourceText.GetTextChange);
+        var mappedChanges = service.GetHostDocumentEdits(generatedDocument, changes);
+        return mappedChanges.Select(documentText.GetTextEdit).ToArray();
+    }
+
+    public static bool TryMapToHostDocumentRange(this IDocumentMappingService service, IRazorGeneratedDocument generatedDocument, LinePositionSpan projectedRange, out LinePositionSpan originalRange)
         => service.TryMapToHostDocumentRange(generatedDocument, projectedRange, MappingBehavior.Strict, out originalRange);
 
-    public static bool TryMapToHostDocumentRange(this IRazorDocumentMappingService service, IRazorGeneratedDocument generatedDocument, Range projectedRange, [NotNullWhen(true)] out Range? originalRange)
+    public static bool TryMapToHostDocumentRange(this IDocumentMappingService service, IRazorGeneratedDocument generatedDocument, Range projectedRange, [NotNullWhen(true)] out Range? originalRange)
         => service.TryMapToHostDocumentRange(generatedDocument, projectedRange, MappingBehavior.Strict, out originalRange);
 
-    public static async Task<DocumentPositionInfo> GetPositionInfoAsync(this IRazorDocumentMappingService service, DocumentContext documentContext, int hostDocumentIndex, CancellationToken cancellationToken)
+    public static async Task<DocumentPositionInfo> GetPositionInfoAsync(this IDocumentMappingService service, DocumentContext documentContext, int hostDocumentIndex, CancellationToken cancellationToken)
     {
         var codeDocument = await documentContext.GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
-        var sourceText = await documentContext.GetSourceTextAsync(cancellationToken).ConfigureAwait(false);
 
-        return service.GetPositionInfo(codeDocument, sourceText, hostDocumentIndex);
+        return service.GetPositionInfo(codeDocument, hostDocumentIndex);
     }
 
     public static DocumentPositionInfo GetPositionInfo(
-        this IRazorDocumentMappingService service,
+        this IDocumentMappingService service,
         RazorCodeDocument codeDocument,
-        SourceText sourceText,
         int hostDocumentIndex)
     {
+        var sourceText = codeDocument.Source.Text;
         var position = sourceText.GetPosition(hostDocumentIndex);
 
         var languageKind = service.GetLanguageKind(codeDocument, hostDocumentIndex, rightAssociative: false);
@@ -62,49 +72,38 @@ public static DocumentPositionInfo GetPositionInfo(
         return new DocumentPositionInfo(languageKind, position, hostDocumentIndex);
     }
 
-    public static bool TryMapToHostDocumentRange(this IRazorDocumentMappingService service, IRazorGeneratedDocument generatedDocument, Range generatedDocumentRange, MappingBehavior mappingBehavior, [NotNullWhen(true)] out Range? hostDocumentRange)
+    public static bool TryMapToHostDocumentRange(this IDocumentMappingService service, IRazorGeneratedDocument generatedDocument, Range generatedDocumentRange, MappingBehavior mappingBehavior, [NotNullWhen(true)] out Range? hostDocumentRange)
     {
         var result = service.TryMapToHostDocumentRange(generatedDocument, generatedDocumentRange.ToLinePositionSpan(), mappingBehavior, out var hostDocumentLinePositionSpan);
         hostDocumentRange = result ? hostDocumentLinePositionSpan.ToRange() : null;
         return result;
     }
 
-    public static bool TryMapToGeneratedDocumentRange(this IRazorDocumentMappingService service, IRazorGeneratedDocument generatedDocument, Range hostDocumentRange, [NotNullWhen(true)] out Range? generatedDocumentRange)
+    public static bool TryMapToGeneratedDocumentRange(this IDocumentMappingService service, IRazorGeneratedDocument generatedDocument, Range hostDocumentRange, [NotNullWhen(true)] out Range? generatedDocumentRange)
     {
         var result = service.TryMapToGeneratedDocumentRange(generatedDocument, hostDocumentRange.ToLinePositionSpan(), out var generatedDocumentLinePositionSpan);
         generatedDocumentRange = result ? generatedDocumentLinePositionSpan.ToRange() : null;
         return result;
     }
 
-    public static bool TryMapToHostDocumentPosition(this IRazorDocumentMappingService service, IRazorGeneratedDocument generatedDocument, int generatedDocumentIndex, [NotNullWhen(true)] out Position? hostDocumentPosition, out int hostDocumentIndex)
+    public static bool TryMapToHostDocumentPosition(this IDocumentMappingService service, IRazorGeneratedDocument generatedDocument, int generatedDocumentIndex, [NotNullWhen(true)] out Position? hostDocumentPosition, out int hostDocumentIndex)
     {
         var result = service.TryMapToHostDocumentPosition(generatedDocument, generatedDocumentIndex, out var hostDocumentLinePosition, out hostDocumentIndex);
         hostDocumentPosition = result ? hostDocumentLinePosition.ToPosition() : null;
         return result;
     }
 
-    public static bool TryMapToGeneratedDocumentPosition(this IRazorDocumentMappingService service, IRazorGeneratedDocument generatedDocument, int hostDocumentIndex, [NotNullWhen(true)] out Position? generatedPosition, out int generatedIndex)
+    public static bool TryMapToGeneratedDocumentPosition(this IDocumentMappingService service, IRazorGeneratedDocument generatedDocument, int hostDocumentIndex, [NotNullWhen(true)] out Position? generatedPosition, out int generatedIndex)
     {
         var result = service.TryMapToGeneratedDocumentPosition(generatedDocument, hostDocumentIndex, out var generatedLinePosition, out generatedIndex);
         generatedPosition = result ? generatedLinePosition.ToPosition() : null;
         return result;
     }
 
-    public static bool TryMapToGeneratedDocumentOrNextCSharpPosition(this IRazorDocumentMappingService service, IRazorGeneratedDocument generatedDocument, int hostDocumentIndex, [NotNullWhen(true)] out Position? generatedPosition, out int generatedIndex)
+    public static bool TryMapToGeneratedDocumentOrNextCSharpPosition(this IDocumentMappingService service, IRazorGeneratedDocument generatedDocument, int hostDocumentIndex, [NotNullWhen(true)] out Position? generatedPosition, out int generatedIndex)
     {
         var result = service.TryMapToGeneratedDocumentOrNextCSharpPosition(generatedDocument, hostDocumentIndex, out var generatedLinePosition, out generatedIndex);
         generatedPosition = result ? generatedLinePosition.ToPosition() : null;
         return result;
     }
-
-    /// <summary>
-    /// Maps a range in the specified generated document uri to a range in the Razor document that owns the
-    /// generated document. If the uri passed in is not for a generated document, or the range cannot be mapped
-    /// for some other reason, the original passed in range is returned unchanged.
-    /// </summary>
-    public static async Task<(Uri MappedDocumentUri, Range MappedRange)> MapToHostDocumentUriAndRangeAsync(this IRazorDocumentMappingService service, Uri generatedDocumentUri, Range generatedDocumentRange, CancellationToken cancellationToken)
-    {
-        var result = await service.MapToHostDocumentUriAndRangeAsync(generatedDocumentUri, generatedDocumentRange.ToLinePositionSpan(), cancellationToken).ConfigureAwait(false);
-        return (result.MappedDocumentUri, result.MappedRange.ToRange());
-    }
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/IEditMappingService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/IEditMappingService.cs
new file mode 100644
index 00000000000..1cf7c098da4
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/DocumentMapping/IEditMappingService.cs
@@ -0,0 +1,13 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.LanguageServer.Protocol;
+
+namespace Microsoft.CodeAnalysis.Razor.DocumentMapping;
+
+internal interface IEditMappingService
+{
+    Task<WorkspaceEdit> RemapWorkspaceEditAsync(WorkspaceEdit workspaceEdit, CancellationToken cancellationToken);
+}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/IRazorGeneratedDocumentExtensions.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/IRazorGeneratedDocumentExtensions.cs
new file mode 100644
index 00000000000..214efe87b4d
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/IRazorGeneratedDocumentExtensions.cs
@@ -0,0 +1,17 @@
+using System;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Microsoft.AspNetCore.Razor.Language;
+
+internal static class IRazorGeneratedDocumentExtensions
+{
+    public static SourceText GetGeneratedSourceText(this IRazorGeneratedDocument generatedDocument)
+    {
+        if (generatedDocument.CodeDocument is not { } codeDocument)
+        {
+            throw new InvalidOperationException("Cannot use document mapping service on a generated document that has a null CodeDocument.");
+        }
+
+        return codeDocument.GetGeneratedSourceText(generatedDocument);
+    }
+}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/RazorCodeDocumentExtensions.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/RazorCodeDocumentExtensions.cs
index c542c6e3cf3..8341fe945df 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/RazorCodeDocumentExtensions.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/RazorCodeDocumentExtensions.cs
@@ -1,11 +1,14 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
+using System;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.Protocol;
+using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.CodeAnalysis.Text;
 
 namespace Microsoft.AspNetCore.Razor.Language;
@@ -43,6 +46,28 @@ public static SourceText GetHtmlSourceText(this RazorCodeDocument document)
         return sourceText.AssumeNotNull();
     }
 
+    public static bool TryGetGeneratedDocument(
+        this RazorCodeDocument codeDocument,
+        Uri generatedDocumentUri,
+        IFilePathService filePathService,
+        [NotNullWhen(true)] out IRazorGeneratedDocument? generatedDocument)
+    {
+        if (filePathService.IsVirtualCSharpFile(generatedDocumentUri))
+        {
+            generatedDocument = codeDocument.GetCSharpDocument();
+            return true;
+        }
+
+        if (filePathService.IsVirtualHtmlFile(generatedDocumentUri))
+        {
+            generatedDocument = codeDocument.GetHtmlDocument();
+            return true;
+        }
+
+        generatedDocument = null;
+        return false;
+    }
+
     public static SourceText GetGeneratedSourceText(this RazorCodeDocument document, IRazorGeneratedDocument generatedDocument)
         => generatedDocument switch
         {
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/RoslynLspExtensions_SourceText.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/RoslynLspExtensions_SourceText.cs
new file mode 100644
index 00000000000..fbeb95c1b9f
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/RoslynLspExtensions_SourceText.cs
@@ -0,0 +1,23 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using Microsoft.AspNetCore.Razor;
+using Microsoft.CodeAnalysis.Text;
+
+namespace Roslyn.LanguageServer.Protocol;
+
+internal static partial class RoslynLspExtensions
+{
+    public static Range GetRange(this SourceText text, TextSpan span)
+        => text.GetLinePositionSpan(span).ToRange();
+
+    public static TextSpan GetTextSpan(this SourceText text, Range range)
+        => text.GetTextSpan(range.Start.Line, range.Start.Character, range.End.Line, range.End.Character);
+
+    public static TextChange GetTextChange(this SourceText text, TextEdit edit)
+        => new(text.GetTextSpan(edit.Range), edit.NewText);
+
+    public static TextEdit GetTextEdit(this SourceText text, TextChange change)
+        => RoslynLspFactory.CreateTextEdit(text.GetRange(change.Span), change.NewText.AssumeNotNull());
+
+}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Extensions/TextDocumentExtensions.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/RoslynLspExtensions_TextDocumentIdentifier.cs
similarity index 87%
rename from src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Extensions/TextDocumentExtensions.cs
rename to src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/RoslynLspExtensions_TextDocumentIdentifier.cs
index 14c3bd36ce5..1d610d572d3 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Extensions/TextDocumentExtensions.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/RoslynLspExtensions_TextDocumentIdentifier.cs
@@ -3,11 +3,10 @@
 
 using System;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost;
-using Microsoft.VisualStudio.LanguageServer.Protocol;
 
-namespace Microsoft.VisualStudio.Razor.LanguageClient.Extensions;
+namespace Roslyn.LanguageServer.Protocol;
 
-internal static class TextDocumentExtensions
+internal static partial class RoslynLspExtensions
 {
     /// <summary>
     /// Returns a copy of the passed in <see cref="TextDocumentIdentifier"/> with the passed in <see cref="Uri"/>.
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/SolutionExtensions.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/SolutionExtensions.cs
index 8f4a278ea39..9aaf5b9a5c9 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/SolutionExtensions.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/SolutionExtensions.cs
@@ -1,15 +1,27 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
+using System;
+using System.Collections.Immutable;
 using Microsoft.AspNetCore.Razor;
+using Microsoft.CodeAnalysis.Razor;
 
 namespace Microsoft.CodeAnalysis;
 
 internal static class SolutionExtensions
 {
-    internal static Project GetRequiredProject(this Solution solution, ProjectId projectId)
+    public static ImmutableArray<DocumentId> GetDocumentIdsWithUri(this Solution solution, Uri uri)
+        => solution.GetDocumentIdsWithFilePath(uri.GetDocumentFilePath());
+
+    public static Project GetRequiredProject(this Solution solution, ProjectId projectId)
     {
         return solution.GetProject(projectId)
             ?? ThrowHelper.ThrowInvalidOperationException<Project>($"The projectId {projectId} did not exist in {solution}.");
     }
+
+    public static Document GetRequiredDocument(this Solution solution, DocumentId documentId)
+    {
+        return solution.GetDocument(documentId)
+            ?? ThrowHelper.ThrowInvalidOperationException<Document>($"The document {documentId} did not exist in {solution.FilePath ?? "solution"}.");
+    }
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/VsLspExtensions_TextDocumentIdentifier.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/VsLspExtensions_TextDocumentIdentifier.cs
index 44017ad6256..f265744db95 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/VsLspExtensions_TextDocumentIdentifier.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Extensions/VsLspExtensions_TextDocumentIdentifier.cs
@@ -1,6 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
+using System;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost;
+
 namespace Microsoft.VisualStudio.LanguageServer.Protocol;
 
 internal static partial class VsLspExtensions
@@ -9,4 +12,27 @@ internal static partial class VsLspExtensions
         => textDocumentIdentifier is VSTextDocumentIdentifier vsIdentifier
             ? vsIdentifier.ProjectContext
             : null;
+
+    /// <summary>
+    /// Returns a copy of the passed in <see cref="TextDocumentIdentifier"/> with the passed in <see cref="Uri"/>.
+    /// </summary>
+    public static TextDocumentIdentifier WithUri(this TextDocumentIdentifier textDocumentIdentifier, Uri uri)
+    {
+        if (textDocumentIdentifier is VSTextDocumentIdentifier vsTdi)
+        {
+            return new VSTextDocumentIdentifier
+            {
+                Uri = uri,
+                ProjectContext = vsTdi.ProjectContext
+            };
+        }
+
+        return new TextDocumentIdentifier
+        {
+            Uri = uri
+        };
+    }
+
+    public static RazorTextDocumentIdentifier ToRazorTextDocumentIdentifier(this TextDocumentIdentifier textDocumentIdentifier)
+        => new RazorTextDocumentIdentifier(textDocumentIdentifier.Uri, (textDocumentIdentifier as VSTextDocumentIdentifier)?.ProjectContext?.Id);
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/FoldingRanges/FoldingRangeService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/FoldingRanges/FoldingRangeService.cs
index def3567e4b3..194ccb94d8c 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/FoldingRanges/FoldingRangeService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/FoldingRanges/FoldingRangeService.cs
@@ -17,12 +17,12 @@
 namespace Microsoft.CodeAnalysis.Razor.FoldingRanges;
 
 internal class FoldingRangeService(
-    IRazorDocumentMappingService documentMappingService,
+    IDocumentMappingService documentMappingService,
     IEnumerable<IRazorFoldingRangeProvider> foldingRangeProviders,
     ILoggerFactory loggerFactory)
     : IFoldingRangeService
 {
-    private readonly IRazorDocumentMappingService _documentMappingService = documentMappingService;
+    private readonly IDocumentMappingService _documentMappingService = documentMappingService;
     private readonly IEnumerable<IRazorFoldingRangeProvider> _foldingRangeProviders = foldingRangeProviders;
     private readonly ILogger _logger = loggerFactory.GetOrCreateLogger<FoldingRangeService>();
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/IProjectCollectionResolver.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/IProjectCollectionResolver.cs
new file mode 100644
index 00000000000..6c337d1838e
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/IProjectCollectionResolver.cs
@@ -0,0 +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.Collections.Generic;
+using Microsoft.CodeAnalysis.Razor.ProjectSystem;
+
+namespace Microsoft.CodeAnalysis.Razor.Workspaces;
+
+internal interface IProjectCollectionResolver
+{
+    IEnumerable<IProjectSnapshot> EnumerateProjects(IDocumentSnapshot snapshot);
+}
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorComponentSearchEngine.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/IRazorComponentSearchEngine.cs
similarity index 56%
rename from src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorComponentSearchEngine.cs
rename to src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/IRazorComponentSearchEngine.cs
index d12b5ef1ed6..1d519fc416e 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RazorComponentSearchEngine.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/IRazorComponentSearchEngine.cs
@@ -5,9 +5,9 @@
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 
-namespace Microsoft.AspNetCore.Razor.LanguageServer;
+namespace Microsoft.CodeAnalysis.Razor.Workspaces;
 
-internal abstract class RazorComponentSearchEngine
+internal interface IRazorComponentSearchEngine
 {
-    public abstract Task<IDocumentSnapshot?> TryLocateComponentAsync(TagHelperDescriptor tagHelper);
+    Task<IDocumentSnapshot?> TryLocateComponentAsync(IDocumentSnapshot contextSnapshot, TagHelperDescriptor tagHelper);
 }
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 36a01ebd20f..a99c792531f 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentContext.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentContext.cs
@@ -2,117 +2,172 @@
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
+using RazorSyntaxNode = Microsoft.AspNetCore.Razor.Language.Syntax.SyntaxNode;
 
 namespace Microsoft.CodeAnalysis.Razor.ProjectSystem;
 
-using Microsoft.AspNetCore.Razor.Language.Syntax;
-
-internal class DocumentContext
+internal class DocumentContext(Uri uri, IDocumentSnapshot snapshot, VSProjectContext? projectContext)
 {
+    private readonly VSProjectContext? _projectContext = projectContext;
     private RazorCodeDocument? _codeDocument;
     private SourceText? _sourceText;
-    private readonly VSProjectContext? _projectContext;
-
-    public DocumentContext(
-        Uri uri,
-        IDocumentSnapshot snapshot,
-        VSProjectContext? projectContext)
-    {
-        Uri = uri;
-        Snapshot = snapshot;
-        _projectContext = projectContext;
-    }
-
-    public virtual Uri Uri { get; }
-
-    public virtual IDocumentSnapshot Snapshot { get; }
 
-    public virtual string FilePath => Snapshot.FilePath.AssumeNotNull();
+    public Uri Uri { get; } = uri;
+    public IDocumentSnapshot Snapshot { get; } = snapshot;
+    public string FilePath => Snapshot.FilePath.AssumeNotNull();
+    public string FileKind => Snapshot.FileKind.AssumeNotNull();
+    public IProjectSnapshot Project => Snapshot.Project;
 
-    public virtual string FileKind => Snapshot.FileKind.AssumeNotNull();
-
-    public virtual IProjectSnapshot Project => Snapshot.Project;
+    public TextDocumentIdentifier GetTextDocumentIdentifier()
+        => new VSTextDocumentIdentifier()
+        {
+            Uri = Uri,
+            ProjectContext = _projectContext,
+        };
 
-    public virtual TextDocumentIdentifier Identifier => new VSTextDocumentIdentifier()
+    private bool TryGetCodeDocument([NotNullWhen(true)] out RazorCodeDocument? codeDocument)
     {
-        Uri = Uri,
-        ProjectContext = _projectContext,
-    };
+        codeDocument = _codeDocument;
+        return codeDocument is not null;
+    }
 
-    public virtual async Task<RazorCodeDocument> GetCodeDocumentAsync(CancellationToken cancellationToken)
+    public ValueTask<RazorCodeDocument> GetCodeDocumentAsync(CancellationToken cancellationToken)
     {
-        if (_codeDocument is null)
+        return TryGetCodeDocument(out var codeDocument)
+            ? new(codeDocument)
+            : GetCodeDocumentCoreAsync(cancellationToken);
+
+        async ValueTask<RazorCodeDocument> GetCodeDocumentCoreAsync(CancellationToken cancellationToken)
         {
             var codeDocument = await Snapshot.GetGeneratedOutputAsync().ConfigureAwait(false);
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            _codeDocument = codeDocument;
+            // Interlock to ensure that we only ever return one instance of RazorCodeDocument.
+            // In race scenarios, when more than one RazorCodeDocument is produced, we want to
+            // return whichever RazorCodeDocument is cached.
+            return InterlockedOperations.Initialize(ref _codeDocument, codeDocument);
         }
-
-        return _codeDocument;
     }
 
-    public virtual async Task<SourceText> GetSourceTextAsync(CancellationToken cancellationToken)
+    public ValueTask<SourceText> GetSourceTextAsync(CancellationToken cancellationToken)
     {
-        if (_sourceText is null)
+        return _sourceText is SourceText sourceText
+            ? new(sourceText)
+            : GetSourceTextCoreAsync(cancellationToken);
+
+        async ValueTask<SourceText> GetSourceTextCoreAsync(CancellationToken cancellationToken)
         {
             var sourceText = await Snapshot.GetTextAsync().ConfigureAwait(false);
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            _sourceText = sourceText;
+            // Interlock to ensure that we only ever return one instance of RazorCodeDocument.
+            // In race scenarios, when more than one RazorCodeDocument is produced, we want to
+            // return whichever RazorCodeDocument is cached.
+            return InterlockedOperations.Initialize(ref _sourceText, sourceText);
         }
-
-        return _sourceText;
     }
 
-    public virtual async Task<RazorSyntaxTree> GetSyntaxTreeAsync(CancellationToken cancellationToken)
+    public ValueTask<RazorSyntaxTree> GetSyntaxTreeAsync(CancellationToken cancellationToken)
     {
-        var codeDocument = await GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
-        var syntaxTree = codeDocument.GetSyntaxTree();
+        return TryGetCodeDocument(out var codeDocument)
+            ? new(GetSyntaxTreeCore(codeDocument))
+            : GetSyntaxTreeCoreAsync(cancellationToken);
 
-        return syntaxTree;
+        static RazorSyntaxTree GetSyntaxTreeCore(RazorCodeDocument codeDocument)
+        {
+            return codeDocument.GetSyntaxTree().AssumeNotNull();
+        }
+
+        async ValueTask<RazorSyntaxTree> GetSyntaxTreeCoreAsync(CancellationToken cancellationToken)
+        {
+            var codeDocument = await GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
+            return GetSyntaxTreeCore(codeDocument);
+        }
     }
 
-    public virtual async Task<TagHelperDocumentContext> GetTagHelperContextAsync(CancellationToken cancellationToken)
+    public ValueTask<TagHelperDocumentContext> GetTagHelperContextAsync(CancellationToken cancellationToken)
     {
-        var codeDocument = await GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
-        var tagHelperContext = codeDocument.GetTagHelperContext();
+        return TryGetCodeDocument(out var codeDocument)
+            ? new(GetTagHelperContextCore(codeDocument))
+            : GetTagHelperContextCoreAsync(cancellationToken);
 
-        return tagHelperContext;
+        static TagHelperDocumentContext GetTagHelperContextCore(RazorCodeDocument codeDocument)
+        {
+            return codeDocument.GetTagHelperContext().AssumeNotNull();
+        }
+
+        async ValueTask<TagHelperDocumentContext> GetTagHelperContextCoreAsync(CancellationToken cancellationToken)
+        {
+            var codeDocument = await GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
+            return GetTagHelperContextCore(codeDocument);
+        }
     }
 
-    public virtual async Task<SourceText> GetCSharpSourceTextAsync(CancellationToken cancellationToken)
+    public ValueTask<SourceText> GetCSharpSourceTextAsync(CancellationToken cancellationToken)
     {
-        var codeDocument = await GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
-        var sourceText = codeDocument.GetCSharpSourceText();
+        return TryGetCodeDocument(out var codeDocument)
+            ? new(GetCSharpSourceTextCore(codeDocument))
+            : GetCSharpSourceTextCoreAsync(cancellationToken);
 
-        return sourceText;
+        static SourceText GetCSharpSourceTextCore(RazorCodeDocument codeDocument)
+        {
+            return codeDocument.GetCSharpSourceText();
+        }
+
+        async ValueTask<SourceText> GetCSharpSourceTextCoreAsync(CancellationToken cancellationToken)
+        {
+            var codeDocument = await GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
+            return GetCSharpSourceTextCore(codeDocument);
+        }
     }
 
-    public virtual async Task<SourceText> GetHtmlSourceTextAsync(CancellationToken cancellationToken)
+    public ValueTask<SourceText> GetHtmlSourceTextAsync(CancellationToken cancellationToken)
     {
-        var codeDocument = await GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
-        var sourceText = codeDocument.GetHtmlSourceText();
+        return TryGetCodeDocument(out var codeDocument)
+            ? new(GetHtmlSourceTextCore(codeDocument))
+            : GetHtmlSourceTextCoreAsync(cancellationToken);
 
-        return sourceText;
+        static SourceText GetHtmlSourceTextCore(RazorCodeDocument codeDocument)
+        {
+            return codeDocument.GetHtmlSourceText();
+        }
+
+        async ValueTask<SourceText> GetHtmlSourceTextCoreAsync(CancellationToken cancellationToken)
+        {
+            var codeDocument = await GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
+            return GetHtmlSourceTextCore(codeDocument);
+        }
     }
 
-    public async Task<SyntaxNode?> GetSyntaxNodeAsync(int absoluteIndex, CancellationToken cancellationToken)
+    public ValueTask<RazorSyntaxNode?> GetSyntaxNodeAsync(int absoluteIndex, CancellationToken cancellationToken)
     {
-        var syntaxTree = await GetSyntaxTreeAsync(cancellationToken).ConfigureAwait(false);
-        if (syntaxTree.Root is null)
+        return TryGetCodeDocument(out var codeDocument)
+            ? new(GetSyntaxNodeCore(codeDocument, absoluteIndex))
+            : GetSyntaxNodeCoreAsync(absoluteIndex, cancellationToken);
+
+        static RazorSyntaxNode? GetSyntaxNodeCore(RazorCodeDocument codeDocument, int absoluteIndex)
         {
-            return null;
+            var syntaxTree = codeDocument.GetSyntaxTree().AssumeNotNull();
+
+            return syntaxTree.Root is RazorSyntaxNode root
+                ? root.FindInnermostNode(absoluteIndex)
+                : null;
         }
 
-        return syntaxTree.Root.FindInnermostNode(absoluteIndex);
+        async ValueTask<RazorSyntaxNode?> GetSyntaxNodeCoreAsync(int absoluteIndex, CancellationToken cancellationToken)
+        {
+            var codeDocument = await GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
+            return GetSyntaxNodeCore(codeDocument, absoluteIndex);
+        }
     }
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentState.ComputedStateTracker.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentState.ComputedStateTracker.cs
index 258f1d38b6b..a22e2c4d746 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentState.ComputedStateTracker.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentState.ComputedStateTracker.cs
@@ -218,7 +218,7 @@ static void PropagateToTaskCompletionSource(
 
             var tagHelpers = await project.GetTagHelpersAsync(CancellationToken.None).ConfigureAwait(false);
             var forceRuntimeCodeGeneration = project.Configuration.LanguageServerFlags?.ForceRuntimeCodeGeneration ?? false;
-            var codeDocument = await GenerateCodeDocumentAsync(tagHelpers, project.GetProjectEngine(), document, imports, forceRuntimeCodeGeneration).ConfigureAwait(false);
+            var codeDocument = await GenerateCodeDocumentAsync(document, project.GetProjectEngine(), imports, tagHelpers, forceRuntimeCodeGeneration).ConfigureAwait(false);
             return (codeDocument, inputVersion);
         }
 
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentState.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentState.cs
index 4055cd936f9..859673968b2 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentState.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DocumentState.cs
@@ -265,7 +265,7 @@ internal static ImmutableArray<IDocumentSnapshot> GetImportsCore(IProjectSnapsho
         return imports.ToImmutable();
     }
 
-    internal static async Task<RazorCodeDocument> GenerateCodeDocumentAsync(ImmutableArray<TagHelperDescriptor> tagHelpers, RazorProjectEngine projectEngine, IDocumentSnapshot document, ImmutableArray<ImportItem> imports, bool forceRuntimeCodeGeneration)
+    internal static async Task<RazorCodeDocument> GenerateCodeDocumentAsync(IDocumentSnapshot document, RazorProjectEngine projectEngine, ImmutableArray<ImportItem> imports, ImmutableArray<TagHelperDescriptor> tagHelpers, bool forceRuntimeCodeGeneration)
     {
         // OK we have to generate the code.
         using var importSources = new PooledArrayBuilder<RazorSourceDocument>(imports.Length);
@@ -287,9 +287,6 @@ internal static async Task<RazorCodeDocument> GenerateCodeDocumentAsync(Immutabl
         return projectEngine.ProcessDesignTime(documentSource, fileKind: document.FileKind, importSources.DrainToImmutable(), tagHelpers);
     }
 
-    internal static Task<RazorCodeDocument> GenerateFormattingCodeDocumentAsync(ImmutableArray<TagHelperDescriptor> tagHelpers, RazorProjectEngine projectEngine, IDocumentSnapshot document, ImmutableArray<ImportItem> imports)
-        => GenerateCodeDocumentAsync(tagHelpers, projectEngine, document, imports, forceRuntimeCodeGeneration: false);
-
     internal static async Task<ImmutableArray<ImportItem>> GetImportsAsync(IDocumentSnapshot document, RazorProjectEngine projectEngine)
     {
         var imports = GetImportsCore(document.Project, projectEngine, document.FilePath.AssumeNotNull(), document.FileKind.AssumeNotNull());
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/IDocumentSnapshotExtensions.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/IDocumentSnapshotExtensions.cs
index 7e97774f9ed..ef8b26ca9e9 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/IDocumentSnapshotExtensions.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/IDocumentSnapshotExtensions.cs
@@ -82,6 +82,6 @@ private static async Task<RazorCodeDocument> GetDesignTimeDocumentAsync(IDocumen
         var tagHelpers = await project.GetTagHelpersAsync(CancellationToken.None).ConfigureAwait(false);
         var projectEngine = project.GetProjectEngine();
         var imports = await DocumentState.GetImportsAsync(documentSnapshot, projectEngine).ConfigureAwait(false);
-        return await DocumentState.GenerateCodeDocumentAsync(tagHelpers, project.GetProjectEngine(), documentSnapshot, imports, false).ConfigureAwait(false);
+        return await DocumentState.GenerateCodeDocumentAsync(documentSnapshot, project.GetProjectEngine(), imports, tagHelpers, false).ConfigureAwait(false);
     }
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/VersionedDocumentContext.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/VersionedDocumentContext.cs
index b203540027e..6c4bbcf8ade 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/VersionedDocumentContext.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/VersionedDocumentContext.cs
@@ -7,18 +7,11 @@
 
 namespace Microsoft.CodeAnalysis.Razor.ProjectSystem;
 
-internal class VersionedDocumentContext : DocumentContext
+internal class VersionedDocumentContext(Uri uri, IDocumentSnapshot snapshot, VSProjectContext? projectContext, int version)
+    : DocumentContext(uri, snapshot, projectContext)
 {
-    public virtual int Version { get; }
+    public int Version { get; } = version;
 
-    public VersionedDocumentContext(Uri uri, IDocumentSnapshot snapshot, VSProjectContext? projectContext, int version)
-        : base(uri, snapshot, projectContext)
-    {
-        Version = version;
-    }
-
-    // Sadly we target net472 which doesn't support covariant return types, so this can't override.
-    public new TextDocumentIdentifierAndVersion Identifier => new TextDocumentIdentifierAndVersion(
-        base.Identifier,
-        Version);
+    public TextDocumentIdentifierAndVersion GetTextDocumentIdentifierAndVersion()
+        => new(GetTextDocumentIdentifier(), Version);
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Protocol/InlayHints/InlayHintDataWrapper.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Protocol/InlayHints/InlayHintDataWrapper.cs
new file mode 100644
index 00000000000..78dd8b5f351
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Protocol/InlayHints/InlayHintDataWrapper.cs
@@ -0,0 +1,8 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using Roslyn.LanguageServer.Protocol;
+
+namespace Microsoft.CodeAnalysis.Razor.Protocol.InlayHints;
+
+internal record class InlayHintDataWrapper(TextDocumentIdentifier TextDocument, object? OriginalData, Position OriginalPosition);
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultRazorComponentSearchEngine.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorComponentSearchEngine.cs
similarity index 83%
rename from src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultRazorComponentSearchEngine.cs
rename to src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorComponentSearchEngine.cs
index 09de8ae52f2..23bd2720ea8 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultRazorComponentSearchEngine.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/RazorComponentSearchEngine.cs
@@ -7,15 +7,15 @@
 using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 
-namespace Microsoft.AspNetCore.Razor.LanguageServer;
+namespace Microsoft.CodeAnalysis.Razor.Workspaces;
 
-internal class DefaultRazorComponentSearchEngine(
-    IProjectSnapshotManager projectManager,
+internal class RazorComponentSearchEngine(
+    IProjectCollectionResolver projectCollectionResolver,
     ILoggerFactory loggerFactory)
-    : RazorComponentSearchEngine
+    : IRazorComponentSearchEngine
 {
-    private readonly IProjectSnapshotManager _projectManager = projectManager;
-    private readonly ILogger _logger = loggerFactory.GetOrCreateLogger<DefaultRazorComponentSearchEngine>();
+    private readonly IProjectCollectionResolver _projectResolver = projectCollectionResolver;
+    private readonly ILogger _logger = loggerFactory.GetOrCreateLogger<RazorComponentSearchEngine>();
 
     /// <summary>Search for a component in a project based on its tag name and fully qualified name.</summary>
     /// <remarks>
@@ -24,10 +24,11 @@ internal class DefaultRazorComponentSearchEngine(
     /// component is present in has the same name as the assembly its corresponding tag helper is loaded from.
     /// Implicitly, this method inherits any assumptions made by TrySplitNamespaceAndType.
     /// </remarks>
+    /// <param name="contextSnapshot">A document snapshot that provides context to enumerate project snapshots</param>
     /// <param name="tagHelper">A TagHelperDescriptor to find the corresponding Razor component for.</param>
     /// <returns>The corresponding DocumentSnapshot if found, null otherwise.</returns>
     /// <exception cref="ArgumentNullException">Thrown if <paramref name="tagHelper"/> is null.</exception>
-    public override async Task<IDocumentSnapshot?> TryLocateComponentAsync(TagHelperDescriptor tagHelper)
+    public async Task<IDocumentSnapshot?> TryLocateComponentAsync(IDocumentSnapshot contextSnapshot, TagHelperDescriptor tagHelper)
     {
         if (tagHelper is null)
         {
@@ -44,7 +45,7 @@ internal class DefaultRazorComponentSearchEngine(
 
         var lookupSymbolName = RemoveGenericContent(typeName.AsMemory());
 
-        var projects = _projectManager.GetProjects();
+        var projects = _projectResolver.EnumerateProjects(contextSnapshot);
 
         foreach (var project in projects)
         {
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/IRemoteInlayHintService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/IRemoteInlayHintService.cs
new file mode 100644
index 00000000000..978e8d0ecb8
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/IRemoteInlayHintService.cs
@@ -0,0 +1,16 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor;
+using Roslyn.LanguageServer.Protocol;
+
+namespace Microsoft.CodeAnalysis.Razor.Remote;
+
+internal interface IRemoteInlayHintService : IRemoteJsonService
+{
+    ValueTask<InlayHint[]?> GetInlayHintsAsync(JsonSerializableRazorPinnedSolutionInfoWrapper solutionInfo, JsonSerializableDocumentId razorDocumentId, InlayHintParams inlayHintParams, bool displayAllOverride, CancellationToken cancellationToken);
+
+    ValueTask<InlayHint> ResolveHintAsync(JsonSerializableRazorPinnedSolutionInfoWrapper solutionInfo, JsonSerializableDocumentId razorDocumentId, InlayHint inlayHint, CancellationToken cancellationToken);
+}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RazorServices.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RazorServices.cs
index 644881de001..47d908d75ed 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RazorServices.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Remote/RazorServices.cs
@@ -27,6 +27,7 @@ internal static class RazorServices
     internal static readonly IEnumerable<(Type, Type?)> JsonServices =
         [
             (typeof(IRemoteSignatureHelpService), null),
+            (typeof(IRemoteInlayHintService), null),
         ];
 
     private const string ComponentName = "Razor";
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/SemanticTokens/AbstractRazorSemanticTokensInfoService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/SemanticTokens/AbstractRazorSemanticTokensInfoService.cs
index 2fa4acdd54d..712506f4e53 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/SemanticTokens/AbstractRazorSemanticTokensInfoService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/SemanticTokens/AbstractRazorSemanticTokensInfoService.cs
@@ -20,7 +20,7 @@
 namespace Microsoft.CodeAnalysis.Razor.SemanticTokens;
 
 internal abstract class AbstractRazorSemanticTokensInfoService(
-    IRazorDocumentMappingService documentMappingService,
+    IDocumentMappingService documentMappingService,
     ISemanticTokensLegendService semanticTokensLegendService,
     ICSharpSemanticTokensProvider csharpSemanticTokensProvider,
     LanguageServerFeatureOptions languageServerFeatureOptions,
@@ -29,7 +29,7 @@ internal abstract class AbstractRazorSemanticTokensInfoService(
 {
     private const int TokenSize = 5;
 
-    private readonly IRazorDocumentMappingService _documentMappingService = documentMappingService;
+    private readonly IDocumentMappingService _documentMappingService = documentMappingService;
     private readonly ISemanticTokensLegendService _semanticTokensLegendService = semanticTokensLegendService;
     private readonly ICSharpSemanticTokensProvider _csharpSemanticTokensProvider = csharpSemanticTokensProvider;
     private readonly LanguageServerFeatureOptions _languageServerFeatureOptions = languageServerFeatureOptions;
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/UriExtensions.cs b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/UriExtensions.cs
index c4e2063f81c..b1ae800478f 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/UriExtensions.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/UriExtensions.cs
@@ -4,11 +4,19 @@
 using System;
 using System.Net;
 using Microsoft.AspNetCore.Razor.Utilities;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor;
 
 namespace Microsoft.CodeAnalysis.Razor;
 
 internal static class UriExtensions
 {
+    /// <summary>
+    ///  Converts the specified <see cref="Uri"/> into a file path that matches
+    ///  a Roslyn <see cref="TextDocument.FilePath"/>.
+    /// </summary>
+    public static string GetDocumentFilePath(this Uri uri)
+        => RazorUri.GetDocumentFilePathFromUri(uri);
+
     public static string GetAbsoluteOrUNCPath(this Uri uri)
     {
         if (uri is null)
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/DocumentHighlight/RemoteDocumentHighlightService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/DocumentHighlight/RemoteDocumentHighlightService.cs
index 61252f6d011..ec782be065c 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/DocumentHighlight/RemoteDocumentHighlightService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/DocumentHighlight/RemoteDocumentHighlightService.cs
@@ -28,7 +28,7 @@ protected override IRemoteDocumentHighlightService CreateService(in ServiceArgs
             => new RemoteDocumentHighlightService(in args);
     }
 
-    private readonly IRazorDocumentMappingService _documentMappingService = args.ExportProvider.GetExportedValue<IRazorDocumentMappingService>();
+    private readonly IDocumentMappingService _documentMappingService = args.ExportProvider.GetExportedValue<IDocumentMappingService>();
     private readonly IFilePathService _filePathService = args.ExportProvider.GetExportedValue<IFilePathService>();
 
     public ValueTask<Response> GetHighlightsAsync(
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/DocumentMapping/IDocumentMappingServiceExtensions.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/DocumentMapping/IDocumentMappingServiceExtensions.cs
new file mode 100644
index 00000000000..f51c649eb18
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/DocumentMapping/IDocumentMappingServiceExtensions.cs
@@ -0,0 +1,60 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor;
+using Microsoft.CodeAnalysis.Razor.DocumentMapping;
+using Microsoft.CodeAnalysis.Remote.Razor.ProjectSystem;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.LanguageServer.Protocol;
+using RoslynRange = Roslyn.LanguageServer.Protocol.Range;
+
+namespace Microsoft.CodeAnalysis.Remote.Razor.DocumentMapping;
+
+internal static class IDocumentMappingServiceExtensions
+{
+    /// <summary>
+    /// Maps a range in the specified generated document uri to a range in the Razor document that owns the
+    /// generated document. If the uri passed in is not for a generated document, or the range cannot be mapped
+    /// for some other reason, the original passed in range is returned unchanged.
+    /// </summary>
+    public static Task<(Uri MappedDocumentUri, LinePositionSpan MappedRange)> MapToHostDocumentUriAndRangeAsync(
+        this IDocumentMappingService service,
+        RemoteDocumentSnapshot originSnapshot,
+        Uri generatedDocumentUri,
+        LinePositionSpan generatedDocumentRange,
+        CancellationToken cancellationToken)
+    {
+        if (service is RemoteDocumentMappingService remoteService)
+        {
+            return remoteService.MapToHostDocumentUriAndRangeAsync(originSnapshot, generatedDocumentUri, generatedDocumentRange, cancellationToken);
+        }
+
+        return Assumed.Unreachable<Task<(Uri, LinePositionSpan)>>();
+    }
+
+    /// <summary>
+    /// Maps a range in the specified generated document uri to a range in the Razor document that owns the
+    /// generated document. If the uri passed in is not for a generated document, or the range cannot be mapped
+    /// for some other reason, the original passed in range is returned unchanged.
+    /// </summary>
+    public static async Task<(Uri MappedDocumentUri, RoslynRange MappedRange)> MapToHostDocumentUriAndRangeAsync(
+        this IDocumentMappingService service,
+        RemoteDocumentSnapshot originSnapshot,
+        Uri generatedDocumentUri,
+        RoslynRange generatedDocumentRange,
+        CancellationToken cancellationToken)
+    {
+        var (mappedDocumentUri, mappedRange) = await service
+            .MapToHostDocumentUriAndRangeAsync(
+                originSnapshot,
+                generatedDocumentUri,
+                generatedDocumentRange.ToLinePositionSpan(),
+                cancellationToken)
+            .ConfigureAwait(false);
+
+        return (mappedDocumentUri, mappedRange.ToRange());
+    }
+}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/DocumentMapping/RemoteDocumentMappingService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/DocumentMapping/RemoteDocumentMappingService.cs
index 746868a1236..a4b946fc645 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/DocumentMapping/RemoteDocumentMappingService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/DocumentMapping/RemoteDocumentMappingService.cs
@@ -1,23 +1,82 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
+using System;
 using System.Composition;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor;
+using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
 using Microsoft.CodeAnalysis.Razor.Logging;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
+using Microsoft.CodeAnalysis.Remote.Razor.ProjectSystem;
+using Microsoft.CodeAnalysis.Text;
 
 namespace Microsoft.CodeAnalysis.Remote.Razor.DocumentMapping;
 
-[Export(typeof(IRazorDocumentMappingService)), Shared]
+[Export(typeof(IDocumentMappingService)), Shared]
 [method: ImportingConstructor]
 internal sealed class RemoteDocumentMappingService(
     IFilePathService filePathService,
-    IDocumentContextFactory documentContextFactory,
+    DocumentSnapshotFactory documentSnapshotFactory,
     ILoggerFactory loggerFactory)
-    : AbstractRazorDocumentMappingService(
-        filePathService,
-        documentContextFactory,
-        loggerFactory.GetOrCreateLogger<RemoteDocumentMappingService>())
+    : AbstractDocumentMappingService(filePathService, loggerFactory.GetOrCreateLogger<RemoteDocumentMappingService>())
 {
+    private readonly DocumentSnapshotFactory _documentSnapshotFactory = documentSnapshotFactory;
+
+    public async Task<(Uri MappedDocumentUri, LinePositionSpan MappedRange)> MapToHostDocumentUriAndRangeAsync(
+        RemoteDocumentSnapshot originSnapshot,
+        Uri generatedDocumentUri,
+        LinePositionSpan generatedDocumentRange,
+        CancellationToken cancellationToken)
+    {
+        var razorDocumentUri = FilePathService.GetRazorDocumentUri(generatedDocumentUri);
+
+        // For Html we just map the Uri, the range will be the same
+        if (FilePathService.IsVirtualHtmlFile(generatedDocumentUri))
+        {
+            return (razorDocumentUri, generatedDocumentRange);
+        }
+
+        // We only map from C# files
+        if (!FilePathService.IsVirtualCSharpFile(generatedDocumentUri))
+        {
+            return (generatedDocumentUri, generatedDocumentRange);
+        }
+
+        var solution = originSnapshot.TextDocument.Project.Solution;
+
+        var razorDocumentId = solution.GetDocumentIdsWithUri(razorDocumentUri).FirstOrDefault();
+
+        // If we couldn't locate the .razor file, just return the generated file.
+        if (razorDocumentId is null ||
+            solution.GetAdditionalDocument(razorDocumentId) is not TextDocument razorDocument)
+        {
+            return (generatedDocumentUri, generatedDocumentRange);
+        }
+
+        var razorDocumentSnapshot = _documentSnapshotFactory.GetOrCreate(razorDocument);
+
+        var razorCodeDocument = await razorDocumentSnapshot.GetGeneratedOutputAsync().ConfigureAwait(false);
+        cancellationToken.ThrowIfCancellationRequested();
+
+        if (razorCodeDocument is null)
+        {
+            return (generatedDocumentUri, generatedDocumentRange);
+        }
+
+        if (!razorCodeDocument.TryGetGeneratedDocument(generatedDocumentUri, FilePathService, out var generatedDocument))
+        {
+            return Assumed.Unreachable<(Uri, LinePositionSpan)>();
+        }
+
+        if (TryMapToHostDocumentRange(generatedDocument, generatedDocumentRange, MappingBehavior.Strict, out var mappedRange))
+        {
+            return (razorDocumentUri, mappedRange);
+        }
+
+        return (generatedDocumentUri, generatedDocumentRange);
+    }
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/FoldingRanges/OOPFoldingRangeService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/FoldingRanges/OOPFoldingRangeService.cs
index 67565c459a4..fcf9db1bdf7 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/FoldingRanges/OOPFoldingRangeService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/FoldingRanges/OOPFoldingRangeService.cs
@@ -12,7 +12,7 @@ namespace Microsoft.CodeAnalysis.Remote.Razor.FoldingRanges;
 [Export(typeof(IFoldingRangeService)), Shared]
 [method: ImportingConstructor]
 internal sealed class OOPFoldingRangeService(
-    IRazorDocumentMappingService documentMappingService,
+    IDocumentMappingService documentMappingService,
     [ImportMany] IEnumerable<IRazorFoldingRangeProvider> foldingRangeProviders,
     ILoggerFactory loggerFactory)
     : FoldingRangeService(documentMappingService, foldingRangeProviders, loggerFactory)
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/InlayHints/RemoteInlayHintService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/InlayHints/RemoteInlayHintService.cs
new file mode 100644
index 00000000000..ae06c498c58
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/InlayHints/RemoteInlayHintService.cs
@@ -0,0 +1,115 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
+using Microsoft.AspNetCore.Razor.PooledObjects;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost.Handlers;
+using Microsoft.CodeAnalysis.Razor.DocumentMapping;
+using Microsoft.CodeAnalysis.Razor.Protocol.InlayHints;
+using Microsoft.CodeAnalysis.Razor.Remote;
+using Microsoft.CodeAnalysis.Razor.Workspaces;
+using Microsoft.CodeAnalysis.Remote.Razor.ProjectSystem;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.LanguageServer.Protocol;
+
+namespace Microsoft.CodeAnalysis.Remote.Razor;
+
+internal sealed partial class RemoteInlayHintService(in ServiceArgs args) : RazorDocumentServiceBase(in args), IRemoteInlayHintService
+{
+    internal sealed class Factory : FactoryBase<IRemoteInlayHintService>
+    {
+        protected override IRemoteInlayHintService CreateService(in ServiceArgs args)
+            => new RemoteInlayHintService(in args);
+    }
+
+    private readonly IDocumentMappingService _documentMappingService = args.ExportProvider.GetExportedValue<IDocumentMappingService>();
+    private readonly IFilePathService _filePathService = args.ExportProvider.GetExportedValue<IFilePathService>();
+
+    public ValueTask<InlayHint[]?> GetInlayHintsAsync(JsonSerializableRazorPinnedSolutionInfoWrapper solutionInfo, JsonSerializableDocumentId razorDocumentId, InlayHintParams inlayHintParams, bool displayAllOverride, CancellationToken cancellationToken)
+       => RunServiceAsync(
+            solutionInfo,
+            razorDocumentId,
+            context => GetInlayHintsAsync(context, inlayHintParams, displayAllOverride, cancellationToken),
+            cancellationToken);
+
+    private async ValueTask<InlayHint[]?> GetInlayHintsAsync(RemoteDocumentContext context, InlayHintParams inlayHintParams, bool displayAllOverride, CancellationToken cancellationToken)
+    {
+        var codeDocument = await context.GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
+        var csharpDocument = codeDocument.GetCSharpDocument();
+
+        var span = inlayHintParams.Range.ToLinePositionSpan();
+
+        // We are given a range by the client, but our mapping only succeeds if the start and end of the range can both be mapped
+        // to C#. Since that doesn't logically match what we want from inlay hints, we instead get the minimum range of mappable
+        // C# to get hints for. We'll filter that later, to remove the sections that can't be mapped back.
+        if (!_documentMappingService.TryMapToGeneratedDocumentRange(csharpDocument, span, out var projectedLinePositionSpan) &&
+            !codeDocument.TryGetMinimalCSharpRange(span, out projectedLinePositionSpan))
+        {
+            // There's no C# in the range.
+            return null;
+        }
+
+        var generatedDocument = await context.GetGeneratedDocumentAsync(_filePathService, cancellationToken).ConfigureAwait(false);
+
+        var textDocument = inlayHintParams.TextDocument.WithUri(generatedDocument.CreateUri());
+        var range = projectedLinePositionSpan.ToRange();
+
+        var hints = await InlayHints.GetInlayHintsAsync(generatedDocument, textDocument, range, displayAllOverride, cancellationToken).ConfigureAwait(false);
+
+        if (hints is null)
+        {
+            return null;
+        }
+
+        using var inlayHintsBuilder = new PooledArrayBuilder<InlayHint>();
+        var razorSourceText = codeDocument.Source.Text;
+        var csharpSourceText = codeDocument.GetCSharpSourceText();
+        var syntaxTree = codeDocument.GetSyntaxTree();
+        foreach (var hint in hints)
+        {
+            if (csharpSourceText.TryGetAbsoluteIndex(hint.Position.ToLinePosition(), out var absoluteIndex) &&
+                _documentMappingService.TryMapToHostDocumentPosition(csharpDocument, absoluteIndex, out var hostDocumentPosition, out var hostDocumentIndex))
+            {
+                // We know this C# maps to Razor, but does it map to Razor that we like?
+                var node = syntaxTree.Root.FindInnermostNode(hostDocumentIndex);
+                if (node?.FirstAncestorOrSelf<MarkupTagHelperAttributeValueSyntax>() is not null)
+                {
+                    continue;
+                }
+
+                if (hint.TextEdits is not null)
+                {
+                    var changes = hint.TextEdits.Select(csharpSourceText.GetTextChange);
+                    var mappedChanges = _documentMappingService.GetHostDocumentEdits(csharpDocument, changes);
+                    hint.TextEdits = mappedChanges.Select(razorSourceText.GetTextEdit).ToArray();
+                }
+
+                hint.Data = new InlayHintDataWrapper(inlayHintParams.TextDocument, hint.Data, hint.Position);
+                hint.Position = hostDocumentPosition.ToPosition();
+
+                inlayHintsBuilder.Add(hint);
+            }
+        }
+
+        return inlayHintsBuilder.ToArray();
+    }
+
+    public ValueTask<InlayHint> ResolveHintAsync(JsonSerializableRazorPinnedSolutionInfoWrapper solutionInfo, JsonSerializableDocumentId razorDocumentId, InlayHint inlayHint, CancellationToken cancellationToken)
+       => RunServiceAsync(
+            solutionInfo,
+            razorDocumentId,
+            context => ResolveInlayHintAsync(context, inlayHint, cancellationToken),
+            cancellationToken);
+
+    private async ValueTask<InlayHint> ResolveInlayHintAsync(RemoteDocumentContext context, InlayHint inlayHint, CancellationToken cancellationToken)
+    {
+        var generatedDocument = await context.GetGeneratedDocumentAsync(_filePathService, cancellationToken).ConfigureAwait(false);
+
+        return await InlayHints.ResolveInlayHintAsync(generatedDocument, inlayHint, cancellationToken).ConfigureAwait(false);
+    }
+}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/DocumentContextExtensions.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/DocumentContextExtensions.cs
index 8bd847b64fb..bd29cf52ab3 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/DocumentContextExtensions.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/DocumentContextExtensions.cs
@@ -14,26 +14,35 @@ namespace Microsoft.CodeAnalysis.Remote.Razor;
 
 internal static class DocumentContextExtensions
 {
-    public static async Task<Document> GetGeneratedDocumentAsync(this VersionedDocumentContext documentContext, IFilePathService filePathService, CancellationToken cancellationToken)
+    public static async Task<Document> GetGeneratedDocumentAsync(
+        this VersionedDocumentContext documentContext,
+        IFilePathService filePathService,
+        CancellationToken cancellationToken)
     {
         Debug.Assert(documentContext.Snapshot is RemoteDocumentSnapshot, "This method only works on document contexts created in the OOP process");
 
         var snapshot = (RemoteDocumentSnapshot)documentContext.Snapshot;
-        var razorDocument = snapshot.TextDocument;
-        var solution = razorDocument.Project.Solution;
 
-        // TODO: A real implementation needs to get the SourceGeneratedDocument from the solution
+        return await snapshot.GetOrAddGeneratedDocumentAsync(
+            (snapshot, documentContext, filePathService, cancellationToken),
+            static async arg =>
+            {
+                var (snapshot, documentContext, filePathService, cancellationToken) = arg;
 
-        var projectKey = razorDocument.Project.ToProjectKey();
-        var generatedFilePath = filePathService.GetRazorCSharpFilePath(projectKey, razorDocument.FilePath.AssumeNotNull());
-        var generatedDocumentId = solution.GetDocumentIdsWithFilePath(generatedFilePath).First(d => d.ProjectId == razorDocument.Project.Id);
-        var generatedDocument = solution.GetDocument(generatedDocumentId).AssumeNotNull();
+                var razorDocument = snapshot.TextDocument;
+                var projectKey = snapshot.Project.Key;
+                var solution = razorDocument.Project.Solution;
 
-        var csharpSourceText = await documentContext.GetCSharpSourceTextAsync(cancellationToken).ConfigureAwait(false);
+                // TODO: A real implementation needs to get the SourceGeneratedDocument from the solution
 
-        // HACK: We're not in the same solution fork as the LSP server that provides content for this document
-        generatedDocument = generatedDocument.WithText(csharpSourceText);
+                var generatedFilePath = filePathService.GetRazorCSharpFilePath(projectKey, razorDocument.FilePath.AssumeNotNull());
+                var generatedDocumentId = solution.GetDocumentIdsWithFilePath(generatedFilePath).First(d => d.ProjectId == razorDocument.Project.Id);
+                var generatedDocument = solution.GetRequiredDocument(generatedDocumentId);
 
-        return generatedDocument;
+                var csharpSourceText = await documentContext.GetCSharpSourceTextAsync(cancellationToken).ConfigureAwait(false);
+
+                // HACK: We're not in the same solution fork as the LSP server that provides content for this document
+                return generatedDocument.WithText(csharpSourceText);
+            });
     }
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/DocumentContextFactory.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/DocumentContextFactory.cs
deleted file mode 100644
index a23e018bcd1..00000000000
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/DocumentContextFactory.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the MIT license. See License.txt in the project root for license information.
-
-using System;
-using System.Composition;
-using System.Diagnostics.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor.ProjectSystem;
-using Microsoft.VisualStudio.LanguageServer.Protocol;
-
-namespace Microsoft.CodeAnalysis.Remote.Razor.ProjectSystem;
-
-[Export(typeof(IDocumentContextFactory)), Shared]
-internal class DocumentContextFactory : IDocumentContextFactory
-{
-    public bool TryCreate(
-        Uri documentUri,
-        VSProjectContext? projectContext,
-        bool versioned,
-        [NotNullWhen(true)] out DocumentContext? context)
-    {
-        throw new NotSupportedException("OOP doesn't support this yet, because we don't have a way to pass in the right solution snapshot to use");
-    }
-}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/RemoteDocumentSnapshot.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/RemoteDocumentSnapshot.cs
index 165080486d4..e7a2232c0a6 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/RemoteDocumentSnapshot.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/RemoteDocumentSnapshot.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
+using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using System.Threading.Tasks;
@@ -16,6 +17,9 @@ internal class RemoteDocumentSnapshot(TextDocument textDocument, RemoteProjectSn
     private readonly TextDocument _textDocument = textDocument;
     private readonly RemoteProjectSnapshot _projectSnapshot = projectSnapshot;
 
+    // TODO: Delete this field when the source generator is hooked up
+    private Document? _generatedDocument;
+
     private RazorCodeDocument? _codeDocument;
 
     public TextDocument TextDocument => _textDocument;
@@ -43,9 +47,9 @@ public async Task<RazorCodeDocument> GetGeneratedOutputAsync()
         // TODO: We don't need to worry about locking if we get called from the didOpen/didChange LSP requests, as CLaSP
         //       takes care of that for us, and blocks requests until those are complete. If that doesn't end up happening,
         //       then a locking mechanism here would prevent concurrent compilations.
-        if (_codeDocument is not null)
+        if (TryGetGeneratedOutput(out var codeDocument))
         {
-            return _codeDocument;
+            return codeDocument;
         }
 
         // The non-cohosted DocumentSnapshot implementation uses DocumentState to get the generated output, and we could do that too
@@ -63,9 +67,19 @@ public async Task<RazorCodeDocument> GetGeneratedOutputAsync()
         // TODO: Get the configuration for forceRuntimeCodeGeneration
         // var forceRuntimeCodeGeneration = _projectSnapshot.Configuration.LanguageServerFlags?.ForceRuntimeCodeGeneration ?? false;
 
-        _codeDocument = await DocumentState.GenerateCodeDocumentAsync(tagHelpers, projectEngine, this, imports, forceRuntimeCodeGeneration: false).ConfigureAwait(false);
+        codeDocument = await DocumentState
+            .GenerateCodeDocumentAsync(this, projectEngine, imports, tagHelpers, forceRuntimeCodeGeneration: false)
+            .ConfigureAwait(false);
 
-        return _codeDocument;
+        return InterlockedOperations.Initialize(ref _codeDocument, codeDocument);
+    }
+
+    public IDocumentSnapshot WithText(SourceText text)
+    {
+        var id = _textDocument.Id;
+        var newDocument = _textDocument.Project.Solution.WithAdditionalDocumentText(id, text).GetAdditionalDocument(id).AssumeNotNull();
+
+        return new RemoteDocumentSnapshot(newDocument, _projectSnapshot);
     }
 
     public bool TryGetGeneratedOutput([NotNullWhen(true)] out RazorCodeDocument? result)
@@ -74,11 +88,14 @@ public bool TryGetGeneratedOutput([NotNullWhen(true)] out RazorCodeDocument? res
         return result is not null;
     }
 
-    public IDocumentSnapshot WithText(SourceText text)
+    public async Task<Document> GetOrAddGeneratedDocumentAsync<TArg>(TArg arg, Func<TArg, Task<Document>> createGeneratedDocument)
     {
-        var id = _textDocument.Id;
-        var newDocument = _textDocument.Project.Solution.WithAdditionalDocumentText(id, text).GetAdditionalDocument(id).AssumeNotNull();
+        if (_generatedDocument is Document generatedDocument)
+        {
+            return generatedDocument;
+        }
 
-        return new RemoteDocumentSnapshot(newDocument, _projectSnapshot);
+        generatedDocument = await createGeneratedDocument(arg);
+        return InterlockedOperations.Initialize(ref _generatedDocument, generatedDocument);
     }
 }
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/RemoteProjectCollectionResolver.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/RemoteProjectCollectionResolver.cs
new file mode 100644
index 00000000000..45f6a5b482b
--- /dev/null
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/RemoteProjectCollectionResolver.cs
@@ -0,0 +1,27 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Composition;
+using System.Diagnostics;
+using Microsoft.CodeAnalysis.Razor.ProjectSystem;
+using Microsoft.CodeAnalysis.Razor.Workspaces;
+
+namespace Microsoft.CodeAnalysis.Remote.Razor.ProjectSystem;
+
+[Export(typeof(IProjectCollectionResolver)), Shared]
+[method: ImportingConstructor]
+internal class RemoteProjectCollectionResolver(ProjectSnapshotFactory projectSnapshotFactory) : IProjectCollectionResolver
+{
+    public IEnumerable<IProjectSnapshot> EnumerateProjects(IDocumentSnapshot snapshot)
+    {
+        Debug.Assert(snapshot is RemoteDocumentSnapshot);
+
+        var projects = ((RemoteDocumentSnapshot)snapshot).TextDocument.Project.Solution.Projects;
+
+        foreach (var project in projects)
+        {
+            yield return projectSnapshotFactory.GetOrCreate(project);
+        }
+    }
+}
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/RemoteProjectSnapshot.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/RemoteProjectSnapshot.cs
index 2676dd1ab5f..cfd8e70171a 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/RemoteProjectSnapshot.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/ProjectSystem/RemoteProjectSnapshot.cs
@@ -25,22 +25,23 @@ namespace Microsoft.CodeAnalysis.Remote.Razor.ProjectSystem;
 
 internal class RemoteProjectSnapshot : IProjectSnapshot
 {
+    public ProjectKey Key { get; }
+
     private readonly Project _project;
     private readonly DocumentSnapshotFactory _documentSnapshotFactory;
     private readonly ITelemetryReporter _telemetryReporter;
-    private readonly ProjectKey _projectKey;
     private readonly Lazy<RazorConfiguration> _lazyConfiguration;
     private readonly Lazy<RazorProjectEngine> _lazyProjectEngine;
     private readonly Lazy<ImmutableDictionary<string, ImmutableArray<string>>> _importsToRelatedDocumentsLazy;
 
-    private ImmutableArray<TagHelperDescriptor>? _tagHelpers;
+    private ImmutableArray<TagHelperDescriptor> _tagHelpers;
 
     public RemoteProjectSnapshot(Project project, DocumentSnapshotFactory documentSnapshotFactory, ITelemetryReporter telemetryReporter)
     {
         _project = project;
         _documentSnapshotFactory = documentSnapshotFactory;
         _telemetryReporter = telemetryReporter;
-        _projectKey = _project.ToProjectKey();
+        Key = _project.ToProjectKey();
 
         _lazyConfiguration = new Lazy<RazorConfiguration>(CreateRazorConfiguration);
         _lazyProjectEngine = new Lazy<RazorProjectEngine>(() =>
@@ -59,24 +60,39 @@ public RemoteProjectSnapshot(Project project, DocumentSnapshotFactory documentSn
         _importsToRelatedDocumentsLazy = new Lazy<ImmutableDictionary<string, ImmutableArray<string>>>(() =>
         {
             var importsToRelatedDocuments = ImmutableDictionary.Create<string, ImmutableArray<string>>(FilePathNormalizingComparer.Instance);
-            foreach (var document in DocumentFilePaths)
+            foreach (var documentFilePath in DocumentFilePaths)
             {
-                var importTargetPaths = ProjectState.GetImportDocumentTargetPaths(document, FileKinds.GetFileKindFromFilePath(document), _lazyProjectEngine.Value);
-                importsToRelatedDocuments = ProjectState.AddToImportsToRelatedDocuments(importsToRelatedDocuments, document, importTargetPaths);
+                var importTargetPaths = ProjectState.GetImportDocumentTargetPaths(documentFilePath, FileKinds.GetFileKindFromFilePath(documentFilePath), _lazyProjectEngine.Value);
+                importsToRelatedDocuments = ProjectState.AddToImportsToRelatedDocuments(importsToRelatedDocuments, documentFilePath, importTargetPaths);
             }
 
             return importsToRelatedDocuments;
         });
     }
 
-    public ProjectKey Key => _projectKey;
-
     public RazorConfiguration Configuration => throw new InvalidOperationException("Should not be called for cohosted projects.");
 
     public IEnumerable<string> DocumentFilePaths
-        => _project.AdditionalDocuments
-            .Where(d => d.FilePath!.EndsWith(".razor", StringComparison.OrdinalIgnoreCase) || d.FilePath.EndsWith(".cshtml", StringComparison.OrdinalIgnoreCase))
-            .Select(d => d.FilePath.AssumeNotNull());
+    {
+        get
+        {
+            foreach (var additionalDocument in _project.AdditionalDocuments)
+            {
+                if (additionalDocument.FilePath is not string filePath)
+                {
+                    continue;
+                }
+
+                if (!filePath.EndsWith(".razor", StringComparison.OrdinalIgnoreCase) &&
+                    !filePath.EndsWith(".cshtml", StringComparison.OrdinalIgnoreCase))
+                {
+                    continue;
+                }
+
+                yield return filePath;
+            }
+        }
+    }
 
     public string FilePath => _project.FilePath!;
 
@@ -92,13 +108,23 @@ public IEnumerable<string> DocumentFilePaths
 
     public async ValueTask<ImmutableArray<TagHelperDescriptor>> GetTagHelpersAsync(CancellationToken cancellationToken)
     {
-        if (_tagHelpers is null)
+        if (_tagHelpers.IsDefault)
         {
-            var resolver = new CompilationTagHelperResolver(_telemetryReporter);
-            _tagHelpers = await resolver.GetTagHelpersAsync(_project, _lazyProjectEngine.Value, cancellationToken).ConfigureAwait(false);
+            var computedTagHelpers = await ComputeTagHelpersAsync(_project, _lazyProjectEngine.Value, _telemetryReporter, cancellationToken);
+            ImmutableInterlocked.InterlockedInitialize(ref _tagHelpers, computedTagHelpers);
         }
 
-        return _tagHelpers.GetValueOrDefault();
+        return _tagHelpers;
+
+        static ValueTask<ImmutableArray<TagHelperDescriptor>> ComputeTagHelpersAsync(
+            Project project,
+            RazorProjectEngine projectEngine,
+            ITelemetryReporter telemetryReporter,
+            CancellationToken cancellationToken)
+        {
+            var resolver = new CompilationTagHelperResolver(telemetryReporter);
+            return resolver.GetTagHelpersAsync(project, projectEngine, cancellationToken);
+        }
     }
 
     public ProjectWorkspaceState ProjectWorkspaceState => throw new InvalidOperationException("Should not be called for cohosted projects.");
@@ -134,26 +160,26 @@ public ImmutableArray<IDocumentSnapshot> GetRelatedDocuments(IDocumentSnapshot d
 
         if (!_importsToRelatedDocumentsLazy.Value.TryGetValue(targetPath, out var relatedDocuments))
         {
-            return ImmutableArray<IDocumentSnapshot>.Empty;
+            return [];
         }
 
-        using var _ = ArrayBuilderPool<IDocumentSnapshot>.GetPooledObject(out var builder);
-        builder.SetCapacityIfLarger(relatedDocuments.Length);
+        using var builder = new PooledArrayBuilder<IDocumentSnapshot>(relatedDocuments.Length);
 
         foreach (var relatedDocumentFilePath in relatedDocuments)
         {
-            if (GetDocument(relatedDocumentFilePath) is { } relatedDocument)
+            if (TryGetDocument(relatedDocumentFilePath, out var relatedDocument))
             {
                 builder.Add(relatedDocument);
             }
         }
 
-        return builder.ToImmutableArray();
+        return builder.DrainToImmutable();
     }
 
     public bool IsImportDocument(IDocumentSnapshot document)
     {
-        return document.TargetPath is { } targetPath && _importsToRelatedDocumentsLazy.Value.ContainsKey(targetPath);
+        return document.TargetPath is { } targetPath &&
+               _importsToRelatedDocumentsLazy.Value.ContainsKey(targetPath);
     }
 
     private RazorConfiguration CreateRazorConfiguration()
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RemoteWorkspaceAccessor.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RemoteWorkspaceAccessor.cs
index f8e3087df91..8daf670d224 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RemoteWorkspaceAccessor.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/RemoteWorkspaceAccessor.cs
@@ -15,7 +15,7 @@ internal static class RemoteWorkspaceAccessor
     /// process that is explicitly denied via an exception. This method serves as a workaround when a workspace is
     /// needed (eg, the Go To Definition API requires one).
     ///
-    /// This should be used sparingly nad carefully, and no updates should be made to the workspace.
+    /// This should be used sparingly and carefully, and no updates should be made to the workspace.
     /// </remarks>
     public static Workspace GetWorkspace()
         => RazorBrokeredServiceImplementation.GetWorkspace();
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/SemanticTokens/RazorSemanticTokensInfoService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/SemanticTokens/RazorSemanticTokensInfoService.cs
index 9414fa0ec1f..a9b19f9a2c2 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/SemanticTokens/RazorSemanticTokensInfoService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/SemanticTokens/RazorSemanticTokensInfoService.cs
@@ -13,7 +13,7 @@ namespace Microsoft.CodeAnalysis.Remote.Razor.SemanticTokens;
 [Export(typeof(IRazorSemanticTokensInfoService)), Shared]
 [method: ImportingConstructor]
 internal class RazorSemanticTokensInfoService(
-    IRazorDocumentMappingService documentMappingService,
+    IDocumentMappingService documentMappingService,
     ISemanticTokensLegendService semanticTokensLegendService,
     ICSharpSemanticTokensProvider csharpSemanticTokensProvider,
     LanguageServerFeatureOptions languageServerFeatureOptions,
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/SignatureHelp/RemoteSignatureHelpService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/SignatureHelp/RemoteSignatureHelpService.cs
index 08971e58191..fb4fa23635a 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/SignatureHelp/RemoteSignatureHelpService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/SignatureHelp/RemoteSignatureHelpService.cs
@@ -26,7 +26,7 @@ protected override IRemoteSignatureHelpService CreateService(in ServiceArgs args
     }
 
     private readonly IFilePathService _filePathService = args.ExportProvider.GetExportedValue<IFilePathService>();
-    private readonly IRazorDocumentMappingService _documentMappingService = args.ExportProvider.GetExportedValue<IRazorDocumentMappingService>();
+    private readonly IDocumentMappingService _documentMappingService = args.ExportProvider.GetExportedValue<IDocumentMappingService>();
 
     public ValueTask<SignatureHelp?> GetSignatureHelpAsync(JsonSerializableRazorPinnedSolutionInfoWrapper solutionInfo, JsonSerializableDocumentId documentId, Position position, CancellationToken cancellationToken)
         => RunServiceAsync(
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/UriPresentation/RemoteUriPresentationService.cs b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/UriPresentation/RemoteUriPresentationService.cs
index db920ccee6c..23336fb656d 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/UriPresentation/RemoteUriPresentationService.cs
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/UriPresentation/RemoteUriPresentationService.cs
@@ -25,7 +25,7 @@ protected override IRemoteUriPresentationService CreateService(in ServiceArgs ar
             => new RemoteUriPresentationService(in args);
     }
 
-    private readonly IRazorDocumentMappingService _documentMappingService = args.ExportProvider.GetExportedValue<IRazorDocumentMappingService>();
+    private readonly IDocumentMappingService _documentMappingService = args.ExportProvider.GetExportedValue<IDocumentMappingService>();
 
     public ValueTask<Response> GetPresentationAsync(
         RazorPinnedSolutionInfoWrapper solutionInfo,
@@ -73,8 +73,7 @@ private async ValueTask<Response> GetPresentationAsync(
         var solution = context.TextDocument.Project.Solution;
 
         // Make sure we go through Roslyn to go from the Uri the client sent us, to one that it has a chance of finding in the solution
-        var uriToFind = RazorUri.GetDocumentFilePathFromUri(razorFileUri);
-        var ids = solution.GetDocumentIdsWithFilePath(uriToFind);
+        var ids = solution.GetDocumentIdsWithUri(razorFileUri);
         if (ids.Length == 0)
         {
             return Response.CallHtml;
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/DynamicFiles/RazorDocumentExcerptService.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/DynamicFiles/RazorDocumentExcerptService.cs
index 3c7fb61c775..075a4769f70 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/DynamicFiles/RazorDocumentExcerptService.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/DynamicFiles/RazorDocumentExcerptService.cs
@@ -135,9 +135,13 @@ internal class RazorDocumentExcerptService(
             var offset = primarySpan.Start - secondarySpan.Start;
             foreach (var classifiedSecondarySpan in classifiedSecondarySpans)
             {
-                Debug.Assert(secondarySpan.Contains(classifiedSecondarySpan.TextSpan));
+                // It's possible for the classified span to extend past our secondary span, so we cap it
+                var classifiedSpan = classifiedSecondarySpan.TextSpan.End > secondarySpan.End
+                    ? TextSpan.FromBounds(classifiedSecondarySpan.TextSpan.Start, secondarySpan.End)
+                    : classifiedSecondarySpan.TextSpan;
+                Debug.Assert(secondarySpan.Contains(classifiedSpan));
 
-                var updated = new TextSpan(classifiedSecondarySpan.TextSpan.Start + offset, classifiedSecondarySpan.TextSpan.Length);
+                var updated = new TextSpan(classifiedSpan.Start + offset, classifiedSpan.Length);
                 Debug.Assert(primarySpan.Contains(updated));
 
                 // Make sure that we're not introducing a gap. Remember, we need to fill in the whitespace.
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostDocumentHighlightPresentationEndpoint.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostDocumentHighlightPresentationEndpoint.cs
index e832f7561d8..bece5d33b1c 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostDocumentHighlightPresentationEndpoint.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostDocumentHighlightPresentationEndpoint.cs
@@ -13,7 +13,6 @@
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.VisualStudio.LanguageServer.ContainedLanguage;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Microsoft.VisualStudio.Razor.LanguageClient.Extensions;
 
 namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
 
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostFoldingRangeEndpoint.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostFoldingRangeEndpoint.cs
index be3ab94f529..b93a861c4e7 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostFoldingRangeEndpoint.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostFoldingRangeEndpoint.cs
@@ -15,7 +15,6 @@
 using Microsoft.CodeAnalysis.Razor.Remote;
 using Microsoft.VisualStudio.LanguageServer.ContainedLanguage;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Microsoft.VisualStudio.Razor.LanguageClient.Extensions;
 
 namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
 
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostInlayHintEndpoint.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostInlayHintEndpoint.cs
new file mode 100644
index 00000000000..6cba8cd5cb5
--- /dev/null
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostInlayHintEndpoint.cs
@@ -0,0 +1,76 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost;
+using Microsoft.CodeAnalysis.Razor.Remote;
+using Roslyn.LanguageServer.Protocol;
+using VSLSP = Microsoft.VisualStudio.LanguageServer.Protocol;
+
+namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
+
+#pragma warning disable RS0030 // Do not use banned APIs
+[Shared]
+[CohostEndpoint(Methods.TextDocumentInlayHintName)]
+[Export(typeof(IDynamicRegistrationProvider))]
+[ExportCohostStatelessLspService(typeof(CohostInlayHintEndpoint))]
+[method: ImportingConstructor]
+#pragma warning restore RS0030 // Do not use banned APIs
+internal class CohostInlayHintEndpoint(IRemoteServiceInvoker remoteServiceInvoker)
+    : AbstractRazorCohostDocumentRequestHandler<InlayHintParams, InlayHint[]?>, IDynamicRegistrationProvider
+{
+    private readonly IRemoteServiceInvoker _remoteServiceInvoker = remoteServiceInvoker;
+
+    protected override bool MutatesSolutionState => false;
+
+    protected override bool RequiresLSPSolution => true;
+
+    public VSLSP.Registration? GetRegistration(VSLSP.VSInternalClientCapabilities clientCapabilities, VSLSP.DocumentFilter[] filter, RazorCohostRequestContext requestContext)
+    {
+        if (clientCapabilities.TextDocument?.InlayHint?.DynamicRegistration == true)
+        {
+            return new VSLSP.Registration
+            {
+                Method = Methods.TextDocumentInlayHintName,
+                RegisterOptions = new VSLSP.InlayHintRegistrationOptions()
+                {
+                    DocumentSelector = filter
+                }
+            };
+        }
+
+        return null;
+    }
+
+    protected override RazorTextDocumentIdentifier? GetRazorTextDocumentIdentifier(InlayHintParams request)
+        => request.TextDocument.ToRazorTextDocumentIdentifier();
+
+    protected override Task<InlayHint[]?> HandleRequestAsync(InlayHintParams request, RazorCohostRequestContext context, CancellationToken cancellationToken)
+    {
+        // TODO: Once the platform team have finished the work, check the "Show inlay hints while key pressed" option, and pass it along
+        return HandleRequestAsync(request, context.TextDocument.AssumeNotNull(), displayAllOverride: false, cancellationToken);
+    }
+
+    private async Task<InlayHint[]?> HandleRequestAsync(InlayHintParams request, TextDocument razorDocument, bool displayAllOverride, CancellationToken cancellationToken)
+    {
+        // Normally we could remove the await here, but in this case it neatly converts from ValueTask to Task for us,
+        // and more importantly this method is essentially a public API entry point (via LSP) so having it appear in
+        // call stacks is desirable
+        return await _remoteServiceInvoker.TryInvokeAsync<IRemoteInlayHintService, InlayHint[]?>(
+            razorDocument.Project.Solution,
+            (service, solutionInfo, cancellationToken) => service.GetInlayHintsAsync(solutionInfo, razorDocument.Id, request, displayAllOverride, cancellationToken),
+            cancellationToken).ConfigureAwait(false);
+    }
+
+    internal TestAccessor GetTestAccessor() => new(this);
+
+    internal readonly struct TestAccessor(CohostInlayHintEndpoint instance)
+    {
+        public Task<InlayHint[]?> HandleRequestAsync(InlayHintParams request, TextDocument razorDocument, bool displayAllOverride, CancellationToken cancellationToken)
+            => instance.HandleRequestAsync(request, razorDocument, displayAllOverride, cancellationToken);
+    }
+}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostInlayHintResolveEndpoint.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostInlayHintResolveEndpoint.cs
new file mode 100644
index 00000000000..0ed49f2c31c
--- /dev/null
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostInlayHintResolveEndpoint.cs
@@ -0,0 +1,120 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System.Composition;
+using System.Diagnostics;
+using System.Text.Json;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost;
+using Microsoft.CodeAnalysis.Razor.Logging;
+using Microsoft.CodeAnalysis.Razor.Protocol.InlayHints;
+using Microsoft.CodeAnalysis.Razor.Remote;
+using Roslyn.LanguageServer.Protocol;
+using VSLSP = Microsoft.VisualStudio.LanguageServer.Protocol;
+
+namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
+
+#pragma warning disable RS0030 // Do not use banned APIs
+[Shared]
+[CohostEndpoint(Methods.InlayHintResolveName)]
+[Export(typeof(IDynamicRegistrationProvider))]
+[ExportCohostStatelessLspService(typeof(CohostInlayHintResolveEndpoint))]
+[method: ImportingConstructor]
+#pragma warning restore RS0030 // Do not use banned APIs
+internal class CohostInlayHintResolveEndpoint(IRemoteServiceInvoker remoteServiceInvoker, ILoggerFactory loggerFactory)
+    : AbstractRazorCohostDocumentRequestHandler<InlayHint, InlayHint?>, IDynamicRegistrationProvider
+{
+    private readonly IRemoteServiceInvoker _remoteServiceInvoker = remoteServiceInvoker;
+    private readonly ILogger _logger = loggerFactory.GetOrCreateLogger<CohostInlayHintResolveEndpoint>();
+
+    protected override bool MutatesSolutionState => false;
+
+    protected override bool RequiresLSPSolution => true;
+
+    public VSLSP.Registration? GetRegistration(VSLSP.VSInternalClientCapabilities clientCapabilities, VSLSP.DocumentFilter[] filter, RazorCohostRequestContext requestContext)
+    {
+        if (clientCapabilities.TextDocument?.InlayHint?.DynamicRegistration == true)
+        {
+            return new VSLSP.Registration
+            {
+                Method = Methods.TextDocumentInlayHintName,
+                RegisterOptions = new VSLSP.InlayHintRegistrationOptions()
+                {
+                    DocumentSelector = filter
+                }
+            };
+        }
+
+        return null;
+    }
+
+    protected override RazorTextDocumentIdentifier? GetRazorTextDocumentIdentifier(InlayHint request)
+        => GetTextDocumentIdentifier(request)?.ToRazorTextDocumentIdentifier() ?? null;
+
+    private TextDocumentIdentifier? GetTextDocumentIdentifier(InlayHint request)
+    {
+        var data = GetInlayHintResolveData(request);
+        if (data is null)
+        {
+            _logger.LogError($"Got a resolve request for an inlay hint but couldn't extract the data object. Raw data is: {request.Data}");
+            return null;
+        }
+
+        return data.TextDocument;
+    }
+
+    protected override Task<InlayHint?> HandleRequestAsync(InlayHint request, RazorCohostRequestContext context, CancellationToken cancellationToken)
+        => HandleRequestAsync(request, context.TextDocument.AssumeNotNull(), cancellationToken);
+
+    private async Task<InlayHint?> HandleRequestAsync(InlayHint request, TextDocument razorDocument, CancellationToken cancellationToken)
+    {
+        var razorData = GetInlayHintResolveData(request).AssumeNotNull();
+        var razorPosition = request.Position;
+        request.Data = razorData.OriginalData;
+        request.Position = razorData.OriginalPosition;
+
+        var hint = await _remoteServiceInvoker.TryInvokeAsync<IRemoteInlayHintService, InlayHint>(
+           razorDocument.Project.Solution,
+           (service, solutionInfo, cancellationToken) => service.ResolveHintAsync(solutionInfo, razorDocument.Id, request, cancellationToken),
+           cancellationToken).ConfigureAwait(false);
+
+        if (hint is null)
+        {
+            return null;
+        }
+
+        Debug.Assert(request.Position == hint.Position, "Resolving inlay hints should not change the position of them.");
+        hint.Position = razorPosition;
+
+        return hint;
+    }
+
+    private static InlayHintDataWrapper? GetInlayHintResolveData(InlayHint inlayHint)
+    {
+        if (inlayHint.Data is InlayHintDataWrapper wrapper)
+        {
+            return wrapper;
+        }
+
+        if (inlayHint.Data is JsonElement json)
+        {
+            return JsonSerializer.Deserialize<InlayHintDataWrapper>(json);
+        }
+
+        return null;
+    }
+
+    internal TestAccessor GetTestAccessor() => new(this);
+
+    internal readonly struct TestAccessor(CohostInlayHintResolveEndpoint instance)
+    {
+        public TextDocumentIdentifier? GetTextDocumentIdentifier(InlayHint request)
+            => instance.GetTextDocumentIdentifier(request);
+
+        public Task<InlayHint?> HandleRequestAsync(InlayHint request, TextDocument razorDocument, CancellationToken cancellationToken)
+            => instance.HandleRequestAsync(request, razorDocument, cancellationToken);
+    }
+}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostLinkedEditingRangeEndpoint.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostLinkedEditingRangeEndpoint.cs
index f1f42f472dc..b98eb1bed4a 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostLinkedEditingRangeEndpoint.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostLinkedEditingRangeEndpoint.cs
@@ -8,12 +8,10 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost;
 using Microsoft.CodeAnalysis.Razor.LinkedEditingRange;
-using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.Remote;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Microsoft.VisualStudio.Razor.LanguageClient.Extensions;
 
 namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
 
@@ -24,11 +22,10 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
 [ExportCohostStatelessLspService(typeof(CohostLinkedEditingRangeEndpoint))]
 [method: ImportingConstructor]
 #pragma warning restore RS0030 // Do not use banned APIs
-internal class CohostLinkedEditingRangeEndpoint(IRemoteServiceInvoker remoteServiceInvoker, ILoggerFactory loggerFactory)
+internal class CohostLinkedEditingRangeEndpoint(IRemoteServiceInvoker remoteServiceInvoker)
     : AbstractRazorCohostDocumentRequestHandler<LinkedEditingRangeParams, LinkedEditingRanges?>, IDynamicRegistrationProvider
 {
     private readonly IRemoteServiceInvoker _remoteServiceInvoker = remoteServiceInvoker;
-    private readonly ILogger _logger = loggerFactory.GetOrCreateLogger<CohostLinkedEditingRangeEndpoint>();
 
     protected override bool MutatesSolutionState => false;
 
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostSemanticTokensRangeEndpoint.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostSemanticTokensRangeEndpoint.cs
index 77504ae52e2..bd113a4c82d 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostSemanticTokensRangeEndpoint.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostSemanticTokensRangeEndpoint.cs
@@ -11,12 +11,10 @@
 using Microsoft.AspNetCore.Razor.Telemetry;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost;
-using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.Remote;
 using Microsoft.CodeAnalysis.Razor.SemanticTokens;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Microsoft.VisualStudio.Razor.LanguageClient.Extensions;
 using Microsoft.VisualStudio.Razor.Settings;
 
 namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
@@ -32,15 +30,13 @@ internal sealed class CohostSemanticTokensRangeEndpoint(
     IRemoteServiceInvoker remoteServiceInvoker,
     IClientSettingsManager clientSettingsManager,
     ISemanticTokensLegendService semanticTokensLegendService,
-    ITelemetryReporter telemetryReporter,
-    ILoggerFactory loggerFactory)
+    ITelemetryReporter telemetryReporter)
     : AbstractRazorCohostDocumentRequestHandler<SemanticTokensRangeParams, SemanticTokens?>, IDynamicRegistrationProvider
 {
     private readonly IRemoteServiceInvoker _remoteServiceInvoker = remoteServiceInvoker;
     private readonly IClientSettingsManager _clientSettingsManager = clientSettingsManager;
     private readonly ISemanticTokensLegendService _semanticTokensLegendService = semanticTokensLegendService;
     private readonly ITelemetryReporter _telemetryReporter = telemetryReporter;
-    private readonly ILogger _logger = loggerFactory.GetOrCreateLogger<CohostSemanticTokensRangeEndpoint>();
 
     protected override bool MutatesSolutionState => false;
     protected override bool RequiresLSPSolution => true;
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostSignatureHelpEndpoint.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostSignatureHelpEndpoint.cs
index 1acfee411eb..22a7035793b 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostSignatureHelpEndpoint.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Cohost/CohostSignatureHelpEndpoint.cs
@@ -11,11 +11,11 @@
 using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost;
 using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.Remote;
+using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.VisualStudio.LanguageServer.ContainedLanguage;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 using Microsoft.VisualStudio.Razor.LanguageClient;
 using Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
-using Microsoft.VisualStudio.Razor.LanguageClient.Extensions;
 using Microsoft.VisualStudio.Razor.Settings;
 using static Roslyn.LanguageServer.Protocol.RoslynLspExtensions;
 using RoslynLspFactory = Roslyn.LanguageServer.Protocol.RoslynLspFactory;
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 4582ca61358..4a4c494d00a 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
@@ -12,7 +12,6 @@
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.LanguageServer.ContainedLanguage;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Microsoft.VisualStudio.Razor.LanguageClient.Extensions;
 
 namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
 
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 6f86ccd57dd..21bf886e1ba 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
@@ -11,7 +11,6 @@
 using Microsoft.CodeAnalysis.Razor.Protocol.Completion;
 using Microsoft.VisualStudio.LanguageServer.ContainedLanguage;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Microsoft.VisualStudio.Razor.LanguageClient.Extensions;
 using Microsoft.VisualStudio.Razor.Snippets;
 using StreamJsonRpc;
 
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 0ac519a37af..3329cf7980e 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
@@ -9,7 +9,6 @@
 using Microsoft.CodeAnalysis.Razor.Protocol.Diagnostics;
 using Microsoft.VisualStudio.LanguageServer.ContainedLanguage;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Microsoft.VisualStudio.Razor.LanguageClient.Extensions;
 using StreamJsonRpc;
 
 namespace Microsoft.VisualStudio.Razor.LanguageClient.Endpoints;
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_DocumentSymbol.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_DocumentSymbol.cs
index 99ffec04426..f576c42668e 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_DocumentSymbol.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_DocumentSymbol.cs
@@ -5,7 +5,6 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Microsoft.VisualStudio.Razor.LanguageClient.Extensions;
 using StreamJsonRpc;
 
 namespace Microsoft.VisualStudio.Razor.LanguageClient.Endpoints;
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 a9be7721d86..4aff2d9d5f0 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
@@ -9,7 +9,6 @@
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Razor.Protocol.Folding;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Microsoft.VisualStudio.Razor.LanguageClient.Extensions;
 using StreamJsonRpc;
 
 namespace Microsoft.VisualStudio.Razor.LanguageClient.Endpoints;
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_HtmlFormatting.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_HtmlFormatting.cs
index a50e120f2e8..b60833ba2e2 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_HtmlFormatting.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_HtmlFormatting.cs
@@ -8,7 +8,6 @@
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Razor.Protocol.Formatting;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Microsoft.VisualStudio.Razor.LanguageClient.Extensions;
 using StreamJsonRpc;
 
 namespace Microsoft.VisualStudio.Razor.LanguageClient.Endpoints;
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_InlayHints.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_InlayHints.cs
index 0930e048132..25a9154be2b 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_InlayHints.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_InlayHints.cs
@@ -5,7 +5,6 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Microsoft.VisualStudio.Razor.LanguageClient.Extensions;
 using StreamJsonRpc;
 
 namespace Microsoft.VisualStudio.Razor.LanguageClient.Endpoints;
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 bf8e5a895ee..6588cdc5d95 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
@@ -5,7 +5,6 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Microsoft.VisualStudio.Razor.LanguageClient.Extensions;
 using StreamJsonRpc;
 
 namespace Microsoft.VisualStudio.Razor.LanguageClient.Endpoints;
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_OnAutoInsert.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_OnAutoInsert.cs
index 603053b273d..148c2288f2e 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_OnAutoInsert.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_OnAutoInsert.cs
@@ -5,7 +5,6 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Microsoft.VisualStudio.Razor.LanguageClient.Extensions;
 using StreamJsonRpc;
 
 namespace Microsoft.VisualStudio.Razor.LanguageClient.Endpoints;
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_Rename.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_Rename.cs
index 4bb2b66677d..21d95daeda0 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_Rename.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_Rename.cs
@@ -5,7 +5,6 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Microsoft.VisualStudio.Razor.LanguageClient.Extensions;
 using StreamJsonRpc;
 
 namespace Microsoft.VisualStudio.Razor.LanguageClient.Endpoints;
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_SimplifyMethod.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_SimplifyMethod.cs
index f1ac1f0567e..92bf545fd9b 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_SimplifyMethod.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_SimplifyMethod.cs
@@ -6,7 +6,6 @@
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Razor.Protocol.CodeActions;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Microsoft.VisualStudio.Razor.LanguageClient.Extensions;
 using StreamJsonRpc;
 
 namespace Microsoft.VisualStudio.Razor.LanguageClient.Endpoints;
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_SpellCheck.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_SpellCheck.cs
index ba4b1a825fc..d4a224f0e82 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_SpellCheck.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_SpellCheck.cs
@@ -6,7 +6,6 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Microsoft.VisualStudio.Razor.LanguageClient.Extensions;
 using StreamJsonRpc;
 
 namespace Microsoft.VisualStudio.Razor.LanguageClient.Endpoints;
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_ValidateBreakpoint.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_ValidateBreakpoint.cs
index c0e2ce15b1e..64925be6dca 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_ValidateBreakpoint.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Endpoints/RazorCustomMessageTarget_ValidateBreakpoint.cs
@@ -5,7 +5,6 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
-using Microsoft.VisualStudio.Razor.LanguageClient.Extensions;
 using StreamJsonRpc;
 
 namespace Microsoft.VisualStudio.Razor.LanguageClient.Endpoints;
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Extensions/RazorCohostRequestContextExtensions.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Extensions/RazorCohostRequestContextExtensions.cs
deleted file mode 100644
index f276e5bec5b..00000000000
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/LanguageClient/Extensions/RazorCohostRequestContextExtensions.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the MIT license. See License.txt in the project root for license information.
-
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.ExternalAccess.Razor.Cohost;
-using Microsoft.CodeAnalysis.Razor.Logging;
-using Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
-using StreamJsonRpc;
-
-namespace Microsoft.VisualStudio.Razor.LanguageClient.Extensions;
-
-internal static class RazorCohostRequestContextExtensions
-{
-    public static async Task<TResponse?> DelegateRequestAsync<TDelegatedParams, TResponse>(this RazorCohostRequestContext requestContext, string target, TDelegatedParams @params, ILogger logger, CancellationToken cancellationToken)
-    {
-        var clientConnection = requestContext.GetClientConnection();
-
-        try
-        {
-            return await clientConnection.SendRequestAsync<TDelegatedParams, TResponse>(target, @params, cancellationToken).ConfigureAwait(false);
-        }
-        catch (RemoteInvocationException e)
-        {
-            logger.LogError(e, $"Error calling delegate server for {target}");
-            throw;
-        }
-    }
-
-    public static RazorCohostClientConnection GetClientConnection(this RazorCohostRequestContext requestContext)
-    {
-        // TODO: We can't MEF import IRazorCohostClientLanguageServerManager in the constructor. We can make this work
-        //       by having it implement a base class, RazorClientConnectionBase or something, that in turn implements
-        //       AbstractRazorLspService (defined in Roslyn) and then move everything from importing IClientConnection
-        //       to importing the new base class, so we can continue to share services.
-        //
-        //       Until then we have to get the service from the request context.
-        var clientLanguageServerManager = requestContext.GetRequiredService<IRazorCohostClientLanguageServerManager>();
-        return new RazorCohostClientConnection(clientLanguageServerManager);
-    }
-}
diff --git a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Telemetry/TelemetryReporter.cs b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Telemetry/TelemetryReporter.cs
index 7542ae4a7b6..f6de565c009 100644
--- a/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Telemetry/TelemetryReporter.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.LanguageServices.Razor/Telemetry/TelemetryReporter.cs
@@ -72,7 +72,7 @@ public void ReportEvent(string name, Severity severity, Property property1, Prop
         Report(telemetryEvent);
     }
 
-    public void ReportEvent(string name, Severity severity, params Property[] properties)
+    public void ReportEvent(string name, Severity severity, params ReadOnlySpan<Property> properties)
     {
         var telemetryEvent = new TelemetryEvent(GetEventName(name), ConvertSeverity(severity));
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CodeActionEndToEndTest.NetFx.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CodeActionEndToEndTest.NetFx.cs
index 2196a72ccfa..e9992610258 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CodeActionEndToEndTest.NetFx.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/CodeActionEndToEndTest.NetFx.cs
@@ -55,7 +55,7 @@ private GenerateMethodCodeActionResolver[] CreateRazorCodeActionResolvers(
                     new GenerateMethodResolverDocumentContextFactory(filePath, codeDocument),
                     optionsMonitor ?? TestRazorLSPOptionsMonitor.Create(),
                     clientConnection,
-                    new RazorDocumentMappingService(FilePathService, new TestDocumentContextFactory(), LoggerFactory),
+                    new LspDocumentMappingService(FilePathService, new TestDocumentContextFactory(), LoggerFactory),
                     razorFormattingService)
             ];
 
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 e5dc42a3fb7..7c44e564389 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
@@ -28,14 +28,14 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.CodeActions;
 
 public class CodeActionEndpointTest : LanguageServerTestBase
 {
-    private readonly IRazorDocumentMappingService _documentMappingService;
+    private readonly IDocumentMappingService _documentMappingService;
     private readonly LanguageServerFeatureOptions _languageServerFeatureOptions;
     private readonly IClientConnection _clientConnection;
 
     public CodeActionEndpointTest(ITestOutputHelper testOutput)
         : base(testOutput)
     {
-        _documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        _documentMappingService = Mock.Of<IDocumentMappingService>(
             s => s.TryMapToGeneratedDocumentRange(
                 It.IsAny<IRazorGeneratedDocument>(),
                 It.IsAny<LinePositionSpan>(),
@@ -688,7 +688,7 @@ public async Task GetCSharpCodeActionsFromLanguageServerAsync_InvalidRangeMappin
         var codeDocument = CreateCodeDocument("@code {}");
         var documentContext = CreateDocumentContext(documentPath, codeDocument);
         LinePositionSpan projectedRange = default;
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             d => d.TryMapToGeneratedDocumentRange(It.IsAny<IRazorGeneratedDocument>(), It.IsAny<LinePositionSpan>(), out projectedRange) == false
         , MockBehavior.Strict);
         var codeActionEndpoint = new CodeActionEndpoint(
@@ -782,14 +782,14 @@ public async Task GetCSharpCodeActionsFromLanguageServerAsync_ReturnsCodeActions
         Assert.Equal(projectedRange, diagnostics[1].Range);
     }
 
-    private static IRazorDocumentMappingService CreateDocumentMappingService(LinePositionSpan projectedRange = default)
+    private static IDocumentMappingService CreateDocumentMappingService(LinePositionSpan projectedRange = default)
     {
         if (projectedRange == default)
         {
             projectedRange = new LinePositionSpan(new(5, 2), new(5, 2));
         }
 
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             d => d.TryMapToGeneratedDocumentRange(It.IsAny<IRazorGeneratedDocument>(), It.IsAny<LinePositionSpan>(), out projectedRange) == true &&
                  d.GetLanguageKind(It.IsAny<RazorCodeDocument>(), It.IsAny<int>(), It.IsAny<bool>()) == RazorLanguageKind.CSharp
         , MockBehavior.Strict);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Html/DefaultHtmlCodeActionProviderTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Html/DefaultHtmlCodeActionProviderTest.cs
index 5104d53b0fa..a02a209f947 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Html/DefaultHtmlCodeActionProviderTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Html/DefaultHtmlCodeActionProviderTest.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.LanguageServer.CodeActions.Models;
+using Microsoft.AspNetCore.Razor.Test.Common;
 using Microsoft.AspNetCore.Razor.Test.Common.LanguageServer;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
@@ -42,7 +43,7 @@ public async Task ProvideAsync_WrapsResolvableCodeActions()
         var context = CreateRazorCodeActionContext(request, location, documentPath, contents);
         context.CodeDocument.SetFileKind(FileKinds.Legacy);
 
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(MockBehavior.Strict);
+        var documentMappingService = StrictMock.Of<IEditMappingService>();
         var provider = new DefaultHtmlCodeActionProvider(documentMappingService);
 
         ImmutableArray<RazorVSInternalCodeAction> codeActions = [ new RazorVSInternalCodeAction() { Name = "Test" } ];
@@ -90,12 +91,12 @@ public async Task ProvideAsync_RemapsAndFixesEdits()
             }
         };
 
-        var documentMappingServiceMock = new Mock<IRazorDocumentMappingService>(MockBehavior.Strict);
-        documentMappingServiceMock
-            .Setup(c => c.RemapWorkspaceEditAsync(It.IsAny<WorkspaceEdit>(), It.IsAny<CancellationToken>()))
+        var editMappingServiceMock = new StrictMock<IEditMappingService>();
+        editMappingServiceMock
+            .Setup(x => x.RemapWorkspaceEditAsync(It.IsAny<WorkspaceEdit>(), It.IsAny<CancellationToken>()))
             .ReturnsAsync(remappedEdit);
 
-        var provider = new DefaultHtmlCodeActionProvider(documentMappingServiceMock.Object);
+        var provider = new DefaultHtmlCodeActionProvider(editMappingServiceMock.Object);
 
         ImmutableArray<RazorVSInternalCodeAction> codeActions =
         [
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Html/DefaultHtmlCodeActionResolverTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Html/DefaultHtmlCodeActionResolverTest.cs
index 5d7704aa426..9593a139a17 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Html/DefaultHtmlCodeActionResolverTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeActions/Html/DefaultHtmlCodeActionResolverTest.cs
@@ -7,14 +7,13 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.LanguageServer.CodeActions.Models;
 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.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Razor.Protocol.CodeActions;
-using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 using Moq;
 using Xunit;
@@ -56,12 +55,12 @@ public async Task ResolveAsync_RemapsAndFixesEdits()
             Edit = remappedEdit
         };
 
-        var documentMappingServiceMock = new Mock<IRazorDocumentMappingService>(MockBehavior.Strict);
-        documentMappingServiceMock
-            .Setup(c => c.RemapWorkspaceEditAsync(It.IsAny<WorkspaceEdit>(), It.IsAny<CancellationToken>()))
+        var editMappingServiceMock = new StrictMock<IEditMappingService>();
+        editMappingServiceMock
+            .Setup(x => x.RemapWorkspaceEditAsync(It.IsAny<WorkspaceEdit>(), It.IsAny<CancellationToken>()))
             .ReturnsAsync(remappedEdit);
 
-        var resolver = new DefaultHtmlCodeActionResolver(documentContextFactory, CreateLanguageServer(resolvedCodeAction), documentMappingServiceMock.Object);
+        var resolver = new DefaultHtmlCodeActionResolver(documentContextFactory, CreateLanguageServer(resolvedCodeAction), editMappingServiceMock.Object);
 
         var codeAction = new RazorVSInternalCodeAction()
         {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/Delegation/DelegatedCompletionItemResolverTest.NetFx.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/Delegation/DelegatedCompletionItemResolverTest.NetFx.cs
index b39900715b0..90b3f93b7db 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/Delegation/DelegatedCompletionItemResolverTest.NetFx.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/Delegation/DelegatedCompletionItemResolverTest.NetFx.cs
@@ -52,8 +52,24 @@ public DelegatedCompletionItemResolverTest(ITestOutputHelper testOutput)
         };
 
         var documentContext = TestDocumentContext.From("C:/path/to/file.cshtml", hostDocumentVersion: 0);
-        _csharpCompletionParams = new DelegatedCompletionParams(documentContext.Identifier, VsLspFactory.CreatePosition(10, 6), RazorLanguageKind.CSharp, new VSInternalCompletionContext(), ProvisionalTextEdit: null, ShouldIncludeSnippets: false, CorrelationId: Guid.Empty);
-        _htmlCompletionParams = new DelegatedCompletionParams(documentContext.Identifier, VsLspFactory.DefaultPosition, RazorLanguageKind.Html, new VSInternalCompletionContext(), ProvisionalTextEdit: null, ShouldIncludeSnippets: false, CorrelationId: Guid.Empty);
+        _csharpCompletionParams = new DelegatedCompletionParams(
+            documentContext.GetTextDocumentIdentifierAndVersion(),
+            VsLspFactory.CreatePosition(10, 6),
+            RazorLanguageKind.CSharp,
+            new VSInternalCompletionContext(),
+            ProvisionalTextEdit: null,
+            ShouldIncludeSnippets: false,
+            CorrelationId: Guid.Empty);
+
+        _htmlCompletionParams = new DelegatedCompletionParams(
+            documentContext.GetTextDocumentIdentifierAndVersion(),
+            VsLspFactory.DefaultPosition,
+            RazorLanguageKind.Html,
+            new VSInternalCompletionContext(),
+            ProvisionalTextEdit: null,
+            ShouldIncludeSnippets: false,
+            CorrelationId: Guid.Empty);
+
         _documentContextFactory = new TestDocumentContextFactory();
         _formattingService = new AsyncLazy<IRazorFormattingService>(() => TestRazorFormattingService.CreateWithFullSupportAsync(LoggerFactory));
     }
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/Delegation/TestDelegatedCompletionListProvider.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/Delegation/TestDelegatedCompletionListProvider.cs
index bb8dee4338e..746ba8cc729 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/Delegation/TestDelegatedCompletionListProvider.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/Delegation/TestDelegatedCompletionListProvider.cs
@@ -26,7 +26,7 @@ private TestDelegatedCompletionListProvider(
         ILoggerFactory loggerFactory)
         : base(
             responseRewriters,
-            new RazorDocumentMappingService(new LSPFilePathService(TestLanguageServerFeatureOptions.Instance), new TestDocumentContextFactory(), loggerFactory),
+            new LspDocumentMappingService(new LSPFilePathService(TestLanguageServerFeatureOptions.Instance), new TestDocumentContextFactory(), loggerFactory),
             new TestLanguageServer(new Dictionary<string, Func<object, Task<object>>>()
             {
                 [LanguageServerConstants.RazorCompletionEndpointName] = completionFactory.OnDelegationAsync,
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/TagHelperServiceTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/TagHelperServiceTestBase.cs
index a684d4632e8..7a2dbb635fc 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/TagHelperServiceTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/TagHelperServiceTestBase.cs
@@ -248,14 +248,17 @@ public TagHelperServiceTestBase(ITestOutputHelper testOutput)
         RazorTagHelperCompletionService = new LspTagHelperCompletionService();
     }
 
+    protected static string GetFileName(bool isRazorFile)
+        => isRazorFile ? RazorFile : CSHtmlFile;
+
     internal static RazorCodeDocument CreateCodeDocument(string text, bool isRazorFile, ImmutableArray<TagHelperDescriptor> tagHelpers)
     {
-        return CreateCodeDocument(text, isRazorFile ? RazorFile : CSHtmlFile, tagHelpers);
+        return CreateCodeDocument(text, GetFileName(isRazorFile), tagHelpers);
     }
 
     internal static RazorCodeDocument CreateCodeDocument(string text, bool isRazorFile, params TagHelperDescriptor[] tagHelpers)
     {
-        return CreateCodeDocument(text, isRazorFile ? RazorFile : CSHtmlFile, tagHelpers);
+        return CreateCodeDocument(text, GetFileName(isRazorFile), tagHelpers);
     }
 
     internal static RazorCodeDocument CreateCodeDocument(string text, string filePath, ImmutableArray<TagHelperDescriptor> tagHelpers)
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/TestDocumentMappingService.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/TestDocumentMappingService.cs
index 2e384656518..874158e576e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/TestDocumentMappingService.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/TestDocumentMappingService.cs
@@ -2,24 +2,24 @@
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis.Razor.DocumentMapping;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Text;
-using Microsoft.VisualStudio.LanguageServer.Protocol;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.Completion;
 
-internal class TestDocumentMappingService : IRazorDocumentMappingService
+internal class TestDocumentMappingService : IDocumentMappingService
 {
     public RazorLanguageKind LanguageKind { get; set; }
     public LinePosition? GeneratedPosition { get; set; }
     public int GeneratedIndex { get; set; }
 
-    public TextEdit[] GetHostDocumentEdits(IRazorGeneratedDocument generatedDocument, TextEdit[] generatedDocumentEdits)
-        => Array.Empty<TextEdit>();
+    public IEnumerable<TextChange> GetHostDocumentEdits(IRazorGeneratedDocument generatedDocument, IEnumerable<TextChange> generatedDocumentEdits)
+        => [];
 
     public RazorLanguageKind GetLanguageKind(RazorCodeDocument codeDocument, int hostDocumentIndex, bool rightAssociative)
         => LanguageKind;
@@ -29,11 +29,6 @@ public RazorLanguageKind GetLanguageKind(RazorCodeDocument codeDocument, int hos
         throw new NotImplementedException();
     }
 
-    public Task<WorkspaceEdit> RemapWorkspaceEditAsync(WorkspaceEdit workspaceEdit, CancellationToken cancellationToken)
-    {
-        throw new NotImplementedException();
-    }
-
     public bool TryMapToGeneratedDocumentOrNextCSharpPosition(IRazorGeneratedDocument generatedDocument, int hostDocumentIndex, out LinePosition generatedPosition, out int generatedIndex)
     {
         throw new NotImplementedException();
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Debugging/RazorBreakpointSpanEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Debugging/RazorBreakpointSpanEndpointTest.cs
index bfae068bda8..718cbcfc0d5 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Debugging/RazorBreakpointSpanEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Debugging/RazorBreakpointSpanEndpointTest.cs
@@ -15,12 +15,12 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Debugging;
 
 public class RazorBreakpointSpanEndpointTest : LanguageServerTestBase
 {
-    private readonly IRazorDocumentMappingService _mappingService;
+    private readonly IDocumentMappingService _mappingService;
 
     public RazorBreakpointSpanEndpointTest(ITestOutputHelper testOutput)
         : base(testOutput)
     {
-        _mappingService = new RazorDocumentMappingService(
+        _mappingService = new LspDocumentMappingService(
             FilePathService,
             new TestDocumentContextFactory(),
             LoggerFactory);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Debugging/RazorProximityExpressionsEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Debugging/RazorProximityExpressionsEndpointTest.cs
index e8bfb086782..66f45a89fc0 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Debugging/RazorProximityExpressionsEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Debugging/RazorProximityExpressionsEndpointTest.cs
@@ -15,12 +15,12 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Debugging;
 
 public class RazorProximityExpressionsEndpointTest : LanguageServerTestBase
 {
-    private readonly IRazorDocumentMappingService _mappingService;
+    private readonly IDocumentMappingService _mappingService;
 
     public RazorProximityExpressionsEndpointTest(ITestOutputHelper testOutput)
         : base(testOutput)
     {
-        _mappingService = new RazorDocumentMappingService(
+        _mappingService = new LspDocumentMappingService(
             FilePathService,
             new TestDocumentContextFactory(),
             LoggerFactory);
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 7526d0b052b..2711a8dc359 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.CodeAnalysis.Razor.ProjectSystem;
+using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.CodeAnalysis.Testing;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
@@ -236,7 +237,7 @@ await projectManager.UpdateAsync(updater =>
                 rootNamespace: "project"));
         });
 
-        var searchEngine = new DefaultRazorComponentSearchEngine(projectManager, LoggerFactory);
+        var searchEngine = new RazorComponentSearchEngine(projectManager, LoggerFactory);
 
         var razorUri = new Uri(razorFilePath);
         Assert.True(DocumentContextFactory.TryCreateForOpenDocument(razorUri, out var documentContext));
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Definition/DefinitionEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Definition/DefinitionEndpointTest.cs
index ebfb6b65708..02ae91c9c9b 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Definition/DefinitionEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Definition/DefinitionEndpointTest.cs
@@ -395,7 +395,7 @@ private async Task VerifyNavigatePositionAsync(string content, string propertyNa
         SetupDocument(out var codeDocument, out _, content);
         var expectedRange = codeDocument.Source.Text.GetRange(selection);
 
-        var mappingService = new RazorDocumentMappingService(FilePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var mappingService = new LspDocumentMappingService(FilePathService, new TestDocumentContextFactory(), LoggerFactory);
 
         var range = await DefinitionEndpoint.TryGetPropertyRangeAsync(codeDocument, propertyName, mappingService, Logger, DisposalToken);
         Assert.NotNull(range);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Diagnostics/DocumentPullDiagnosticsEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Diagnostics/DocumentPullDiagnosticsEndpointTest.cs
index b5d4b12c60a..ecbadccdd23 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Diagnostics/DocumentPullDiagnosticsEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Diagnostics/DocumentPullDiagnosticsEndpointTest.cs
@@ -18,7 +18,7 @@ public sealed class DocumentPullDiagnosticsEndpointTest(ITestOutputHelper testOu
     public void ApplyCapabilities_AddsExpectedCapabilities()
     {
         // Arrange
-        var documentMappingService = new RazorDocumentMappingService(FilePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var documentMappingService = new LspDocumentMappingService(FilePathService, new TestDocumentContextFactory(), LoggerFactory);
         var razorTranslate = new Mock<RazorTranslateDiagnosticsService>(MockBehavior.Strict,
             documentMappingService,
             LoggerFactory);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Diagnostics/RazorDiagnosticsPublisherTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Diagnostics/RazorDiagnosticsPublisherTest.cs
index e5910df49ec..4cdbc79137d 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Diagnostics/RazorDiagnosticsPublisherTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Diagnostics/RazorDiagnosticsPublisherTest.cs
@@ -111,7 +111,7 @@ public async Task DocumentProcessed_NewWorkQueued_RestartsTimer()
             .Verifiable();
 
         var documentContextFactory = new TestDocumentContextFactory(_openedDocument.FilePath, codeDocument);
-        var translateDiagnosticsService = new RazorTranslateDiagnosticsService(StrictMock.Of<IRazorDocumentMappingService>(), LoggerFactory);
+        var translateDiagnosticsService = new RazorTranslateDiagnosticsService(StrictMock.Of<IDocumentMappingService>(), LoggerFactory);
 
         using var publisher = new TestRazorDiagnosticsPublisher(_projectManager, clientConnectionMock.Object, TestLanguageServerFeatureOptions.Instance, translateDiagnosticsService, documentContextFactory, LoggerFactory);
         var publisherAccessor = publisher.GetTestAccessor();
@@ -218,7 +218,7 @@ public async Task PublishDiagnosticsAsync_NewDocumentDiagnosticsGetPublished(boo
 
         var documentContextFactory = new TestDocumentContextFactory(_openedDocument.FilePath, codeDocument);
         var filePathService = new LSPFilePathService(TestLanguageServerFeatureOptions.Instance);
-        var documentMappingService = new RazorDocumentMappingService(filePathService, documentContextFactory, LoggerFactory);
+        var documentMappingService = new LspDocumentMappingService(filePathService, documentContextFactory, LoggerFactory);
         var translateDiagnosticsService = new RazorTranslateDiagnosticsService(documentMappingService, LoggerFactory);
 
         using var publisher = new TestRazorDiagnosticsPublisher(_projectManager, clientConnectionMock.Object, TestLanguageServerFeatureOptions.Instance, translateDiagnosticsService, documentContextFactory, LoggerFactory);
@@ -275,7 +275,7 @@ public async Task PublishDiagnosticsAsync_NewRazorDiagnosticsGetPublished()
             .Returns(Task.CompletedTask);
 
         var documentContextFactory = new TestDocumentContextFactory(_openedDocument.FilePath, codeDocument);
-        var translateDiagnosticsService = new RazorTranslateDiagnosticsService(StrictMock.Of<IRazorDocumentMappingService>(), LoggerFactory);
+        var translateDiagnosticsService = new RazorTranslateDiagnosticsService(StrictMock.Of<IDocumentMappingService>(), LoggerFactory);
 
         using var publisher = new TestRazorDiagnosticsPublisher(_projectManager, clientConnectionMock.Object, TestLanguageServerFeatureOptions.Instance, translateDiagnosticsService, documentContextFactory, LoggerFactory);
         var publisherAccessor = publisher.GetTestAccessor();
@@ -333,7 +333,7 @@ public async Task PublishDiagnosticsAsync_NewCSharpDiagnosticsGetPublished()
             .Returns(Task.CompletedTask);
 
         var documentContextFactory = new TestDocumentContextFactory(_openedDocument.FilePath, codeDocument);
-        var translateDiagnosticsService = new RazorTranslateDiagnosticsService(StrictMock.Of<IRazorDocumentMappingService>(), LoggerFactory);
+        var translateDiagnosticsService = new RazorTranslateDiagnosticsService(StrictMock.Of<IDocumentMappingService>(), LoggerFactory);
 
         using var publisher = new TestRazorDiagnosticsPublisher(_projectManager, clientConnectionMock.Object, TestLanguageServerFeatureOptions.Instance, translateDiagnosticsService, documentContextFactory, LoggerFactory);
         var publisherAccessor = publisher.GetTestAccessor();
@@ -370,7 +370,7 @@ public async Task PublishDiagnosticsAsync_NoopsIfRazorDiagnosticsAreSameAsPrevio
 
         var documentContextFactory = new TestDocumentContextFactory(_openedDocument.FilePath, codeDocument);
         var filePathService = new LSPFilePathService(TestLanguageServerFeatureOptions.Instance);
-        var documentMappingService = new RazorDocumentMappingService(filePathService, documentContextFactory, LoggerFactory);
+        var documentMappingService = new LspDocumentMappingService(filePathService, documentContextFactory, LoggerFactory);
         var translateDiagnosticsService = new RazorTranslateDiagnosticsService(documentMappingService, LoggerFactory);
 
         using var publisher = new TestRazorDiagnosticsPublisher(_projectManager, clientConnectionMock.Object, TestLanguageServerFeatureOptions.Instance, translateDiagnosticsService, documentContextFactory, LoggerFactory);
@@ -422,7 +422,7 @@ public async Task PublishDiagnosticsAsync_NoopsIfCSharpDiagnosticsAreSameAsPrevi
             .Returns(Task.CompletedTask);
 
         var documentContextFactory = new TestDocumentContextFactory(_openedDocument.FilePath, codeDocument);
-        var translateDiagnosticsService = new RazorTranslateDiagnosticsService(StrictMock.Of<IRazorDocumentMappingService>(), LoggerFactory);
+        var translateDiagnosticsService = new RazorTranslateDiagnosticsService(StrictMock.Of<IDocumentMappingService>(), LoggerFactory);
 
         using var publisher = new TestRazorDiagnosticsPublisher(_projectManager, clientConnectionMock.Object, TestLanguageServerFeatureOptions.Instance, translateDiagnosticsService, documentContextFactory, LoggerFactory);
         var publisherAccessor = publisher.GetTestAccessor();
@@ -453,7 +453,7 @@ public void ClearClosedDocuments_ClearsDiagnosticsForClosedDocument()
             .Returns(Task.CompletedTask);
 
         var documentContextFactory = new TestDocumentContextFactory();
-        var translateDiagnosticsService = new RazorTranslateDiagnosticsService(StrictMock.Of<IRazorDocumentMappingService>(), LoggerFactory);
+        var translateDiagnosticsService = new RazorTranslateDiagnosticsService(StrictMock.Of<IDocumentMappingService>(), LoggerFactory);
 
         using var publisher = new TestRazorDiagnosticsPublisher(_projectManager, clientConnectionMock.Object, TestLanguageServerFeatureOptions.Instance, translateDiagnosticsService, documentContextFactory, LoggerFactory);
         var publisherAccessor = publisher.GetTestAccessor();
@@ -473,7 +473,7 @@ public void ClearClosedDocuments_NoopsIfDocumentIsStillOpen()
         // Arrange
         var clientConnectionMock = new StrictMock<IClientConnection>();
         var documentContextFactory = new TestDocumentContextFactory();
-        var translateDiagnosticsService = new RazorTranslateDiagnosticsService(StrictMock.Of<IRazorDocumentMappingService>(), LoggerFactory);
+        var translateDiagnosticsService = new RazorTranslateDiagnosticsService(StrictMock.Of<IDocumentMappingService>(), LoggerFactory);
 
         using var publisher = new TestRazorDiagnosticsPublisher(_projectManager, clientConnectionMock.Object, TestLanguageServerFeatureOptions.Instance, translateDiagnosticsService, documentContextFactory, LoggerFactory);
         var publisherAccessor = publisher.GetTestAccessor();
@@ -490,7 +490,7 @@ public void ClearClosedDocuments_NoopsIfDocumentIsClosedButNoDiagnostics()
         // Arrange
         var clientConnectionMock = new StrictMock<IClientConnection>();
         var documentContextFactory = new TestDocumentContextFactory();
-        var translateDiagnosticsService = new RazorTranslateDiagnosticsService(StrictMock.Of<IRazorDocumentMappingService>(), LoggerFactory);
+        var translateDiagnosticsService = new RazorTranslateDiagnosticsService(StrictMock.Of<IDocumentMappingService>(), LoggerFactory);
 
         using var publisher = new TestRazorDiagnosticsPublisher(_projectManager, clientConnectionMock.Object, TestLanguageServerFeatureOptions.Instance, translateDiagnosticsService, documentContextFactory, LoggerFactory);
         var publisherAccessor = publisher.GetTestAccessor();
@@ -507,7 +507,7 @@ public void ClearClosedDocuments_RestartsTimerIfDocumentsStillOpen()
         // Arrange
         var clientConnectionMock = new StrictMock<IClientConnection>();
         var documentContextFactory = new TestDocumentContextFactory();
-        var translateDiagnosticsService = new RazorTranslateDiagnosticsService(StrictMock.Of<IRazorDocumentMappingService>(), LoggerFactory);
+        var translateDiagnosticsService = new RazorTranslateDiagnosticsService(StrictMock.Of<IDocumentMappingService>(), LoggerFactory);
 
         using var publisher = new TestRazorDiagnosticsPublisher(_projectManager, clientConnectionMock.Object, TestLanguageServerFeatureOptions.Instance, translateDiagnosticsService, documentContextFactory, LoggerFactory);
         var publisherAccessor = publisher.GetTestAccessor();
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 59b5b074499..060c282439d 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
@@ -121,7 +121,7 @@ private async Task VerifyHighlightingRangesAsync(string input)
             MockBehavior.Strict);
 
         var languageServer = new DocumentHighlightServer(csharpServer, csharpDocumentUri);
-        var documentMappingService = new RazorDocumentMappingService(FilePathService, documentContextFactory, LoggerFactory);
+        var documentMappingService = new LspDocumentMappingService(FilePathService, documentContextFactory, LoggerFactory);
 
         var endpoint = new DocumentHighlightEndpoint(
             languageServerFeatureOptions, documentMappingService, languageServer, LoggerFactory);
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 f5af246e6e4..7c36bf571c9 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
@@ -25,7 +25,7 @@ public async Task Handle_Html_MakesRequest()
     {
         // Arrange
         var codeDocument = TestRazorCodeDocument.Create("<div></div>");
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             s => s.GetLanguageKind(codeDocument, It.IsAny<int>(), It.IsAny<bool>()) == RazorLanguageKind.Html, MockBehavior.Strict);
 
         var uri = new Uri("file://path/test.razor");
@@ -72,7 +72,7 @@ public async Task Handle_CSharp_DoesNotMakeRequest()
         var uri = new Uri("file://path/test.razor");
         var documentContext = CreateDocumentContext(uri, codeDocument);
         var projectedRange = It.IsAny<LinePositionSpan>();
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             s => s.GetLanguageKind(codeDocument, It.IsAny<int>(), It.IsAny<bool>()) == RazorLanguageKind.CSharp &&
             s.TryMapToGeneratedDocumentRange(csharpDocument, It.IsAny<LinePositionSpan>(), out projectedRange) == true, MockBehavior.Strict);
 
@@ -109,7 +109,7 @@ public async Task Handle_DocumentNotFound_ReturnsNull()
         var codeDocument = TestRazorCodeDocument.Create("<div></div>");
         var uri = new Uri("file://path/test.razor");
         var documentContext = CreateDocumentContext(uri, codeDocument);
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             s => s.GetLanguageKind(codeDocument, It.IsAny<int>(), It.IsAny<bool>()) == RazorLanguageKind.Html, MockBehavior.Strict);
 
         var response = (WorkspaceEdit?)null;
@@ -151,7 +151,7 @@ public async Task Handle_UnsupportedCodeDocument_ReturnsNull()
         codeDocument.SetUnsupported();
         var uri = new Uri("file://path/test.razor");
         var documentContext = CreateDocumentContext(uri, codeDocument);
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             s => s.GetLanguageKind(codeDocument, It.IsAny<int>(), It.IsAny<bool>()) == RazorLanguageKind.Html, MockBehavior.Strict);
 
         var response = new WorkspaceEdit();
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 3e0c2fecef4..318436e546a 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
@@ -34,7 +34,7 @@ public async Task Handle_SimpleComponent_ReturnsResult()
         await projectManager.CreateAndAddDocumentAsync(project, "c:/path/index.razor");
         await projectManager.CreateAndAddDocumentAsync(project, "c:/path/MyTagHelper.razor");
 
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             s => s.GetLanguageKind(It.IsAny<RazorCodeDocument>(), It.IsAny<int>(), It.IsAny<bool>()) == RazorLanguageKind.Html, MockBehavior.Strict);
 
         var droppedUri = new Uri("file:///c:/path/MyTagHelper.razor");
@@ -92,7 +92,7 @@ public async Task Handle_SimpleComponentWithChildFile_ReturnsResult()
         await projectManager.CreateAndAddDocumentAsync(project, "c:/path/index.razor");
         await projectManager.CreateAndAddDocumentAsync(project, "c:/path/MyTagHelper.razor");
 
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             s => s.GetLanguageKind(It.IsAny<RazorCodeDocument>(), It.IsAny<int>(), It.IsAny<bool>()) == RazorLanguageKind.Html, MockBehavior.Strict);
 
         var droppedUri = new Uri("file:///c:/path/MyTagHelper.razor");
@@ -155,7 +155,7 @@ public async Task Handle_ComponentWithRequiredAttribute_ReturnsResult()
         await projectManager.CreateAndAddDocumentAsync(project, "c:/path/index.razor");
         await projectManager.CreateAndAddDocumentAsync(project, "c:/path/fetchdata.razor");
 
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             s => s.GetLanguageKind(It.IsAny<RazorCodeDocument>(), It.IsAny<int>(), It.IsAny<bool>()) == RazorLanguageKind.Html, MockBehavior.Strict);
 
         var droppedUri = new Uri("file:///c:/path/fetchdata.razor");
@@ -214,7 +214,7 @@ public async Task Handle_NoTypeNameIdentifier_ReturnsNull()
     {
         // Arrange
         var codeDocument = TestRazorCodeDocument.Create("<div></div>");
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             s => s.GetLanguageKind(codeDocument, It.IsAny<int>(), It.IsAny<bool>()) == RazorLanguageKind.Html, MockBehavior.Strict);
 
         var componentCodeDocument = TestRazorCodeDocument.Create("<div></div>");
@@ -265,7 +265,7 @@ public async Task Handle_MultipleUris_ReturnsNull()
     {
         // Arrange
         var codeDocument = TestRazorCodeDocument.Create("<div></div>");
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             s => s.GetLanguageKind(codeDocument, It.IsAny<int>(), It.IsAny<bool>()) == RazorLanguageKind.Html, MockBehavior.Strict);
 
         var documentSnapshot = Mock.Of<IDocumentSnapshot>(s => s.GetGeneratedOutputAsync() == Task.FromResult(codeDocument), MockBehavior.Strict);
@@ -316,7 +316,7 @@ public async Task Handle_NotComponent_ReturnsNull()
     {
         // Arrange
         var codeDocument = TestRazorCodeDocument.Create("<div></div>");
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             s => s.GetLanguageKind(codeDocument, It.IsAny<int>(), It.IsAny<bool>()) == RazorLanguageKind.Html, MockBehavior.Strict);
 
         var documentSnapshot = Mock.Of<IDocumentSnapshot>(s => s.GetGeneratedOutputAsync() == Task.FromResult(codeDocument), MockBehavior.Strict);
@@ -368,7 +368,7 @@ public async Task Handle_ComponentWithNestedFiles_ReturnsResult()
         await projectManager.CreateAndAddDocumentAsync(project, "c:/path/index.razor");
         await projectManager.CreateAndAddDocumentAsync(project, "c:/path/fetchdata.razor");
 
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             s => s.GetLanguageKind(It.IsAny<RazorCodeDocument>(), It.IsAny<int>(), It.IsAny<bool>()) == RazorLanguageKind.Html, MockBehavior.Strict);
 
         var droppedUri1 = new Uri("file:///c:/path/fetchdata.razor.cs");
@@ -426,7 +426,7 @@ public async Task Handle_CSharp_ReturnsNull()
         var uri = new Uri("file://path/test.razor");
         var documentContext = CreateDocumentContext(uri, codeDocument);
         var projectedRange = It.IsAny<LinePositionSpan>();
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             s => s.GetLanguageKind(codeDocument, It.IsAny<int>(), It.IsAny<bool>()) == RazorLanguageKind.CSharp &&
             s.TryMapToGeneratedDocumentRange(csharpDocument, It.IsAny<LinePositionSpan>(), out projectedRange) == true, MockBehavior.Strict);
 
@@ -471,7 +471,7 @@ public async Task Handle_DocumentNotFound_ReturnsNull()
         var codeDocument = TestRazorCodeDocument.Create("<div></div>");
         var uri = new Uri("file://path/test.razor");
         var documentContext = CreateDocumentContext(uri, codeDocument);
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             s => s.GetLanguageKind(codeDocument, It.IsAny<int>(), It.IsAny<bool>()) == RazorLanguageKind.Html, MockBehavior.Strict);
 
         var documentSnapshot = Mock.Of<IDocumentSnapshot>(s => s.GetGeneratedOutputAsync() == Task.FromResult(codeDocument), MockBehavior.Strict);
@@ -516,7 +516,7 @@ public async Task Handle_UnsupportedCodeDocument_ReturnsNull()
         codeDocument.SetUnsupported();
         var uri = new Uri("file://path/test.razor");
         var documentContext = CreateDocumentContext(uri, codeDocument);
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             s => s.GetLanguageKind(codeDocument, It.IsAny<int>(), It.IsAny<bool>()) == RazorLanguageKind.Html, MockBehavior.Strict);
 
         var documentSnapshot = Mock.Of<IDocumentSnapshot>(s => s.GetGeneratedOutputAsync() == Task.FromResult(codeDocument), MockBehavior.Strict);
@@ -560,7 +560,7 @@ public async Task Handle_NoUris_ReturnsNull()
         var codeDocument = TestRazorCodeDocument.Create("<div></div>");
         var uri = new Uri("file://path/test.razor");
         var documentContext = CreateDocumentContext(uri, codeDocument);
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             s => s.GetLanguageKind(codeDocument, It.IsAny<int>(), It.IsAny<bool>()) == RazorLanguageKind.Html, MockBehavior.Strict);
 
         var documentSnapshot = Mock.Of<IDocumentSnapshot>(s => s.GetGeneratedOutputAsync() == Task.FromResult(codeDocument), MockBehavior.Strict);
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 0ba0f51c73c..17177a8e49c 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
@@ -24,7 +24,7 @@ public async Task Handle_OnTypeFormatting_FormattingDisabled_ReturnsNull()
         // Arrange
         var uri = new Uri("file://path/test.razor");
         var formattingService = new DummyRazorFormattingService();
-        var documentMappingService = new RazorDocumentMappingService(FilePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var documentMappingService = new LspDocumentMappingService(FilePathService, new TestDocumentContextFactory(), LoggerFactory);
 
         var optionsMonitor = GetOptionsMonitor(enableFormatting: false);
         var endpoint = new DocumentOnTypeFormattingEndpoint(
@@ -53,7 +53,7 @@ public async Task Handle_OnTypeFormatting_DocumentNotFound_ReturnsNull()
 
         var documentContext = CreateDocumentContext(new Uri("file://path/testDifferentFile.razor"), codeDocument);
         var formattingService = new DummyRazorFormattingService();
-        var documentMappingService = new RazorDocumentMappingService(FilePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var documentMappingService = new LspDocumentMappingService(FilePathService, new TestDocumentContextFactory(), LoggerFactory);
 
         var optionsMonitor = GetOptionsMonitor(enableFormatting: true);
         var endpoint = new DocumentOnTypeFormattingEndpoint(
@@ -88,7 +88,7 @@ public async Task Handle_OnTypeFormatting_RemapFailed_ReturnsNull()
 
         var documentContext = CreateDocumentContext(uri, codeDocument);
         var formattingService = new DummyRazorFormattingService();
-        var documentMappingService = new RazorDocumentMappingService(FilePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var documentMappingService = new LspDocumentMappingService(FilePathService, new TestDocumentContextFactory(), LoggerFactory);
 
         var optionsMonitor = GetOptionsMonitor(enableFormatting: true);
         var endpoint = new DocumentOnTypeFormattingEndpoint(
@@ -124,7 +124,7 @@ public async Task Handle_OnTypeFormatting_HtmlLanguageKind_ReturnsNull()
         var documentContext = CreateDocumentContext(uri, codeDocument);
         var formattingService = new DummyRazorFormattingService();
 
-        var documentMappingService = new Mock<IRazorDocumentMappingService>(MockBehavior.Strict);
+        var documentMappingService = new Mock<IDocumentMappingService>(MockBehavior.Strict);
         documentMappingService.Setup(s => s.GetLanguageKind(codeDocument, 17, false)).Returns(RazorLanguageKind.Html);
         var optionsMonitor = GetOptionsMonitor(enableFormatting: true);
         var endpoint = new DocumentOnTypeFormattingEndpoint(
@@ -160,7 +160,7 @@ public async Task Handle_OnTypeFormatting_RazorLanguageKind_ReturnsNull()
         var documentContext = CreateDocumentContext(uri, codeDocument);
         var formattingService = new DummyRazorFormattingService();
 
-        var documentMappingService = new Mock<IRazorDocumentMappingService>(MockBehavior.Strict);
+        var documentMappingService = new Mock<IDocumentMappingService>(MockBehavior.Strict);
         documentMappingService.Setup(s => s.GetLanguageKind(codeDocument, 17, false)).Returns(RazorLanguageKind.Razor);
         var optionsMonitor = GetOptionsMonitor(enableFormatting: true);
         var endpoint = new DocumentOnTypeFormattingEndpoint(
@@ -195,7 +195,7 @@ public async Task Handle_OnTypeFormatting_UnexpectedTriggerCharacter_ReturnsNull
 
         var documentContextFactory = CreateDocumentContextFactory(uri, codeDocument);
         var formattingService = new DummyRazorFormattingService();
-        var documentMappingService = new RazorDocumentMappingService(FilePathService, documentContextFactory, LoggerFactory);
+        var documentMappingService = new LspDocumentMappingService(FilePathService, documentContextFactory, LoggerFactory);
 
         var optionsMonitor = GetOptionsMonitor(enableFormatting: true);
         var endpoint = new DocumentOnTypeFormattingEndpoint(
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingContentValidationPassTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingContentValidationPassTest.cs
index 4e9160ab8b6..d42f0778dc8 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingContentValidationPassTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingContentValidationPassTest.cs
@@ -110,7 +110,7 @@ public class Foo { }
 
     private FormattingContentValidationPass GetPass()
     {
-        var mappingService = new RazorDocumentMappingService(FilePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var mappingService = new LspDocumentMappingService(FilePathService, new TestDocumentContextFactory(), LoggerFactory);
 
         var pass = new FormattingContentValidationPass(mappingService, LoggerFactory)
         {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingDiagnosticValidationPassTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingDiagnosticValidationPassTest.cs
index ed17457db2a..c0f06e9831e 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingDiagnosticValidationPassTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingDiagnosticValidationPassTest.cs
@@ -107,7 +107,7 @@ public class Foo { }
 
     private FormattingDiagnosticValidationPass GetPass()
     {
-        var mappingService = new RazorDocumentMappingService(FilePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var mappingService = new LspDocumentMappingService(FilePathService, new TestDocumentContextFactory(), LoggerFactory);
 
         var pass = new FormattingDiagnosticValidationPass(mappingService, LoggerFactory)
         {
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 9ec26d51add..112e7ae0016 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
@@ -116,7 +116,7 @@ private protected async Task RunOnTypeFormattingTestAsync(
         var (codeDocument, documentSnapshot) = CreateCodeDocumentAndSnapshot(razorSourceText, uri.AbsolutePath, fileKind: fileKind, inGlobalNamespace: inGlobalNamespace);
 
         var filePathService = new LSPFilePathService(TestLanguageServerFeatureOptions.Instance);
-        var mappingService = new RazorDocumentMappingService(
+        var mappingService = new LspDocumentMappingService(
             filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var languageKind = mappingService.GetLanguageKind(codeDocument, positionAfterTrigger, rightAssociative: false);
 
@@ -177,7 +177,7 @@ protected async Task RunCodeActionFormattingTestAsync(
         var (codeDocument, documentSnapshot) = CreateCodeDocumentAndSnapshot(razorSourceText, uri.AbsolutePath, fileKind: fileKind, inGlobalNamespace: inGlobalNamespace);
 
         var filePathService = new LSPFilePathService(TestLanguageServerFeatureOptions.Instance);
-        var mappingService = new RazorDocumentMappingService(filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var mappingService = new LspDocumentMappingService(filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var languageKind = mappingService.GetLanguageKind(codeDocument, positionAfterTrigger, rightAssociative: false);
         if (languageKind == RazorLanguageKind.Html)
         {
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 9a32d0ce57d..12c22645152 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
@@ -27,7 +27,7 @@ public static async Task<IRazorFormattingService> CreateWithFullSupportAsync(
         codeDocument ??= TestRazorCodeDocument.CreateEmpty();
 
         var filePathService = new LSPFilePathService(TestLanguageServerFeatureOptions.Instance);
-        var mappingService = new RazorDocumentMappingService(filePathService, new TestDocumentContextFactory(), loggerFactory);
+        var mappingService = new LspDocumentMappingService(filePathService, new TestDocumentContextFactory(), loggerFactory);
 
         var projectManager = StrictMock.Of<IProjectSnapshotManager>();
         var versionCache = new DocumentVersionCache(projectManager);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Hover/HoverServiceTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Hover/HoverServiceTest.cs
index 335945678d6..d7a1c2bc4a2 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Hover/HoverServiceTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Hover/HoverServiceTest.cs
@@ -725,7 +725,7 @@ public async Task Handle_Hover_SingleServer_CallsDelegatedLanguageServer()
             .Setup(c => c.SendRequestAsync<IDelegatedParams, VSInternalHover>(CustomMessageNames.RazorHoverEndpointName, It.IsAny<DelegatedPositionParams>(), It.IsAny<CancellationToken>()))
             .ReturnsAsync(delegatedHover);
 
-        var documentMappingServiceMock = new Mock<IRazorDocumentMappingService>(MockBehavior.Strict);
+        var documentMappingServiceMock = new Mock<IDocumentMappingService>(MockBehavior.Strict);
         documentMappingServiceMock
             .Setup(c => c.GetLanguageKind(It.IsAny<RazorCodeDocument>(), It.IsAny<int>(), It.IsAny<bool>()))
             .Returns(RazorLanguageKind.CSharp);
@@ -880,7 +880,7 @@ private async Task<VSInternalHover> GetResultFromSingleServerEndpointAsync(strin
             options.UseRazorCohostServer == false
             , MockBehavior.Strict);
         var languageServer = new HoverLanguageServer(csharpServer, csharpDocumentUri, DisposalToken);
-        var documentMappingService = new RazorDocumentMappingService(FilePathService, documentContextFactory, LoggerFactory);
+        var documentMappingService = new LspDocumentMappingService(FilePathService, documentContextFactory, LoggerFactory);
 
         var service = GetHoverService(documentMappingService);
 
@@ -936,12 +936,12 @@ public void Increment(){
 
     private HoverEndpoint CreateEndpoint(
         LanguageServerFeatureOptions languageServerFeatureOptions = null,
-        IRazorDocumentMappingService documentMappingService = null,
+        IDocumentMappingService documentMappingService = null,
         IClientConnection clientConnection = null)
     {
         languageServerFeatureOptions ??= Mock.Of<LanguageServerFeatureOptions>(options => options.SupportsFileManipulation == true && options.SingleServerSupport == false, MockBehavior.Strict);
 
-        var documentMappingServiceMock = new Mock<IRazorDocumentMappingService>(MockBehavior.Strict);
+        var documentMappingServiceMock = new Mock<IDocumentMappingService>(MockBehavior.Strict);
         documentMappingServiceMock
             .Setup(c => c.GetLanguageKind(It.IsAny<RazorCodeDocument>(), It.IsAny<int>(), It.IsAny<bool>()))
             .Returns(RazorLanguageKind.Html);
@@ -961,7 +961,7 @@ private HoverEndpoint CreateEndpoint(
         return endpoint;
     }
 
-    private HoverService GetHoverService(IRazorDocumentMappingService mappingService = null)
+    private HoverService GetHoverService(IDocumentMappingService mappingService = null)
     {
         var projectManager = CreateProjectSnapshotManager();
         var lspTagHelperTooltipFactory = new DefaultLSPTagHelperTooltipFactory(projectManager);
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 82b4e407c2d..49e8758c700 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
@@ -6,7 +6,6 @@
 using System.Collections.Immutable;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.Test.Common.Workspaces;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Testing;
 using Microsoft.CodeAnalysis.Text;
@@ -96,7 +95,7 @@ private async Task VerifyInlayHintsAsync(string input, Dictionary<string, string
 
         var service = new InlayHintService(DocumentMappingService);
 
-        var endpoint = new InlayHintEndpoint(TestLanguageServerFeatureOptions.Instance, service, languageServer);
+        var endpoint = new InlayHintEndpoint(service, languageServer);
         var resolveEndpoint = new InlayHintResolveEndpoint(service, languageServer);
 
         var request = new InlayHintParams()
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 ba8a4a7fce8..22d3bf89399 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
@@ -290,7 +290,7 @@ private async Task VerifyCodeMappingAsync(
 
         var documentContextFactory = new TestDocumentContextFactory(razorFilePath, codeDocument, version: 1337);
         var languageServer = new MapCodeServer(csharpServer, csharpDocumentUri);
-        var documentMappingService = new RazorDocumentMappingService(FilePathService, documentContextFactory, LoggerFactory);
+        var documentMappingService = new LspDocumentMappingService(FilePathService, documentContextFactory, LoggerFactory);
 
         var endpoint = new MapCodeEndpoint(documentMappingService, documentContextFactory, languageServer, NoOpTelemetryReporter.Instance);
 
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Mapping/RazorLanguageQueryEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Mapping/RazorLanguageQueryEndpointTest.cs
index 7f056bbde56..4d52de66276 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Mapping/RazorLanguageQueryEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Mapping/RazorLanguageQueryEndpointTest.cs
@@ -19,12 +19,12 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Mapping;
 
 public class RazorLanguageQueryEndpointTest : LanguageServerTestBase
 {
-    private readonly IRazorDocumentMappingService _mappingService;
+    private readonly IDocumentMappingService _documentMappingService;
 
     public RazorLanguageQueryEndpointTest(ITestOutputHelper testOutput)
         : base(testOutput)
     {
-        _mappingService = new RazorDocumentMappingService(
+        _documentMappingService = new LspDocumentMappingService(
             FilePathService,
             new TestDocumentContextFactory(),
             LoggerFactory);
@@ -37,7 +37,7 @@ public async Task Handle_ResolvesLanguageRequest_Razor()
         var documentPath = new Uri("C:/path/to/document.cshtml");
         var codeDocument = CreateCodeDocument("@{}");
         var documentContext = CreateDocumentContext(documentPath, codeDocument);
-        var languageEndpoint = new RazorLanguageQueryEndpoint(_mappingService, LoggerFactory);
+        var languageEndpoint = new RazorLanguageQueryEndpoint(_documentMappingService, LoggerFactory);
         var request = new RazorLanguageQueryParams()
         {
             Uri = documentPath,
@@ -64,7 +64,7 @@ public async Task Handle_ResolvesLanguageRequest_Html()
         var documentPath = new Uri("C:/path/to/document.cshtml");
         var codeDocument = CreateCodeDocument("<s");
         var documentContext = CreateDocumentContext(documentPath, codeDocument);
-        var languageEndpoint = new RazorLanguageQueryEndpoint(_mappingService, LoggerFactory);
+        var languageEndpoint = new RazorLanguageQueryEndpoint(_documentMappingService, LoggerFactory);
         var request = new RazorLanguageQueryParams()
         {
             Uri = documentPath,
@@ -94,7 +94,7 @@ public async Task Handle_ResolvesLanguageRequest_CSharp()
             "/* CSharp */",
             new[] { new SourceMapping(new SourceSpan(0, 1), new SourceSpan(0, 12)) });
         var documentContext = CreateDocumentContext(documentPath, codeDocument);
-        var languageEndpoint = new RazorLanguageQueryEndpoint(_mappingService, LoggerFactory);
+        var languageEndpoint = new RazorLanguageQueryEndpoint(_documentMappingService, LoggerFactory);
         var request = new RazorLanguageQueryParams()
         {
             Uri = documentPath,
@@ -125,7 +125,7 @@ public async Task Handle_Unsupported_ResolvesLanguageRequest_Html()
             new[] { new SourceMapping(new SourceSpan(0, 1), new SourceSpan(0, 12)) });
         codeDocument.SetUnsupported();
         var documentContext = CreateDocumentContext(documentPath, codeDocument);
-        var languageEndpoint = new RazorLanguageQueryEndpoint(_mappingService, LoggerFactory);
+        var languageEndpoint = new RazorLanguageQueryEndpoint(_documentMappingService, LoggerFactory);
         var request = new RazorLanguageQueryParams()
         {
             Uri = documentPath,
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Mapping/RazorMapToDocumentRangesEndpointTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Mapping/RazorMapToDocumentRangesEndpointTest.cs
index 60cad5462b1..271ebda9975 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Mapping/RazorMapToDocumentRangesEndpointTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Mapping/RazorMapToDocumentRangesEndpointTest.cs
@@ -18,12 +18,12 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Mapping;
 
 public class RazorMapToDocumentRangesEndpointTest : LanguageServerTestBase
 {
-    private readonly IRazorDocumentMappingService _mappingService;
+    private readonly IDocumentMappingService _documentMappingService;
 
     public RazorMapToDocumentRangesEndpointTest(ITestOutputHelper testOutput)
         : base(testOutput)
     {
-        _mappingService = new RazorDocumentMappingService(
+        _documentMappingService = new LspDocumentMappingService(
             FilePathService,
             new TestDocumentContextFactory(),
             LoggerFactory);
@@ -44,7 +44,7 @@ public async Task Handle_MapToDocumentRanges_CSharp()
                     new SourceSpan(10, 12))
             ]);
         var documentContext = CreateDocumentContext(documentPath, codeDocument);
-        var languageEndpoint = new RazorMapToDocumentRangesEndpoint(_mappingService);
+        var languageEndpoint = new RazorMapToDocumentRangesEndpoint(_documentMappingService);
         var request = new RazorMapToDocumentRangesParams()
         {
             Kind = RazorLanguageKind.CSharp,
@@ -78,7 +78,7 @@ public async Task Handle_MapToDocumentRanges_CSharp_Unmapped()
                     new SourceSpan(10, 12))
             ]);
         var documentContext = CreateDocumentContext(documentPath, codeDocument);
-        var languageEndpoint = new RazorMapToDocumentRangesEndpoint(_mappingService);
+        var languageEndpoint = new RazorMapToDocumentRangesEndpoint(_documentMappingService);
         var request = new RazorMapToDocumentRangesParams()
         {
             Kind = RazorLanguageKind.CSharp,
@@ -111,7 +111,7 @@ public async Task Handle_MapToDocumentRanges_CSharp_LeadingOverlapsUnmapped()
                     new SourceSpan(10, 12))
             ]);
         var documentContext = CreateDocumentContext(documentPath, codeDocument);
-        var languageEndpoint = new RazorMapToDocumentRangesEndpoint(_mappingService);
+        var languageEndpoint = new RazorMapToDocumentRangesEndpoint(_documentMappingService);
         var request = new RazorMapToDocumentRangesParams()
         {
             Kind = RazorLanguageKind.CSharp,
@@ -144,7 +144,7 @@ public async Task Handle_MapToDocumentRanges_CSharp_TrailingOverlapsUnmapped()
                     new SourceSpan(10, 12))
             ]);
         var documentContext = CreateDocumentContext(documentPath, codeDocument);
-        var languageEndpoint = new RazorMapToDocumentRangesEndpoint(_mappingService);
+        var languageEndpoint = new RazorMapToDocumentRangesEndpoint(_documentMappingService);
         var request = new RazorMapToDocumentRangesParams()
         {
             Kind = RazorLanguageKind.CSharp,
@@ -170,7 +170,7 @@ public async Task Handle_MapToDocumentRanges_Html()
         var documentPath = new Uri("C:/path/to/document.cshtml");
         var codeDocument = CreateCodeDocument("<p>@DateTime.Now</p>");
         var documentContext = CreateDocumentContext(documentPath, codeDocument);
-        var languageEndpoint = new RazorMapToDocumentRangesEndpoint(_mappingService);
+        var languageEndpoint = new RazorMapToDocumentRangesEndpoint(_documentMappingService);
         var request = new RazorMapToDocumentRangesParams()
         {
             Kind = RazorLanguageKind.Html,
@@ -196,7 +196,7 @@ public async Task Handle_MapToDocumentRanges_Razor()
         var documentPath = new Uri("C:/path/to/document.cshtml");
         var codeDocument = CreateCodeDocument("<p>@DateTime.Now</p>");
         var documentContext = CreateDocumentContext(documentPath, codeDocument);
-        var languageEndpoint = new RazorMapToDocumentRangesEndpoint(_mappingService);
+        var languageEndpoint = new RazorMapToDocumentRangesEndpoint(_documentMappingService);
         var request = new RazorMapToDocumentRangesParams()
         {
             Kind = RazorLanguageKind.Razor,
@@ -230,7 +230,7 @@ public async Task Handle_MapToDocumentRanges_Unsupported()
             ]);
         codeDocument.SetUnsupported();
         var documentContext = CreateDocumentContext(documentPath, codeDocument);
-        var languageEndpoint = new RazorMapToDocumentRangesEndpoint(_mappingService);
+        var languageEndpoint = new RazorMapToDocumentRangesEndpoint(_documentMappingService);
         var request = new RazorMapToDocumentRangesParams()
         {
             Kind = RazorLanguageKind.CSharp,
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultRazorComponentSearchEngineTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorComponentSearchEngineTest.cs
similarity index 83%
rename from src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultRazorComponentSearchEngineTest.cs
rename to src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorComponentSearchEngineTest.cs
index 28155a96fbb..453c64f7064 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/DefaultRazorComponentSearchEngineTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorComponentSearchEngineTest.cs
@@ -12,6 +12,8 @@
 using Microsoft.AspNetCore.Razor.Test.Common.LanguageServer;
 using Microsoft.AspNetCore.Razor.Test.Common.ProjectSystem;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Razor.ProjectSystem;
+using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.CodeAnalysis.Text;
 using Moq;
 using Xunit;
@@ -20,7 +22,7 @@
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.Test;
 
-public class DefaultRazorComponentSearchEngineTest(ITestOutputHelper testOutput) : LanguageServerTestBase(testOutput)
+public class RazorComponentSearchEngineTest(ITestOutputHelper testOutput) : LanguageServerTestBase(testOutput)
 {
     private static readonly string s_project1BasePath = PathUtilities.CreateRootedPath("First");
     private static readonly string s_project2BasePath = PathUtilities.CreateRootedPath("Second");
@@ -99,11 +101,12 @@ public async Task Handle_SearchFound_GenericComponent()
         // Arrange
         var tagHelperDescriptor1 = CreateRazorComponentTagHelperDescriptor("First", RootNamespace1, "Component1", typeName: "Component1<TItem>");
         var tagHelperDescriptor2 = CreateRazorComponentTagHelperDescriptor("Second", RootNamespace2, "Component3", typeName: "Component3<TItem>");
-        var searchEngine = new DefaultRazorComponentSearchEngine(_projectManager, LoggerFactory);
+        var searchEngine = new RazorComponentSearchEngine(_projectManager, LoggerFactory);
+        var snapshot = StrictMock.Of<IDocumentSnapshot>();
 
         // Act
-        var documentSnapshot1 = await searchEngine.TryLocateComponentAsync(tagHelperDescriptor1);
-        var documentSnapshot2 = await searchEngine.TryLocateComponentAsync(tagHelperDescriptor2);
+        var documentSnapshot1 = await searchEngine.TryLocateComponentAsync(snapshot, tagHelperDescriptor1);
+        var documentSnapshot2 = await searchEngine.TryLocateComponentAsync(snapshot, tagHelperDescriptor2);
 
         // Assert
         Assert.NotNull(documentSnapshot1);
@@ -118,11 +121,12 @@ public async Task Handle_SearchFound()
         // Arrange
         var tagHelperDescriptor1 = CreateRazorComponentTagHelperDescriptor("First", RootNamespace1, "Component1");
         var tagHelperDescriptor2 = CreateRazorComponentTagHelperDescriptor("Second", RootNamespace2, "Component3");
-        var searchEngine = new DefaultRazorComponentSearchEngine(_projectManager, LoggerFactory);
+        var searchEngine = new RazorComponentSearchEngine(_projectManager, LoggerFactory);
+        var snapshot = StrictMock.Of<IDocumentSnapshot>();
 
         // Act
-        var documentSnapshot1 = await searchEngine.TryLocateComponentAsync(tagHelperDescriptor1);
-        var documentSnapshot2 = await searchEngine.TryLocateComponentAsync(tagHelperDescriptor2);
+        var documentSnapshot1 = await searchEngine.TryLocateComponentAsync(snapshot, tagHelperDescriptor1);
+        var documentSnapshot2 = await searchEngine.TryLocateComponentAsync(snapshot, tagHelperDescriptor2);
 
         // Assert
         Assert.NotNull(documentSnapshot1);
@@ -136,10 +140,11 @@ public async Task Handle_SearchFound_SetNamespace()
     {
         // Arrange
         var tagHelperDescriptor = CreateRazorComponentTagHelperDescriptor("First", "Test", "Component2");
-        var searchEngine = new DefaultRazorComponentSearchEngine(_projectManager, LoggerFactory);
+        var searchEngine = new RazorComponentSearchEngine(_projectManager, LoggerFactory);
+        var snapshot = StrictMock.Of<IDocumentSnapshot>();
 
         // Act
-        var documentSnapshot = await searchEngine.TryLocateComponentAsync(tagHelperDescriptor);
+        var documentSnapshot = await searchEngine.TryLocateComponentAsync(snapshot, tagHelperDescriptor);
 
         // Assert
         Assert.NotNull(documentSnapshot);
@@ -151,10 +156,11 @@ public async Task Handle_SearchMissing_IncorrectAssembly()
     {
         // Arrange
         var tagHelperDescriptor = CreateRazorComponentTagHelperDescriptor("Third", RootNamespace1, "Component3");
-        var searchEngine = new DefaultRazorComponentSearchEngine(_projectManager, LoggerFactory);
+        var searchEngine = new RazorComponentSearchEngine(_projectManager, LoggerFactory);
+        var snapshot = StrictMock.Of<IDocumentSnapshot>();
 
         // Act
-        var documentSnapshot = await searchEngine.TryLocateComponentAsync(tagHelperDescriptor);
+        var documentSnapshot = await searchEngine.TryLocateComponentAsync(snapshot, tagHelperDescriptor);
 
         // Assert
         Assert.Null(documentSnapshot);
@@ -165,10 +171,11 @@ public async Task Handle_SearchMissing_IncorrectNamespace()
     {
         // Arrange
         var tagHelperDescriptor = CreateRazorComponentTagHelperDescriptor("First", RootNamespace1, "Component2");
-        var searchEngine = new DefaultRazorComponentSearchEngine(_projectManager, LoggerFactory);
+        var searchEngine = new RazorComponentSearchEngine(_projectManager, LoggerFactory);
+        var snapshot = StrictMock.Of<IDocumentSnapshot>();
 
         // Act
-        var documentSnapshot = await searchEngine.TryLocateComponentAsync(tagHelperDescriptor);
+        var documentSnapshot = await searchEngine.TryLocateComponentAsync(snapshot, tagHelperDescriptor);
 
         // Assert
         Assert.Null(documentSnapshot);
@@ -179,10 +186,11 @@ public async Task Handle_SearchMissing_IncorrectComponent()
     {
         // Arrange
         var tagHelperDescriptor = CreateRazorComponentTagHelperDescriptor("First", RootNamespace1, "Component3");
-        var searchEngine = new DefaultRazorComponentSearchEngine(_projectManager, LoggerFactory);
+        var searchEngine = new RazorComponentSearchEngine(_projectManager, LoggerFactory);
+        var snapshot = StrictMock.Of<IDocumentSnapshot>();
 
         // Act
-        var documentSnapshot = await searchEngine.TryLocateComponentAsync(tagHelperDescriptor);
+        var documentSnapshot = await searchEngine.TryLocateComponentAsync(snapshot, tagHelperDescriptor);
 
         // Assert
         Assert.Null(documentSnapshot);
@@ -193,10 +201,11 @@ public async Task Handle_FilePathAndAssemblyNameDifferent()
     {
         // Arrange
         var tagHelperDescriptor = CreateRazorComponentTagHelperDescriptor("AssemblyName", "Test", "Component2");
-        var searchEngine = new DefaultRazorComponentSearchEngine(_projectManager, LoggerFactory);
+        var searchEngine = new RazorComponentSearchEngine(_projectManager, LoggerFactory);
+        var snapshot = StrictMock.Of<IDocumentSnapshot>();
 
         // Act
-        var documentSnapshot = await searchEngine.TryLocateComponentAsync(tagHelperDescriptor);
+        var documentSnapshot = await searchEngine.TryLocateComponentAsync(snapshot, tagHelperDescriptor);
 
         // Assert
         Assert.NotNull(documentSnapshot);
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorDocumentMappingServiceTest.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorDocumentMappingServiceTest.cs
index 511b5a2ae2f..8bd5c180295 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorDocumentMappingServiceTest.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/RazorDocumentMappingServiceTest.cs
@@ -35,7 +35,7 @@ public RazorDocumentMappingServiceTest(ITestOutputHelper testOutput)
     public void TryMapToHostDocumentRange_Strict_StartOnlyMaps_ReturnsFalse()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             "<p>@DateTime.Now</p>",
             "__o = DateTime.Now;",
@@ -58,7 +58,7 @@ public void TryMapToHostDocumentRange_Strict_StartOnlyMaps_ReturnsFalse()
     public void TryMapToHostDocumentRange_Strict_EndOnlyMaps_ReturnsFalse()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             "<p>@DateTime.Now</p>",
             "__o = DateTime.Now;",
@@ -81,7 +81,7 @@ public void TryMapToHostDocumentRange_Strict_EndOnlyMaps_ReturnsFalse()
     public void TryMapToHostDocumentRange_Strict_StartAndEndMap_ReturnsTrue()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             "<p>@DateTime.Now</p>",
             "__o = DateTime.Now;",
@@ -105,7 +105,7 @@ public void TryMapToHostDocumentRange_Strict_StartAndEndMap_ReturnsTrue()
     public void TryMapToHostDocumentRange_Inclusive_DirectlyMaps_ReturnsTrue()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             "<p>@DateTime.Now</p>",
             "__o = DateTime.Now;",
@@ -129,7 +129,7 @@ public void TryMapToHostDocumentRange_Inclusive_DirectlyMaps_ReturnsTrue()
     public void TryMapToHostDocumentRange_Inclusive_StartSinglyIntersects_ReturnsTrue()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             "<p>@DateTime.Now</p>",
             "__o = DateTime.Now;",
@@ -153,7 +153,7 @@ public void TryMapToHostDocumentRange_Inclusive_StartSinglyIntersects_ReturnsTru
     public void TryMapToHostDocumentRange_Inclusive_EndSinglyIntersects_ReturnsTrue()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             "<p>@DateTime.Now</p>",
             "__o = DateTime.Now;",
@@ -177,7 +177,7 @@ public void TryMapToHostDocumentRange_Inclusive_EndSinglyIntersects_ReturnsTrue(
     public void TryMapToHostDocumentRange_Inclusive_StartDoublyIntersects_ReturnsFalse()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             "<p>@DateTime.Now</p>",
             "__o = DateTime.Now;",
@@ -204,7 +204,7 @@ public void TryMapToHostDocumentRange_Inclusive_StartDoublyIntersects_ReturnsFal
     public void TryMapToHostDocumentRange_Inclusive_EndDoublyIntersects_ReturnsFalse()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             "<p>@DateTime.Now</p>",
             "__o = DateTime.Now;",
@@ -231,7 +231,7 @@ public void TryMapToHostDocumentRange_Inclusive_EndDoublyIntersects_ReturnsFalse
     public void TryMapToHostDocumentRange_Inclusive_OverlapsSingleMapping_ReturnsTrue()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             "<p>@DateTime.Now</p>",
             "__o = DateTime.Now;",
@@ -255,7 +255,7 @@ public void TryMapToHostDocumentRange_Inclusive_OverlapsSingleMapping_ReturnsTru
     public void TryMapToHostDocumentRange_Inclusive_OverlapsTwoMappings_ReturnsFalse()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             "<p>@DateTime.Now</p>",
             "__o = DateTime.Now;",
@@ -282,7 +282,7 @@ public void TryMapToHostDocumentRange_Inclusive_OverlapsTwoMappings_ReturnsFalse
     public void TryMapToHostDocumentRange_Inferred_DirectlyMaps_ReturnsTrue()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             "<p>@DateTime.Now</p>",
             "__o = DateTime.Now;",
@@ -306,7 +306,7 @@ public void TryMapToHostDocumentRange_Inferred_DirectlyMaps_ReturnsTrue()
     public void TryMapToHostDocumentRange_Inferred_BeginningOfDocAndProjection_ReturnsFalse()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             "@<unclosed></unclosed><p>@DateTime.Now</p>",
             "(__builder) => { };__o = DateTime.Now;",
@@ -329,7 +329,7 @@ public void TryMapToHostDocumentRange_Inferred_BeginningOfDocAndProjection_Retur
     public void TryMapToHostDocumentRange_Inferred_InbetweenProjections_ReturnsTrue()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             "@{ var abc = @<unclosed></unclosed> }",
             " var abc =  (__builder) => { } ",
@@ -356,7 +356,7 @@ public void TryMapToHostDocumentRange_Inferred_InbetweenProjections_ReturnsTrue(
     public void TryMapToHostDocumentRange_Inferred_InbetweenProjectionAndEndOfDoc_ReturnsTrue()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             "@{ var abc = @<unclosed></unclosed>",
             " var abc =  (__builder) => { }",
@@ -380,7 +380,7 @@ public void TryMapToHostDocumentRange_Inferred_InbetweenProjectionAndEndOfDoc_Re
     public void TryMapToHostDocumentRange_Inferred_OutsideDoc_ReturnsFalse()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             "@{ var abc = @<unclosed></unclosed>",
             " var abc =  (__builder) => { }",
@@ -416,7 +416,7 @@ public void TryMapToHostDocumentRange_Inferred_OutOfOrderMappings_DoesntThrow()
         // that has some very strange mappings!
 
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             "@{ var abc = @<unclosed></unclosed>",
             " var abc =  (__builder) => { }",
@@ -443,7 +443,7 @@ public void TryMapToHostDocumentRange_Inferred_OutOfOrderMappings_DoesntThrow()
     public void TryMapToGeneratedDocumentPosition_NotMatchingAnyMapping()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             "test razor source",
             "test C# source",
@@ -466,7 +466,7 @@ public void TryMapToGeneratedDocumentPosition_NotMatchingAnyMapping()
     public void TryMapToGeneratedDocumentPosition_CSharp_OnLeadingEdge()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             "Line 1\nLine 2 @{ var abc;\nvar def; }",
             "\n// Prefix\n var abc;\nvar def; \n// Suffix",
@@ -496,7 +496,7 @@ public void TryMapToGeneratedDocumentPosition_CSharp_OnLeadingEdge()
     public void TryMapToGeneratedDocumentPosition_CSharp_InMiddle()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             "Line 1\nLine 2 @{ var abc;\nvar def; }",
             "\n// Prefix\n var abc;\nvar def; \n// Suffix",
@@ -526,7 +526,7 @@ public void TryMapToGeneratedDocumentPosition_CSharp_InMiddle()
     public void TryMapToGeneratedDocumentPosition_CSharp_OnTrailingEdge()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             "Line 1\nLine 2 @{ var abc;\nvar def; }",
             "\n// Prefix\n var abc;\nvar def; \n// Suffix",
@@ -556,7 +556,7 @@ public void TryMapToGeneratedDocumentPosition_CSharp_OnTrailingEdge()
     public void TryMapToHostDocumentPosition_NotMatchingAnyMapping()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             razorSource: "test razor source",
             projectedCSharpSource: "projectedCSharpSource: test C# source",
@@ -579,7 +579,7 @@ public void TryMapToHostDocumentPosition_NotMatchingAnyMapping()
     public void TryMapToHostDocumentPosition_CSharp_OnLeadingEdge()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             razorSource: "Line 1\nLine 2 @{ var abc;\nvar def; }",
             projectedCSharpSource: "\n// Prefix\n var abc;\nvar def; \n// Suffix",
@@ -609,7 +609,7 @@ public void TryMapToHostDocumentPosition_CSharp_OnLeadingEdge()
     public void TryMapToHostDocumentPosition_CSharp_InMiddle()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             razorSource: "Line 1\nLine 2 @{ var abc;\nvar def; }",
             projectedCSharpSource: "\n// Prefix\n var abc;\nvar def; \n// Suffix",
@@ -639,7 +639,7 @@ public void TryMapToHostDocumentPosition_CSharp_InMiddle()
     public void TryMapToHostDocumentPosition_CSharp_OnTrailingEdge()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             razorSource: "Line 1\nLine 2 @{ var abc;\nvar def; }",
             projectedCSharpSource: "\n// Prefix\n var abc;\nvar def; \n// Suffix",
@@ -669,7 +669,7 @@ public void TryMapToHostDocumentPosition_CSharp_OnTrailingEdge()
     public void TryMapToGeneratedDocumentRange_CSharp()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             razorSource: "Line 1\nLine 2 @{ var abc;\nvar def; }",
             projectedCSharpSource: "\n// Prefix\n var abc;\nvar def; \n// Suffix",
@@ -700,7 +700,7 @@ public void TryMapToGeneratedDocumentRange_CSharp()
     public void TryMapToGeneratedDocumentRange_CSharp_MissingSourceMappings()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             razorSource: "Line 1\nLine 2 @{ var abc;\nvar def; }",
             projectedCSharpSource: "\n// Prefix\n var abc;\nvar def; \n// Suffix",
@@ -724,7 +724,7 @@ public void TryMapToGeneratedDocumentRange_CSharp_MissingSourceMappings()
     public void TryMapToGeneratedDocumentRange_CSharp_End_LessThan_Start()
     {
         // Arrange
-        var service = new RazorDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var service = new LspDocumentMappingService(_filePathService, new TestDocumentContextFactory(), LoggerFactory);
         var codeDoc = CreateCodeDocumentWithCSharpProjection(
             razorSource: "Line 1\nLine 2 @{ var abc;\nvar def; }",
             projectedCSharpSource: "\n// Prefix\n var abc;\nvar def; \n// Suffix",
@@ -760,7 +760,7 @@ public void GetLanguageKindCore_TagHelperElementOwnsName()
         var (classifiedSpans, tagHelperSpans) = GetClassifiedSpans(text, new[] { descriptor.Build() });
 
         // Act
-        var languageKind = RazorDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 32 + Environment.NewLine.Length, text.Length, rightAssociative: false);
+        var languageKind = LspDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 32 + Environment.NewLine.Length, text.Length, rightAssociative: false);
 
         // Assert
         Assert.Equal(RazorLanguageKind.Html, languageKind);
@@ -780,7 +780,7 @@ public void GetLanguageKindCore_TagHelpersDoNotOwnTrailingEdge()
         var (classifiedSpans, tagHelperSpans) = GetClassifiedSpans(text, new[] { descriptor.Build() });
 
         // Act
-        var languageKind = RazorDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 42 + Environment.NewLine.Length, text.Length, rightAssociative: false);
+        var languageKind = LspDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 42 + Environment.NewLine.Length, text.Length, rightAssociative: false);
 
         // Assert
         Assert.Equal(RazorLanguageKind.Razor, languageKind);
@@ -806,7 +806,7 @@ public void GetLanguageKindCore_TagHelperNestedCSharpAttribute()
         var (classifiedSpans, tagHelperSpans) = GetClassifiedSpans(text, new[] { descriptor.Build() });
 
         // Act
-        var languageKind = RazorDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 46 + Environment.NewLine.Length, text.Length, rightAssociative: false);
+        var languageKind = LspDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 46 + Environment.NewLine.Length, text.Length, rightAssociative: false);
 
         // Assert
         Assert.Equal(RazorLanguageKind.CSharp, languageKind);
@@ -820,7 +820,7 @@ public void GetLanguageKindCore_CSharp()
         var (classifiedSpans, tagHelperSpans) = GetClassifiedSpans(text);
 
         // Act
-        var languageKind = RazorDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 5, text.Length, rightAssociative: false);
+        var languageKind = LspDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 5, text.Length, rightAssociative: false);
 
         // Assert
         Assert.Equal(RazorLanguageKind.CSharp, languageKind);
@@ -834,7 +834,7 @@ public void GetLanguageKindCore_Html()
         var (classifiedSpans, tagHelperSpans) = GetClassifiedSpans(text);
 
         // Act
-        var languageKind = RazorDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 5, text.Length, rightAssociative: false);
+        var languageKind = LspDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 5, text.Length, rightAssociative: false);
 
         // Assert
         Assert.Equal(RazorLanguageKind.Html, languageKind);
@@ -848,7 +848,7 @@ public void GetLanguageKindCore_DefaultsToRazorLanguageIfCannotLocateOwner()
         var (classifiedSpans, tagHelperSpans) = GetClassifiedSpans(text);
 
         // Act
-        var languageKind = RazorDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, text.Length + 1, text.Length, rightAssociative: false);
+        var languageKind = LspDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, text.Length + 1, text.Length, rightAssociative: false);
 
         // Assert
         Assert.Equal(RazorLanguageKind.Razor, languageKind);
@@ -876,7 +876,7 @@ public void GetLanguageKindCore_GetsLastClassifiedSpanLanguageIfAtEndOfDocument(
         var tagHelperSpans = ImmutableArray<TagHelperSpanInternal>.Empty;
 
         // Act
-        var languageKind = RazorDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, text.Length, text.Length, rightAssociative: false);
+        var languageKind = LspDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, text.Length, text.Length, rightAssociative: false);
 
         // Assert
         Assert.Equal(RazorLanguageKind.Html, languageKind);
@@ -890,7 +890,7 @@ public void GetLanguageKindCore_HtmlEdgeEnd()
         var (classifiedSpans, tagHelperSpans) = GetClassifiedSpans(text);
 
         // Act
-        var languageKind = RazorDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, text.Length, text.Length, rightAssociative: false);
+        var languageKind = LspDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, text.Length, text.Length, rightAssociative: false);
 
         // Assert
         Assert.Equal(RazorLanguageKind.Html, languageKind);
@@ -904,7 +904,7 @@ public void GetLanguageKindCore_CSharpEdgeEnd()
         var (classifiedSpans, tagHelperSpans) = GetClassifiedSpans(text);
 
         // Act
-        var languageKind = RazorDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, text.Length, text.Length, rightAssociative: false);
+        var languageKind = LspDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, text.Length, text.Length, rightAssociative: false);
 
         // Assert
         Assert.Equal(RazorLanguageKind.CSharp, languageKind);
@@ -918,7 +918,7 @@ public void GetLanguageKindCore_RazorEdgeWithCSharp()
         var (classifiedSpans, tagHelperSpans) = GetClassifiedSpans(text);
 
         // Act
-        var languageKind = RazorDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 2, text.Length, rightAssociative: false);
+        var languageKind = LspDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 2, text.Length, rightAssociative: false);
 
         // Assert
         Assert.Equal(RazorLanguageKind.CSharp, languageKind);
@@ -932,7 +932,7 @@ public void GetLanguageKindCore_CSharpEdgeWithCSharpMarker()
         var (classifiedSpans, tagHelperSpans) = GetClassifiedSpans(text);
 
         // Act
-        var languageKind = RazorDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 12, text.Length, rightAssociative: false);
+        var languageKind = LspDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 12, text.Length, rightAssociative: false);
 
         // Assert
         Assert.Equal(RazorLanguageKind.CSharp, languageKind);
@@ -946,7 +946,7 @@ public void GetLanguageKindCore_ExplicitExpressionStartCSharp()
         var (classifiedSpans, tagHelperSpans) = GetClassifiedSpans(text);
 
         // Act
-        var languageKind = RazorDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 2, text.Length, rightAssociative: false);
+        var languageKind = LspDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 2, text.Length, rightAssociative: false);
 
         // Assert
         Assert.Equal(RazorLanguageKind.CSharp, languageKind);
@@ -960,7 +960,7 @@ public void GetLanguageKindCore_ExplicitExpressionInProgressCSharp()
         var (classifiedSpans, tagHelperSpans) = GetClassifiedSpans(text);
 
         // Act
-        var languageKind = RazorDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 4, text.Length, rightAssociative: false);
+        var languageKind = LspDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 4, text.Length, rightAssociative: false);
 
         // Assert
         Assert.Equal(RazorLanguageKind.CSharp, languageKind);
@@ -974,7 +974,7 @@ public void GetLanguageKindCore_ImplicitExpressionStartCSharp()
         var (classifiedSpans, tagHelperSpans) = GetClassifiedSpans(text);
 
         // Act
-        var languageKind = RazorDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 1, text.Length, rightAssociative: false);
+        var languageKind = LspDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 1, text.Length, rightAssociative: false);
 
         // Assert
         Assert.Equal(RazorLanguageKind.CSharp, languageKind);
@@ -988,7 +988,7 @@ public void GetLanguageKindCore_ImplicitExpressionInProgressCSharp()
         var (classifiedSpans, tagHelperSpans) = GetClassifiedSpans(text);
 
         // Act
-        var languageKind = RazorDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 3, text.Length, rightAssociative: false);
+        var languageKind = LspDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 3, text.Length, rightAssociative: false);
 
         // Assert
         Assert.Equal(RazorLanguageKind.CSharp, languageKind);
@@ -1002,7 +1002,7 @@ public void GetLanguageKindCore_RazorEdgeWithHtml()
         var (classifiedSpans, tagHelperSpans) = GetClassifiedSpans(text);
 
         // Act
-        var languageKind = RazorDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 2, text.Length, rightAssociative: false);
+        var languageKind = LspDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 2, text.Length, rightAssociative: false);
 
         // Assert
         Assert.Equal(RazorLanguageKind.Html, languageKind);
@@ -1016,7 +1016,7 @@ public void GetLanguageKindCore_HtmlInCSharpLeftAssociative()
         var (classifiedSpans, tagHelperSpans) = GetClassifiedSpans(text);
 
         // Act
-        var languageKind = RazorDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 13, text.Length, rightAssociative: false);
+        var languageKind = LspDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 13, text.Length, rightAssociative: false);
 
         // Assert
         Assert.Equal(RazorLanguageKind.CSharp, languageKind);
@@ -1030,7 +1030,7 @@ public void GetLanguageKindCore_HtmlInCSharpRightAssociative()
         var (classifiedSpans, tagHelperSpans) = GetClassifiedSpans(text);
 
         // Act\
-        var languageKind = RazorDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 13, text.Length, rightAssociative: true);
+        var languageKind = LspDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 13, text.Length, rightAssociative: true);
 
         // Assert
         Assert.Equal(RazorLanguageKind.Html, languageKind);
@@ -1052,7 +1052,7 @@ public void GetLanguageKindCore_TagHelperInCSharpRightAssociative()
         var (classifiedSpans, tagHelperSpans) = GetClassifiedSpans(text, new[] { descriptor.Build() });
 
         // Act\
-        var languageKind = RazorDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 40, text.Length, rightAssociative: true);
+        var languageKind = LspDocumentMappingService.GetLanguageKindCore(classifiedSpans, tagHelperSpans, 40, text.Length, rightAssociative: true);
 
         // Assert
         Assert.Equal(RazorLanguageKind.Html, languageKind);
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 f11cb0b851f..4188b6bc72b 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
@@ -9,6 +9,7 @@
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Test.Common.Mef;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
+using Microsoft.CodeAnalysis.Razor.Workspaces;
 using Microsoft.CodeAnalysis.Testing;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
@@ -63,13 +64,14 @@ await projectManager.UpdateAsync(updater =>
                 rootNamespace: "project"));
         });
 
-        var searchEngine = new DefaultRazorComponentSearchEngine(projectManager, LoggerFactory);
+        var searchEngine = new RazorComponentSearchEngine(projectManager, LoggerFactory);
 
         var endpoint = new RenameEndpoint(
             searchEngine,
             projectManager,
             LanguageServerFeatureOptions,
             DocumentMappingService,
+            EditMappingService,
             languageServer,
             LoggerFactory);
 
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 879c0bf5fbe..c812fcdbaae 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
@@ -526,13 +526,10 @@ public async Task Handle_Rename_SingleServer_CallsDelegatedLanguageServer()
             .Setup(c => c.SendRequestAsync<IDelegatedParams, WorkspaceEdit>(CustomMessageNames.RazorRenameEndpointName, It.IsAny<DelegatedRenameParams>(), It.IsAny<CancellationToken>()))
             .ReturnsAsync(delegatedEdit);
 
-        var documentMappingServiceMock = new StrictMock<IRazorDocumentMappingService>();
+        var documentMappingServiceMock = new StrictMock<IDocumentMappingService>();
         documentMappingServiceMock
             .Setup(c => c.GetLanguageKind(It.IsAny<RazorCodeDocument>(), It.IsAny<int>(), It.IsAny<bool>()))
             .Returns(RazorLanguageKind.CSharp);
-        documentMappingServiceMock
-            .Setup(c => c.RemapWorkspaceEditAsync(It.IsAny<WorkspaceEdit>(), It.IsAny<CancellationToken>()))
-            .ReturnsAsync(delegatedEdit);
 
         var projectedPosition = new LinePosition(1, 1);
         var projectedIndex = 1;
@@ -540,7 +537,16 @@ public async Task Handle_Rename_SingleServer_CallsDelegatedLanguageServer()
             .Setup(c => c.TryMapToGeneratedDocumentPosition(It.IsAny<IRazorGeneratedDocument>(), It.IsAny<int>(), out projectedPosition, out projectedIndex))
             .Returns(true);
 
-        var (endpoint, documentContextFactory) = await CreateEndpointAndDocumentContextFactoryAsync(options, documentMappingServiceMock.Object, clientConnectionMock.Object);
+        var editMappingServiceMock = new StrictMock<IEditMappingService>();
+        editMappingServiceMock
+            .Setup(c => c.RemapWorkspaceEditAsync(It.IsAny<WorkspaceEdit>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync(delegatedEdit);
+
+        var (endpoint, documentContextFactory) = await CreateEndpointAndDocumentContextFactoryAsync(
+            options,
+            documentMappingServiceMock.Object,
+            editMappingServiceMock.Object,
+            clientConnectionMock.Object);
 
         var uri = PathUtilities.GetUri(s_componentWithParamFilePath);
         var request = new RenameParams
@@ -570,12 +576,18 @@ public async Task Handle_Rename_SingleServer_DoesNotDelegateForRazor()
             o.ReturnCodeActionAndRenamePathsWithPrefixedSlash == false);
 
         var clientConnection = StrictMock.Of<IClientConnection>();
-        var documentMappingServiceMock = new StrictMock<IRazorDocumentMappingService>();
+        var documentMappingServiceMock = new StrictMock<IDocumentMappingService>();
         documentMappingServiceMock
             .Setup(c => c.GetLanguageKind(It.IsAny<RazorCodeDocument>(), It.IsAny<int>(), It.IsAny<bool>()))
             .Returns(RazorLanguageKind.Razor);
 
-        var (endpoint, documentContextFactory) = await CreateEndpointAndDocumentContextFactoryAsync(options, documentMappingServiceMock.Object, clientConnection);
+        var editMappingService = StrictMock.Of<IEditMappingService>();
+
+        var (endpoint, documentContextFactory) = await CreateEndpointAndDocumentContextFactoryAsync(
+            options,
+            documentMappingServiceMock.Object,
+            editMappingService,
+            clientConnection);
 
         var request = new RenameParams
         {
@@ -596,7 +608,8 @@ public async Task Handle_Rename_SingleServer_DoesNotDelegateForRazor()
 
     private async Task<(RenameEndpoint, IDocumentContextFactory)> CreateEndpointAndDocumentContextFactoryAsync(
         LanguageServerFeatureOptions? options = null,
-        IRazorDocumentMappingService? documentMappingService = null,
+        IDocumentMappingService? documentMappingService = null,
+        IEditMappingService? editMappingService = null,
         IClientConnection? clientConnection = null)
     {
         using PooledArrayBuilder<TagHelperDescriptor> builder = [];
@@ -671,22 +684,27 @@ await projectManager.UpdateAsync(updater =>
         await projectService.UpdateDocumentAsync(s_componentFilePath4, SourceText.From(ComponentText4), version: 42, DisposalToken);
         await projectService.UpdateDocumentAsync(s_componentWithParamFilePath, SourceText.From(ComponentWithParamText), version: 42, DisposalToken);
 
-        var searchEngine = new DefaultRazorComponentSearchEngine(projectManager, LoggerFactory);
+        var searchEngine = new RazorComponentSearchEngine(projectManager, LoggerFactory);
         options ??= StrictMock.Of<LanguageServerFeatureOptions>(o =>
             o.SupportsFileManipulation == true &&
             o.SingleServerSupport == false &&
             o.ReturnCodeActionAndRenamePathsWithPrefixedSlash == false);
 
-        var documentMappingServiceMock = new StrictMock<IRazorDocumentMappingService>();
-        documentMappingServiceMock
-            .Setup(c => c.GetLanguageKind(It.IsAny<RazorCodeDocument>(), It.IsAny<int>(), It.IsAny<bool>()))
-            .Returns(RazorLanguageKind.Html);
-        var projectedPosition = new LinePosition(1, 1);
-        var projectedIndex = 1;
-        documentMappingServiceMock
-            .Setup(c => c.TryMapToGeneratedDocumentPosition(It.IsAny<IRazorGeneratedDocument>(), It.IsAny<int>(), out projectedPosition, out projectedIndex))
-            .Returns(true);
-        documentMappingService ??= documentMappingServiceMock.Object;
+        if (documentMappingService == null)
+        {
+            var documentMappingServiceMock = new StrictMock<IDocumentMappingService>();
+            documentMappingServiceMock
+                .Setup(c => c.GetLanguageKind(It.IsAny<RazorCodeDocument>(), It.IsAny<int>(), It.IsAny<bool>()))
+                .Returns(RazorLanguageKind.Html);
+            var projectedPosition = new LinePosition(1, 1);
+            var projectedIndex = 1;
+            documentMappingServiceMock
+                .Setup(c => c.TryMapToGeneratedDocumentPosition(It.IsAny<IRazorGeneratedDocument>(), It.IsAny<int>(), out projectedPosition, out projectedIndex))
+                .Returns(true);
+            documentMappingService = documentMappingServiceMock.Object;
+        }
+
+        editMappingService ??= StrictMock.Of<IEditMappingService>();
 
         clientConnection ??= StrictMock.Of<IClientConnection>();
 
@@ -695,6 +713,7 @@ await projectManager.UpdateAsync(updater =>
             projectManager,
             options,
             documentMappingService,
+            editMappingService,
             clientConnection,
             LoggerFactory);
 
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 4c460d0cffd..0bcf1c28d4e 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
@@ -923,34 +923,31 @@ private static VersionedDocumentContext CreateDocumentContext(
         string documentText,
         bool isRazorFile,
         ImmutableArray<TagHelperDescriptor> tagHelpers,
-        int? documentVersion)
+        int version)
     {
         var document = CreateCodeDocument(documentText, isRazorFile, tagHelpers);
-        var random = new Random();
 
-        var projectSnapshot = new Mock<IProjectSnapshot>(MockBehavior.Strict);
+        var projectSnapshot = new StrictMock<IProjectSnapshot>();
         projectSnapshot
-            .Setup(p => p.Version)
-            .Returns(default(VersionStamp));
+            .SetupGet(p => p.Version)
+            .Returns(VersionStamp.Default);
 
-        var documentSnapshot = Mock.Of<IDocumentSnapshot>(MockBehavior.Strict);
-        var documentContext = new Mock<VersionedDocumentContext>(MockBehavior.Strict, new Uri("c:/path/to/file.razor"), documentSnapshot, /* projectContext */ null, 0);
-        documentContext.Setup(d => d.GetCodeDocumentAsync(It.IsAny<CancellationToken>()))
-            .ReturnsAsync(document);
-
-        documentContext.SetupGet(d => d.Version)
-            .Returns(documentVersion ?? random.Next());
-
-        documentContext.Setup(d => d.Project)
+        var documentSnapshotMock = new StrictMock<IDocumentSnapshot>();
+        documentSnapshotMock
+            .SetupGet(x => x.Project)
             .Returns(projectSnapshot.Object);
+        documentSnapshotMock
+            .Setup(x => x.GetGeneratedOutputAsync())
+            .ReturnsAsync(document);
+        documentSnapshotMock
+            .Setup(x => x.GetTextAsync())
+            .ReturnsAsync(document.Source.Text);
 
-        documentContext.Setup(d => d.GetSourceTextAsync(It.IsAny<CancellationToken>()))
-            .Returns(Task.FromResult(document.Source.Text));
-
-        documentContext.Setup(d => d.Uri)
-            .Returns(new Uri($"c:\\${(isRazorFile ? RazorFile : CSHtmlFile)}"));
-
-        return documentContext.Object;
+        return new VersionedDocumentContext(
+            uri: new Uri($@"c:\${GetFileName(isRazorFile)}"),
+            snapshot: documentSnapshotMock.Object,
+            projectContext: null,
+            version);
     }
 
     private async Task<IRazorSemanticTokensInfoService> CreateServiceAsync(
@@ -977,7 +974,7 @@ private async Task<IRazorSemanticTokensInfoService> CreateServiceAsync(
                 : It.Is<ProvideSemanticTokensResponse>(x => x.Tokens == null));
 
         var documentContextFactory = new TestDocumentContextFactory(documentSnapshot);
-        var documentMappingService = new RazorDocumentMappingService(FilePathService, documentContextFactory, LoggerFactory);
+        var documentMappingService = new LspDocumentMappingService(FilePathService, documentContextFactory, LoggerFactory);
 
         var configurationSyncService = new Mock<IConfigurationSyncService>(MockBehavior.Strict);
 
@@ -1113,7 +1110,7 @@ private string GetBaselineFileContents(string baselineFileName)
 
     private ImmutableArray<LinePositionSpan>? GetMappedCSharpRanges(RazorCodeDocument codeDocument, LinePositionSpan razorRange, bool precise)
     {
-        var documentMappingService = new RazorDocumentMappingService(FilePathService, new TestDocumentContextFactory(), LoggerFactory);
+        var documentMappingService = new LspDocumentMappingService(FilePathService, new TestDocumentContextFactory(), LoggerFactory);
 
         if (precise)
         {
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/SingleServerDelegatingEndpointTestBase.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/SingleServerDelegatingEndpointTestBase.cs
index 6d5d6cca9a2..853c036a485 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/SingleServerDelegatingEndpointTestBase.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/SingleServerDelegatingEndpointTestBase.cs
@@ -24,9 +24,10 @@ public abstract partial class SingleServerDelegatingEndpointTestBase(ITestOutput
 {
     private protected IDocumentContextFactory? DocumentContextFactory { get; private set; }
     private protected LanguageServerFeatureOptions? LanguageServerFeatureOptions { get; private set; }
-    private protected IRazorDocumentMappingService? DocumentMappingService { get; private set; }
+    private protected IDocumentMappingService? DocumentMappingService { get; private set; }
+    private protected IEditMappingService? EditMappingService { get; private set; }
 
-    [MemberNotNull(nameof(DocumentContextFactory), nameof(LanguageServerFeatureOptions), nameof(DocumentMappingService))]
+    [MemberNotNull(nameof(DocumentContextFactory), nameof(LanguageServerFeatureOptions), nameof(DocumentMappingService), nameof(EditMappingService))]
     private protected async Task<TestLanguageServer> CreateLanguageServerAsync(
         RazorCodeDocument codeDocument,
         string razorFilePath,
@@ -64,7 +65,8 @@ private protected async Task<TestLanguageServer> CreateLanguageServerAsync(
             options.HtmlVirtualDocumentSuffix == DefaultLanguageServerFeatureOptions.DefaultHtmlVirtualDocumentSuffix,
             MockBehavior.Strict);
 
-        DocumentMappingService = new RazorDocumentMappingService(FilePathService, DocumentContextFactory, LoggerFactory);
+        DocumentMappingService = new LspDocumentMappingService(FilePathService, DocumentContextFactory, LoggerFactory);
+        EditMappingService = new EditMappingService(DocumentMappingService, FilePathService, DocumentContextFactory);
 
         var csharpServer = await CSharpTestLspServerHelpers.CreateCSharpLspServerAsync(
             csharpFiles,
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 fc85888a50b..80a563b38d4 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
@@ -35,7 +35,7 @@ public async Task Handle_Html_ReturnsResult()
             .Setup(l => l.SendRequestAsync<WrapWithTagParams, WrapWithTagResponse>(LanguageServerConstants.RazorWrapWithTagEndpoint, It.IsAny<WrapWithTagParams>(), It.IsAny<CancellationToken>()))
             .ReturnsAsync(response);
 
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             s => s.GetLanguageKind(codeDocument, It.IsAny<int>(), It.IsAny<bool>()) == RazorLanguageKind.Html, MockBehavior.Strict);
         var endpoint = new WrapWithTagEndpoint(
             clientConnection.Object,
@@ -70,7 +70,7 @@ public async Task Handle_CSharp_ReturnsNull()
             .Setup(l => l.SendRequestAsync<WrapWithTagParams, WrapWithTagResponse>(LanguageServerConstants.RazorWrapWithTagEndpoint, It.IsAny<WrapWithTagParams>(), It.IsAny<CancellationToken>()))
             .ReturnsAsync(response);
 
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             s => s.GetLanguageKind(codeDocument, It.IsAny<int>(), It.IsAny<bool>()) == RazorLanguageKind.CSharp, MockBehavior.Strict);
         var endpoint = new WrapWithTagEndpoint(
             clientConnection.Object,
@@ -105,7 +105,7 @@ public async Task Handle_CSharp_WholeImplicitStatement_ReturnsResult()
             .Setup(l => l.SendRequestAsync<WrapWithTagParams, WrapWithTagResponse>(LanguageServerConstants.RazorWrapWithTagEndpoint, It.IsAny<WrapWithTagParams>(), It.IsAny<CancellationToken>()))
             .ReturnsAsync(response);
 
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             s => s.GetLanguageKind(codeDocument, It.IsAny<int>(), It.IsAny<bool>()) == RazorLanguageKind.CSharp, MockBehavior.Strict);
         var endpoint = new WrapWithTagEndpoint(
             clientConnection.Object,
@@ -140,7 +140,7 @@ public async Task Handle_CSharp_PartOfImplicitStatement_ReturnsNull()
             .Setup(l => l.SendRequestAsync<WrapWithTagParams, WrapWithTagResponse>(LanguageServerConstants.RazorWrapWithTagEndpoint, It.IsAny<WrapWithTagParams>(), It.IsAny<CancellationToken>()))
             .ReturnsAsync(response);
 
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             s => s.GetLanguageKind(codeDocument, It.IsAny<int>(), It.IsAny<bool>()) == RazorLanguageKind.CSharp, MockBehavior.Strict);
         var endpoint = new WrapWithTagEndpoint(
             clientConnection.Object,
@@ -175,7 +175,7 @@ public async Task Handle_CSharp_InImplicitStatement_ReturnsResult()
             .Setup(l => l.SendRequestAsync<WrapWithTagParams, WrapWithTagResponse>(LanguageServerConstants.RazorWrapWithTagEndpoint, It.IsAny<WrapWithTagParams>(), It.IsAny<CancellationToken>()))
             .ReturnsAsync(response);
 
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             s => s.GetLanguageKind(codeDocument, It.IsAny<int>(), It.IsAny<bool>()) == RazorLanguageKind.CSharp, MockBehavior.Strict);
         var endpoint = new WrapWithTagEndpoint(
             clientConnection.Object,
@@ -206,7 +206,7 @@ public async Task Handle_DocumentNotFound_ReturnsNull()
 
         var clientConnection = new Mock<IClientConnection>(MockBehavior.Strict);
 
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             s => s.GetLanguageKind(codeDocument, It.IsAny<int>(), It.IsAny<bool>()) == RazorLanguageKind.Html, MockBehavior.Strict);
         var endpoint = new WrapWithTagEndpoint(clientConnection.Object, documentMappingService, LoggerFactory);
 
@@ -234,7 +234,7 @@ public async Task Handle_UnsupportedCodeDocument_ReturnsNull()
 
         var clientConnection = new Mock<IClientConnection>(MockBehavior.Strict);
 
-        var documentMappingService = Mock.Of<IRazorDocumentMappingService>(
+        var documentMappingService = Mock.Of<IDocumentMappingService>(
             s => s.GetLanguageKind(codeDocument, It.IsAny<int>(), It.IsAny<bool>()) == RazorLanguageKind.Html, MockBehavior.Strict);
         var endpoint = new WrapWithTagEndpoint(clientConnection.Object, documentMappingService, LoggerFactory);
 
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 ddae8ddf089..ecf351fe1e8 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
@@ -17,6 +17,7 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.ExternalAccess.Razor;
 using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Testing;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Composition;
@@ -150,9 +151,7 @@ private static AdhocWorkspace CreateCSharpTestWorkspace(
         var documentCount = 0;
         foreach (var (documentUri, csharpSourceText) in files)
         {
-            // File path logic here has to match https://github.com/dotnet/roslyn/blob/3db75baf44332efd490bc0d166983103552370a3/src/Features/LanguageServer/Protocol/Extensions/ProtocolConversions.cs#L163
-            // or the Roslyn side won't see the file in the project/solution
-            var documentFilePath = documentUri.IsFile ? documentUri.LocalPath : documentUri.AbsolutePath;
+            var documentFilePath = documentUri.GetDocumentFilePath();
             var textAndVersion = TextAndVersion.Create(csharpSourceText, VersionStamp.Default, documentFilePath);
 
             foreach (var projectInfo in projectInfos)
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/ProjectSystem/TestProjectSnapshotManager.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/ProjectSystem/TestProjectSnapshotManager.cs
index 49491cfbc99..01f551ba04c 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/ProjectSystem/TestProjectSnapshotManager.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/ProjectSystem/TestProjectSnapshotManager.cs
@@ -2,12 +2,14 @@
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
 using System;
+using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.LanguageServer;
 using Microsoft.AspNetCore.Razor.ProjectEngineHost;
 using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
+using Microsoft.CodeAnalysis.Razor.Workspaces;
 
 namespace Microsoft.AspNetCore.Razor.Test.Common.ProjectSystem;
 
@@ -16,7 +18,7 @@ internal partial class TestProjectSnapshotManager(
     ILoggerFactory loggerFactory,
     CancellationToken disposalToken,
     Action<ProjectSnapshotManager.Updater>? initializer = null)
-    : ProjectSnapshotManager(projectEngineFactoryProvider, loggerFactory, initializer)
+    : ProjectSnapshotManager(projectEngineFactoryProvider, loggerFactory, initializer), IProjectCollectionResolver
 {
     private readonly CancellationToken _disposalToken = disposalToken;
 
@@ -33,6 +35,11 @@ public Task<TestDocumentSnapshot> CreateAndAddDocumentAsync(ProjectSnapshot proj
             _disposalToken);
     }
 
+    public IEnumerable<IProjectSnapshot> EnumerateProjects(IDocumentSnapshot snapshot)
+    {
+        return GetProjects();
+    }
+
     public Listener ListenToNotifications() => new(this);
 
     public Task UpdateAsync(Action<Updater> updater)
diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/StrictMock`1.cs b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/StrictMock`1.cs
index c71e952f94c..062f31cbf03 100644
--- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/StrictMock`1.cs
+++ b/src/Razor/test/Microsoft.AspNetCore.Razor.Test.Common.Tooling/StrictMock`1.cs
@@ -13,7 +13,7 @@ public StrictMock()
     {
     }
 
-    public StrictMock(params object[] args)
+    public StrictMock(params object?[] args)
         : base(MockBehavior.Strict, args)
     {
     }
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Remote.Razor.Test/RazorServicesTest.cs b/src/Razor/test/Microsoft.CodeAnalysis.Remote.Razor.Test/RazorServicesTest.cs
index 40215a782ac..4b4a579532c 100644
--- a/src/Razor/test/Microsoft.CodeAnalysis.Remote.Razor.Test/RazorServicesTest.cs
+++ b/src/Razor/test/Microsoft.CodeAnalysis.Remote.Razor.Test/RazorServicesTest.cs
@@ -5,9 +5,11 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Xml;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Test.Common;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor;
 using Microsoft.CodeAnalysis.Remote.Razor;
 using Roslyn.Test.Utilities;
 using Xunit;
@@ -17,6 +19,9 @@ namespace Microsoft.CodeAnalysis.Razor.Remote;
 
 public class RazorServicesTest(ITestOutputHelper testOutputHelper) : ToolingTestBase(testOutputHelper)
 {
+    private const string Prefix = "IRemote";
+    private const string Suffix = "Service";
+
     private readonly static XmlDocument s_servicesFile = LoadServicesFile();
 
     [Theory]
@@ -34,6 +39,32 @@ public void JsonServicesAreListedProperly(Type serviceType, Type? callbackType)
         VerifyService(serviceType, callbackType);
     }
 
+    [Theory]
+    [MemberData(nameof(JsonServices))]
+    public void JsonServicesHaveTheRightParameters(Type serviceType, Type? _)
+    {
+        Assert.True(typeof(IRemoteJsonService).IsAssignableFrom(serviceType));
+
+        var found = false;
+        foreach (var method in serviceType.GetMethods(BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public))
+        {
+            if (method.Name != "RunServiceAsync" &&
+                method.GetParameters() is [{ ParameterType: { } parameterType }, ..])
+            {
+                if (typeof(RazorPinnedSolutionInfoWrapper).IsAssignableFrom(parameterType))
+                {
+                    Assert.Fail($"Method {method.Name} in a Json service has a pinned solution info wrapper parameter that isn't Json serializable");
+                }
+                else if (typeof(JsonSerializableRazorPinnedSolutionInfoWrapper).IsAssignableFrom(parameterType))
+                {
+                    found = true;
+                }
+            }
+        }
+
+        Assert.True(found, "Didn't find a method to validate, which means maybe this test is invalid");
+    }
+
     [Fact]
     public void RazorServicesContainsAllServices()
     {
@@ -82,16 +113,13 @@ private static XmlDocument LoadServicesFile()
 
     private static void VerifyService(Type serviceType, Type? callbackType)
     {
-        const string prefix = "IRemote";
-        const string suffix = "Service";
-
         Assert.Null(callbackType);
 
         var serviceName = serviceType.Name;
-        Assert.StartsWith(prefix, serviceName);
-        Assert.EndsWith(suffix, serviceName);
+        Assert.StartsWith(Prefix, serviceName);
+        Assert.EndsWith(Suffix, serviceName);
 
-        var shortName = serviceName.Substring(prefix.Length, serviceName.Length - prefix.Length - suffix.Length);
+        var shortName = serviceName.Substring(Prefix.Length, serviceName.Length - Prefix.Length - Suffix.Length);
         var servicePropsEntry = $"Microsoft.VisualStudio.Razor.{shortName}";
 
         var serviceNode = s_servicesFile.SelectSingleNode($"/Project/ItemGroup/ServiceHubService[@Include='{servicePropsEntry}']");
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
new file mode 100644
index 00000000000..f7a3df1d975
--- /dev/null
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostInlayHintEndpointTest.cs
@@ -0,0 +1,204 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the MIT license. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Text.Json;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Razor;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor;
+using Microsoft.CodeAnalysis.Testing;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.LanguageServer.Protocol;
+using Roslyn.Test.Utilities;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost;
+
+public class CohostInlayHintEndpointTest(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper)
+{
+    [Fact]
+    public Task InlayHints()
+        => VerifyInlayHintsAsync(
+            input: """
+
+            <div></div>
+
+            @functions {
+                private void M(string thisIsMyString)
+                {
+                    var {|int:x|} = 5;
+
+                    var {|string:y|} = "Hello";
+
+                    M({|thisIsMyString:"Hello"|});
+                }
+            }
+
+            """,
+            toolTipMap: new Dictionary<string, string>
+            {
+                { "int",            "struct System.Int32"            },
+                { "string",         "class System.String"            },
+                { "thisIsMyString", "(parameter) string thisIsMyStr" }
+            },
+            output: """
+
+            <div></div>
+
+            @functions {
+                private void M(string thisIsMyString)
+                {
+                    int x = 5;
+
+                    string y = "Hello";
+
+                    M(thisIsMyString: "Hello");
+                }
+            }
+
+            """);
+
+    [Fact]
+    public Task InlayHints_DisplayAllOverride()
+        => VerifyInlayHintsAsync(
+            input: """
+
+            <div></div>
+
+            @functions {
+                private void M(string thisIsMyString)
+                {
+                    {|int:var|} x = 5;
+
+                    {|string:var|} y = "Hello";
+
+                    M({|thisIsMyString:"Hello"|});
+                }
+            }
+
+            """,
+            toolTipMap: new Dictionary<string, string>
+            {
+                { "int",            "struct System.Int32"            },
+                { "string",         "class System.String"            },
+                { "thisIsMyString", "(parameter) string thisIsMyStr" }
+            },
+            output: """
+
+            <div></div>
+
+            @functions {
+                private void M(string thisIsMyString)
+                {
+                    int x = 5;
+
+                    string y = "Hello";
+
+                    M(thisIsMyString: "Hello");
+                }
+            }
+
+            """,
+            displayAllOverride: true);
+
+    [Fact]
+    public Task InlayHints_ComponentAttributes()
+        => VerifyInlayHintsAsync(
+            input: """
+
+                <div>
+                    <InputText Value="_value" />
+                    <InputText Value="@_value" />
+                    <InputText Value="@(_value)" />
+                </div>
+
+                """,
+            toolTipMap: [],
+            output: """
+
+                <div>
+                    <InputText Value="_value" />
+                    <InputText Value="@_value" />
+                    <InputText Value="@(_value)" />
+                </div>
+
+                """);
+
+    private async Task VerifyInlayHintsAsync(string input, Dictionary<string, string> toolTipMap, string output, bool displayAllOverride = false)
+    {
+        TestFileMarkupParser.GetSpans(input, out input, out ImmutableDictionary<string, ImmutableArray<TextSpan>> spansDict);
+        var document = CreateProjectAndRazorDocument(input);
+        var inputText = await document.GetTextAsync(DisposalToken);
+
+        var endpoint = new CohostInlayHintEndpoint(RemoteServiceInvoker);
+        var resolveEndpoint = new CohostInlayHintResolveEndpoint(RemoteServiceInvoker, LoggerFactory);
+
+        var request = new InlayHintParams()
+        {
+            TextDocument = new TextDocumentIdentifier() { Uri = document.CreateUri() },
+            Range = new()
+            {
+                Start = new(0, 0),
+                End = new(inputText.Lines.Count, 0)
+            }
+        };
+
+        var hints = await endpoint.GetTestAccessor().HandleRequestAsync(request, document, displayAllOverride, DisposalToken);
+
+        // Assert
+        Assert.NotNull(hints);
+        Assert.Equal(spansDict.Values.Count(), hints.Length);
+
+        foreach (var hint in hints)
+        {
+            // Because our test input data can't have colons in the input, but parameter info returned from Roslyn does, we have to strip them off.
+            var label = hint.Label.First.TrimEnd(':');
+            Assert.True(spansDict.TryGetValue(label, out var spans), $"Expected {label} to be in test provided markers");
+
+            var span = Assert.Single(spans);
+            var expectedRange = inputText.GetRange(span);
+            // Inlay hints only have a position, so we ignore the end of the range that comes from the test input
+            Assert.Equal(expectedRange.Start, hint.Position);
+
+            // This looks weird, but its what we have to do to satisfy the compiler :)
+            string? expectedTooltip = null;
+            Assert.True(toolTipMap?.TryGetValue(label, out expectedTooltip));
+            Assert.NotNull(expectedTooltip);
+
+            // We need to pretend we're making real LSP requests by serializing the data blob at least
+            var serializedHint = JsonSerializer.Deserialize<InlayHint>(JsonSerializer.SerializeToElement(hint)).AssumeNotNull();
+            // Make sure we can resolve the document correctly
+            var tdi = resolveEndpoint.GetTestAccessor().GetTextDocumentIdentifier(serializedHint);
+            Assert.NotNull(tdi);
+            Assert.Equal(document.CreateUri(), tdi.Uri);
+
+            // Make sure we, or really Roslyn, can resolve the hint correctly
+            var resolvedHint = await resolveEndpoint.GetTestAccessor().HandleRequestAsync(serializedHint, document, DisposalToken);
+            Assert.NotNull(resolvedHint);
+            Assert.NotNull(resolvedHint.ToolTip);
+
+            if (resolvedHint.ToolTip.Value.TryGetFirst(out var plainTextTooltip))
+            {
+                Assert.Equal(expectedTooltip, plainTextTooltip);
+            }
+            else if (resolvedHint.ToolTip.Value.TryGetSecond(out var markupTooltip))
+            {
+                Assert.Contains(expectedTooltip, markupTooltip.Value);
+            }
+        }
+
+        // To validate edits, we have to collect them all together, and apply them backwards
+        var changes = hints
+            .SelectMany(h => h.TextEdits ?? [])
+            .OrderByDescending(e => e.Range.Start.Line)
+            .ThenByDescending(e => e.Range.Start.Character)
+            .Select(inputText.GetTextChange);
+        inputText = inputText.WithChanges(changes);
+
+        AssertEx.EqualOrDiff(output, inputText.ToString());
+    }
+}
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 cd2c7baddaa..28c05827166 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
@@ -162,7 +162,7 @@ private async Task VerifyLinkedEditingRangeAsync(string input)
         var document = CreateProjectAndRazorDocument(input);
         var sourceText = await document.GetTextAsync(DisposalToken);
 
-        var endpoint = new CohostLinkedEditingRangeEndpoint(RemoteServiceInvoker, LoggerFactory);
+        var endpoint = new CohostLinkedEditingRangeEndpoint(RemoteServiceInvoker);
 
         var request = new LinkedEditingRangeParams()
         {
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSemanticTokensRangeEndpointTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSemanticTokensRangeEndpointTest.cs
index 8f688ce3712..42b792b7ad5 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSemanticTokensRangeEndpointTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostSemanticTokensRangeEndpointTest.cs
@@ -9,8 +9,6 @@
 using Microsoft.AspNetCore.Razor.PooledObjects;
 using Microsoft.AspNetCore.Razor.Telemetry;
 using Microsoft.CodeAnalysis.Razor.Settings;
-using Microsoft.CodeAnalysis.Razor.Workspaces;
-using Microsoft.CodeAnalysis.Remote.Razor;
 using Microsoft.CodeAnalysis.Remote.Razor.SemanticTokens;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.VisualStudio.Razor.Settings;
@@ -107,7 +105,7 @@ private async Task VerifySemanticTokensAsync(string input, bool colorBackground,
         var clientSettingsManager = new ClientSettingsManager([], null, null);
         clientSettingsManager.Update(ClientAdvancedSettings.Default with { ColorBackground = colorBackground });
 
-        var endpoint = new CohostSemanticTokensRangeEndpoint(RemoteServiceInvoker, clientSettingsManager, legend, NoOpTelemetryReporter.Instance, LoggerFactory);
+        var endpoint = new CohostSemanticTokensRangeEndpoint(RemoteServiceInvoker, clientSettingsManager, legend, NoOpTelemetryReporter.Instance);
 
         var span = new LinePositionSpan(new(0, 0), new(sourceText.Lines.Count, 0));
 
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/LanguageClient/DynamicFiles/RazorDocumentExcerptServiceTest.cs b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/LanguageClient/DynamicFiles/RazorDocumentExcerptServiceTest.cs
index ae6ff1ddcac..d9565002185 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/LanguageClient/DynamicFiles/RazorDocumentExcerptServiceTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/LanguageClient/DynamicFiles/RazorDocumentExcerptServiceTest.cs
@@ -248,6 +248,188 @@ public async Task TryGetExcerptInternalAsync_SingleLine_CanClassifyCSharp_Comple
             });
     }
 
+    [Fact]
+    public async Task TryGetExcerptInternalAsync_MultiLine_MultilineString()
+    {
+        // Arrange
+        var razorSource = """
+            <html>
+            @{
+                [|string|] bigString = @"
+                    Razor shows 3 lines in a
+                    tooltip maximum, so this
+                    multi-line verbatim
+                    string must be longer
+                    than that.
+                    ";
+            }
+            </html>
+            """;
+
+        var (primary, secondary, secondarySpan) = await InitializeWithSnapshotAsync(razorSource);
+
+        var service = CreateExcerptService(primary);
+
+        // Act
+        var options = RazorClassificationOptionsWrapper.Default;
+        var result = await service.TryGetExcerptInternalAsync(secondary, secondarySpan, ExcerptModeInternal.Tooltip, options, DisposalToken);
+
+        // Assert
+        Assert.NotNull(result);
+        Assert.Equal(secondarySpan, result.Value.Span);
+        Assert.Same(secondary, result.Value.Document);
+
+        // Verifies that the right part of the primary document will be highlighted.
+        Assert.Equal(
+            (await secondary.GetTextAsync()).GetSubText(secondarySpan).ToString(),
+            result.Value.Content.GetSubText(result.Value.MappedSpan).ToString(),
+            ignoreLineEndingDifferences: true);
+
+        Assert.Equal("""
+            <html>
+            @{
+                string bigString = @"
+                    Razor shows 3 lines in a
+                    tooltip maximum, so this
+                    multi-line verbatim
+            """,
+            result.Value.Content.ToString(), ignoreLineEndingDifferences: true);
+
+        Assert.Collection(
+            result.Value.ClassifiedSpans,
+            c =>
+            {
+                Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                Assert.Equal("""
+                    <html>
+                    @{
+                    """,
+                    result.Value.Content.GetSubText(c.TextSpan).ToString(),
+                    ignoreLineEndingDifferences: true);
+            },
+            c =>
+            {
+                Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                Assert.Equal("\r\n    ", result.Value.Content.GetSubText(c.TextSpan).ToString(), ignoreLineEndingDifferences: true);
+            },
+            c =>
+            {
+                Assert.Equal(ClassificationTypeNames.Keyword, c.ClassificationType);
+                Assert.Equal("string", result.Value.Content.GetSubText(c.TextSpan).ToString());
+            },
+            c =>
+            {
+                Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                Assert.Equal(" ", result.Value.Content.GetSubText(c.TextSpan).ToString());
+            },
+            c =>
+            {
+                Assert.Equal(ClassificationTypeNames.LocalName, c.ClassificationType);
+                Assert.Equal("bigString", result.Value.Content.GetSubText(c.TextSpan).ToString());
+            },
+            c =>
+            {
+                Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                Assert.Equal(" ", result.Value.Content.GetSubText(c.TextSpan).ToString());
+            },
+            c =>
+            {
+                Assert.Equal(ClassificationTypeNames.Operator, c.ClassificationType);
+                Assert.Equal("=", result.Value.Content.GetSubText(c.TextSpan).ToString());
+            },
+            c =>
+            {
+                Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                Assert.Equal(" ", result.Value.Content.GetSubText(c.TextSpan).ToString());
+            },
+            c =>
+            {
+                Assert.Equal(ClassificationTypeNames.VerbatimStringLiteral, c.ClassificationType);
+                Assert.Equal("""
+                    @"
+                            Razor shows 3 lines in a
+                            tooltip maximum, so this
+                            multi-line verbatim
+                    """, result.Value.Content.GetSubText(c.TextSpan).ToString());
+            });
+    }
+
+    [Fact]
+    public async Task TryGetExcerptInternalAsync_SingleLine_MultilineString()
+    {
+        // Arrange
+        var razorSource = """
+            <html>
+            @{
+                [|string|] bigString = @"
+                    This is a
+                    multi-line verbatim
+                    string.
+                    ";
+            }
+            </html>
+            """;
+
+        var (primary, secondary, secondarySpan) = await InitializeWithSnapshotAsync(razorSource);
+
+        var service = CreateExcerptService(primary);
+
+        // Act
+        var options = RazorClassificationOptionsWrapper.Default;
+        var result = await service.TryGetExcerptInternalAsync(secondary, secondarySpan, ExcerptModeInternal.SingleLine, options, DisposalToken);
+
+        // Assert
+        Assert.NotNull(result);
+        Assert.Equal(secondarySpan, result.Value.Span);
+        Assert.Same(secondary, result.Value.Document);
+
+        // Verifies that the right part of the primary document will be highlighted.
+        Assert.Equal(
+            (await secondary.GetTextAsync()).GetSubText(secondarySpan).ToString(),
+            result.Value.Content.GetSubText(result.Value.MappedSpan).ToString(),
+            ignoreLineEndingDifferences: true);
+
+        Assert.Equal("string bigString = @\"", result.Value.Content.ToString(), ignoreLineEndingDifferences: true);
+
+        Assert.Collection(
+            result.Value.ClassifiedSpans,
+            c =>
+            {
+                Assert.Equal(ClassificationTypeNames.Keyword, c.ClassificationType);
+                Assert.Equal("string", result.Value.Content.GetSubText(c.TextSpan).ToString());
+            },
+            c =>
+            {
+                Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                Assert.Equal(" ", result.Value.Content.GetSubText(c.TextSpan).ToString());
+            },
+            c =>
+            {
+                Assert.Equal(ClassificationTypeNames.LocalName, c.ClassificationType);
+                Assert.Equal("bigString", result.Value.Content.GetSubText(c.TextSpan).ToString());
+            },
+            c =>
+            {
+                Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                Assert.Equal(" ", result.Value.Content.GetSubText(c.TextSpan).ToString());
+            },
+            c =>
+            {
+                Assert.Equal(ClassificationTypeNames.Operator, c.ClassificationType);
+                Assert.Equal("=", result.Value.Content.GetSubText(c.TextSpan).ToString());
+            },
+            c =>
+            {
+                Assert.Equal(ClassificationTypeNames.Text, c.ClassificationType);
+                Assert.Equal(" ", result.Value.Content.GetSubText(c.TextSpan).ToString());
+            },
+            c =>
+            {
+                Assert.Equal(ClassificationTypeNames.VerbatimStringLiteral, c.ClassificationType);
+                Assert.Equal("@\"", result.Value.Content.GetSubText(c.TextSpan).ToString());
+            });
+    }
+
     [Fact]
     public async Task TryGetExcerptInternalAsync_MultiLine_CanClassifyCSharp()
     {
diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/RazorProjectSystemInProcess.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/RazorProjectSystemInProcess.cs
index 168c4c5c0fd..04f8659b0f8 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/RazorProjectSystemInProcess.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/RazorProjectSystemInProcess.cs
@@ -12,6 +12,7 @@
 using Microsoft.VisualStudio.Razor.LanguageClient;
 using Microsoft.AspNetCore.Razor.Threading;
 using System.Collections.Immutable;
+using System.Linq;
 
 namespace Microsoft.VisualStudio.Extensibility.Testing;
 
@@ -53,6 +54,29 @@ await Helper.RetryAsync(ct =>
         }, TimeSpan.FromMilliseconds(100), cancellationToken);
     }
 
+    public async Task WaitForComponentTagNameAsync(string projectName, string componentName, CancellationToken cancellationToken)
+    {
+        var projectFileName = await TestServices.SolutionExplorer.GetProjectFileNameAsync(projectName, cancellationToken);
+        var projectManager = await TestServices.Shell.GetComponentModelServiceAsync<IProjectSnapshotManager>(cancellationToken);
+        Assert.NotNull(projectManager);
+        await Helper.RetryAsync(async ct =>
+        {
+            var projectKeys = projectManager.GetAllProjectKeys(projectFileName);
+            if (projectKeys.Length == 0)
+            {
+                return false;
+            }
+
+            if (!projectManager.TryGetLoadedProject(projectKeys[0], out var project))
+            {
+                return false;
+            }
+
+            var tagHelpers = await project.GetTagHelpersAsync(cancellationToken);
+            return tagHelpers.Any(tagHelper => tagHelper.TagMatchingRules.Any(r => r.TagName.Equals(componentName, StringComparison.Ordinal)));
+        }, TimeSpan.FromMilliseconds(100), cancellationToken);
+    }
+
     public async Task WaitForRazorFileInProjectAsync(string projectFilePath, string filePath, CancellationToken cancellationToken)
     {
         var projectSnapshotManager = await TestServices.Shell.GetComponentModelServiceAsync<IProjectSnapshotManager>(cancellationToken);
diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/SolutionExplorerInProcess.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/SolutionExplorerInProcess.cs
index c08dad916eb..04e8d3e162d 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/SolutionExplorerInProcess.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/InProcess/SolutionExplorerInProcess.cs
@@ -155,24 +155,6 @@ public async Task AddFileAsync(string projectName, string fileName, string? cont
         }
     }
 
-    internal async Task WaitForComponentAsync(string projectName, string componentName, CancellationToken cancellationToken)
-    {
-        var project = await GetProjectAsync(projectName, cancellationToken);
-
-        var localPath = (string)project.Properties.Item("LocalPath").Value;
-        var style = "Debug";
-        var framework = "net6.0";
-
-        var razorJsonPath = Path.Combine(localPath, "obj", style, framework, "project.razor.vs.bin");
-
-        await Helper.RetryAsync(ct =>
-        {
-            var jsonContents = File.ReadAllText(razorJsonPath);
-
-            return Task.FromResult(jsonContents.Contains($"TypeNameIdentifier\":\"{componentName}\""));
-        }, TimeSpan.FromSeconds(1), cancellationToken);
-    }
-
     /// <returns>
     /// The summary line for the build, which generally looks something like this:
     ///
@@ -291,6 +273,13 @@ private static string ConvertLanguageName(string languageName)
     }
 
     public async Task<string> GetAbsolutePathForProjectRelativeFilePathAsync(string projectName, string relativeFilePath, CancellationToken cancellationToken)
+    {
+        var projectFileName = await GetProjectFileNameAsync(projectName, cancellationToken);
+        var projectPath = Path.GetDirectoryName(projectFileName);
+        return Path.Combine(projectPath, relativeFilePath);
+    }
+
+    public async Task<string> GetProjectFileNameAsync(string projectName, CancellationToken cancellationToken)
     {
         await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
 
@@ -306,8 +295,7 @@ public async Task<string> GetAbsolutePathForProjectRelativeFilePathAsync(string
         }
 
         Assert.NotNull(project);
-        var projectPath = Path.GetDirectoryName(project.FullName);
-        return Path.Combine(projectPath, relativeFilePath);
+        return project.FullName;
     }
 
     public async Task<string> GetDirectoryNameAsync(CancellationToken cancellationToken)
diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/RenameTests.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/RenameTests.cs
index 7dad7fb8f87..37e533b0cca 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/RenameTests.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/RenameTests.cs
@@ -1,7 +1,6 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
-using System.Threading;
 using System.Threading.Tasks;
 using Xunit;
 using Xunit.Abstractions;
@@ -10,7 +9,7 @@ namespace Microsoft.VisualStudio.Razor.IntegrationTests;
 
 public class RenameTests(ITestOutputHelper testOutputHelper) : AbstractRazorEditorTest(testOutputHelper)
 {
-    [ConditionalSkipIdeFact(Issue = "https://github.com/dotnet/razor/issues/8121")]
+    [IdeFact]
     public async Task Rename_ComponentAttribute_FromRazor()
     {
         // Open the file
@@ -36,7 +35,7 @@ public async Task Rename_ComponentAttribute_FromRazor()
         await TestServices.Editor.VerifyTextContainsAsync("<SurveyPrompt ZooperDooper=", ControlledHangMitigatingCancellationToken);
     }
 
-    [ConditionalSkipIdeFact(Issue = "https://github.com/dotnet/razor/issues/8121")]
+    [IdeFact]
     public async Task Rename_ComponentAttribute_FromCSharpInRazor()
     {
         // Open the file
@@ -61,7 +60,7 @@ public async Task Rename_ComponentAttribute_FromCSharpInRazor()
         await TestServices.Editor.VerifyTextContainsAsync("@ZooperDooper", ControlledHangMitigatingCancellationToken);
     }
 
-    [ConditionalSkipIdeFact(Issue = "https://github.com/dotnet/razor/issues/8121")]
+    [IdeFact]
     public async Task Rename_ComponentAttribute_FromCSharpInCSharp()
     {
         // Create the file
@@ -90,7 +89,7 @@ public partial class MyComponent
                 """,
             open: true,
             cancellationToken: ControlledHangMitigatingCancellationToken);
-        await WaitForComponentInitializeAsync(RazorProjectConstants.BlazorProjectName, "MyComponent", ControlledHangMitigatingCancellationToken);
+        await TestServices.RazorProjectSystem.WaitForComponentTagNameAsync(RazorProjectConstants.BlazorProjectName, "MyComponent", ControlledHangMitigatingCancellationToken);
         await TestServices.Editor.CloseCodeFileAsync(RazorProjectConstants.BlazorProjectName, MyComponentCSharpPath, saveFile: true, ControlledHangMitigatingCancellationToken);
 
         await TestServices.SolutionExplorer.AddFileAsync(RazorProjectConstants.BlazorProjectName,
@@ -107,6 +106,10 @@ await TestServices.SolutionExplorer.AddFileAsync(RazorProjectConstants.BlazorPro
 
         await TestServices.Editor.PlaceCaretAsync("MyProperty", charsOffset: 0, occurrence: 2, extendSelection: false, selectBlock: false, ControlledHangMitigatingCancellationToken);
 
+        await TestServices.RazorProjectSystem.WaitForComponentTagNameAsync(RazorProjectConstants.BlazorProjectName, "MyPage", ControlledHangMitigatingCancellationToken);
+
+        await Task.Delay(500);
+
         // Act
         await TestServices.Editor.InvokeRenameAsync(ControlledHangMitigatingCancellationToken);
         TestServices.Input.Send("ZooperDooper{ENTER}");
@@ -116,14 +119,14 @@ await TestServices.SolutionExplorer.AddFileAsync(RazorProjectConstants.BlazorPro
         await TestServices.Editor.WaitForActiveWindowByFileAsync("MyComponent.razor.cs", ControlledHangMitigatingCancellationToken);
         await TestServices.Editor.VerifyTextContainsAsync("public string? ZooperDooper { get; set; }", ControlledHangMitigatingCancellationToken);
 
-        await TestServices.SolutionExplorer.OpenFileAsync(RazorProjectConstants.BlazorProjectName, "MyPage.razor", ControlledHangMitigatingCancellationToken);
-        await TestServices.Editor.VerifyTextContainsAsync("<MyComponent ZooperDooper=", ControlledHangMitigatingCancellationToken);
-
         await TestServices.SolutionExplorer.OpenFileAsync(RazorProjectConstants.BlazorProjectName, "MyComponent.razor", ControlledHangMitigatingCancellationToken);
         await TestServices.Editor.VerifyTextContainsAsync("@ZooperDooper", ControlledHangMitigatingCancellationToken);
+
+        await TestServices.SolutionExplorer.OpenFileAsync(RazorProjectConstants.BlazorProjectName, "MyPage.razor", ControlledHangMitigatingCancellationToken);
+        await TestServices.Editor.VerifyTextContainsAsync("<MyComponent ZooperDooper=", ControlledHangMitigatingCancellationToken);
     }
 
-    [ConditionalSkipIdeFact(Issue = "https://github.com/dotnet/razor/issues/8121")]
+    [IdeFact]
     public async Task Rename_ComponentAttribute_BoundAttribute()
     {
         // Create the files
@@ -145,7 +148,7 @@ await TestServices.SolutionExplorer.AddFileAsync(RazorProjectConstants.BlazorPro
             open: true,
             cancellationToken: ControlledHangMitigatingCancellationToken);
 
-        await WaitForComponentInitializeAsync(RazorProjectConstants.BlazorProjectName, "MyComponent", ControlledHangMitigatingCancellationToken);
+        await TestServices.RazorProjectSystem.WaitForComponentTagNameAsync(RazorProjectConstants.BlazorProjectName, "MyComponent", ControlledHangMitigatingCancellationToken);
         await TestServices.Editor.CloseCodeFileAsync(RazorProjectConstants.BlazorProjectName, MyComponentPath, saveFile: true, ControlledHangMitigatingCancellationToken);
 
         await TestServices.SolutionExplorer.AddFileAsync(RazorProjectConstants.BlazorProjectName,
@@ -165,6 +168,8 @@ await TestServices.SolutionExplorer.AddFileAsync(RazorProjectConstants.BlazorPro
 
         await TestServices.Editor.PlaceCaretAsync("Value=", charsOffset: -1, ControlledHangMitigatingCancellationToken);
 
+        await Task.Delay(500);
+
         // Act
         await TestServices.Editor.InvokeRenameAsync(ControlledHangMitigatingCancellationToken);
         TestServices.Input.Send("ZooperDooper{ENTER}");
@@ -177,10 +182,4 @@ await TestServices.SolutionExplorer.AddFileAsync(RazorProjectConstants.BlazorPro
         await TestServices.SolutionExplorer.OpenFileAsync(RazorProjectConstants.BlazorProjectName, "MyPage.razor", ControlledHangMitigatingCancellationToken);
         await TestServices.Editor.VerifyTextContainsAsync("<MyComponent @bind-ZooperDooper=\"value\"></MyComponent>", ControlledHangMitigatingCancellationToken);
     }
-
-    private async Task WaitForComponentInitializeAsync(string projectName, string componentName, CancellationToken cancellationToken)
-    {
-        // Wait for it to initialize by building
-        await TestServices.SolutionExplorer.WaitForComponentAsync(projectName, componentName, cancellationToken);
-    }
 }