Rationalize how ProjectSnapshotManager is updated

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorLanguageServerBenchmarkBase.cs

@@ -63,14 +63,14 @@ internal async Task<IDocumentSnapshot> GetDocumentSnapshotAsync(string projectFi
 
         var projectManager = CreateProjectSnapshotManager();
 
-        await Dispatcher.RunAsync(
-            () =>
+        await projectManager.UpdateAsync(
+            updater =>
             {
-                projectManager.ProjectAdded(hostProject);
+                updater.ProjectAdded(hostProject);
                 var tagHelpers = CommonResources.LegacyTagHelpers;
                 var projectWorkspaceState = ProjectWorkspaceState.Create(tagHelpers, CodeAnalysis.CSharp.LanguageVersion.CSharp11);
-                projectManager.ProjectWorkspaceStateChanged(hostProject.Key, projectWorkspaceState);
-                projectManager.DocumentAdded(hostProject.Key, hostDocument, textLoader);
+                updater.ProjectWorkspaceStateChanged(hostProject.Key, projectWorkspaceState);
+                updater.DocumentAdded(hostProject.Key, hostDocument, textLoader);
             },
             CancellationToken.None);
 

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/ProjectSystem/BackgroundCodeGenerationBenchmark.cs

@@ -18,8 +18,8 @@ public async Task SetupAsync()
     {
         ProjectManager = CreateProjectSnapshotManager();
 
-        await Dispatcher.RunAsync(
-            () => ProjectManager.ProjectAdded(HostProject),
+        await ProjectManager.UpdateAsync(
+            updater => updater.ProjectAdded(HostProject),
             CancellationToken.None);
 
         ProjectManager.Changed += SnapshotManager_Changed;
@@ -40,12 +40,12 @@ public void Cleanup()
     [Benchmark(Description = "Generates the code for 100 files", OperationsPerInvoke = 100)]
     public async Task BackgroundCodeGeneration_Generate100FilesAsync()
     {
-        await Dispatcher.RunAsync(
-            () =>
+        await ProjectManager.UpdateAsync(
+            updater =>
             {
                 for (var i = 0; i < Documents.Length; i++)
                 {
-                    ProjectManager.DocumentAdded(HostProject.Key, Documents[i], TextLoaders[i % 4]);
+                    updater.DocumentAdded(HostProject.Key, Documents[i], TextLoaders[i % 4]);
                 }
             },
             CancellationToken.None);

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/ProjectSystem/ProjectLoadBenchmark.cs

@@ -23,14 +23,14 @@ public void Setup()
     [Benchmark(Description = "Initializes a project and 100 files", OperationsPerInvoke = 100)]
     public async Task ProjectLoad_AddProjectAnd100Files()
     {
-        await Dispatcher.RunAsync(
-            () =>
+        await ProjectManager.UpdateAsync(
+            updater =>
             {
-                ProjectManager.ProjectAdded(HostProject);
+                updater.ProjectAdded(HostProject);
 
                 for (var i = 0; i < Documents.Length; i++)
                 {
-                    ProjectManager.DocumentAdded(HostProject.Key, Documents[i], TextLoaders[i % 4]);
+                    updater.DocumentAdded(HostProject.Key, Documents[i], TextLoaders[i % 4]);
                 }
             },
             CancellationToken.None);

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/ProjectSystem/ProjectMutationBenchmark.cs

@@ -31,10 +31,9 @@ public void Setup()
     [Benchmark(Description = "Does thread contention add/remove of documents", OperationsPerInvoke = 100)]
     public async Task ProjectMutation_Mutates100kFilesAsync()
     {
-        await Dispatcher.RunAsync(() =>
-        {
-            ProjectManager.ProjectAdded(HostProject);
-        }, CancellationToken.None);
+        await ProjectManager.UpdateAsync(
+            updater => updater.ProjectAdded(HostProject),
+            CancellationToken.None);
 
         var cancellationSource = new CancellationTokenSource();
         var done = false;
@@ -45,9 +44,9 @@ await Dispatcher.RunAsync(() =>
             for (var i = 0; i < Documents.Length; i++)
             {
                 var document = Documents[i];
-                await Dispatcher.RunAsync(() => ProjectManager.DocumentAdded(HostProject.Key, document, TextLoaders[i % 4]), CancellationToken.None).ConfigureAwait(false);
+                await ProjectManager.UpdateAsync(updater => updater.DocumentAdded(HostProject.Key, document, TextLoaders[i % 4]), CancellationToken.None).ConfigureAwait(false);
                 Thread.Sleep(0);
-                await Dispatcher.RunAsync(() => ProjectManager.DocumentRemoved(HostProject.Key, document), CancellationToken.None).ConfigureAwait(false);
+                await ProjectManager.UpdateAsync(updater => updater.DocumentRemoved(HostProject.Key, document), CancellationToken.None).ConfigureAwait(false);
                 Thread.Sleep(0);
             }
 

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Extensions/IServiceCollectionExtensions.cs

@@ -242,8 +242,7 @@ public static void AddDocumentManagementServices(this IServiceCollection service
 
         // Add project snapshot manager
         services.AddSingleton<IProjectEngineFactoryProvider, LspProjectEngineFactoryProvider>();
-        services.AddSingleton<ProjectSnapshotManagerBase, ProjectSnapshotManager>();
-        services.AddSingleton<IProjectSnapshotManager>(services => services.GetRequiredService<ProjectSnapshotManagerBase>());
+        services.AddSingleton<IProjectSnapshotManager, ProjectSnapshotManager>();
     }
 
     public static void AddHandlerWithCapabilities<T>(this IServiceCollection services)

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/GeneratedDocumentPublisher.cs

@@ -21,20 +21,19 @@ internal sealed class GeneratedDocumentPublisher : IGeneratedDocumentPublisher,
 {
     private readonly Dictionary<DocumentKey, PublishData> _publishedCSharpData;
     private readonly Dictionary<string, PublishData> _publishedHtmlData;
-    private readonly ProjectSnapshotManagerBase _projectManager;
+    private readonly IProjectSnapshotManager _projectManager;
     private readonly ProjectSnapshotManagerDispatcher _dispatcher;
     private readonly IClientConnection _clientConnection;
     private readonly LanguageServerFeatureOptions _options;
     private readonly ILogger _logger;
 
     public GeneratedDocumentPublisher(
-        ProjectSnapshotManagerBase projectManager,
+        IProjectSnapshotManager projectManager,
         ProjectSnapshotManagerDispatcher dispatcher,
         IClientConnection clientConnection,
         LanguageServerFeatureOptions options,
         IRazorLoggerFactory loggerFactory)
     {
-
         _projectManager = projectManager;
         _dispatcher = dispatcher;
         _clientConnection = clientConnection;
@@ -183,8 +182,6 @@ private void ProjectManager_Changed(object? sender, ProjectChangeEventArgs args)
 
         _dispatcher.AssertRunningOnDispatcher();
 
-        Assumes.NotNull(_projectManager);
-
         switch (args.Kind)
         {
             case ProjectChangeKind.DocumentChanged:

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/OpenDocumentGenerator.cs

@@ -25,15 +25,15 @@ internal class OpenDocumentGenerator : IRazorStartupService, IDisposable
     // a document for each keystroke.
     private static readonly TimeSpan s_batchingTimeSpan = TimeSpan.FromMilliseconds(10);
 
-    private readonly ProjectSnapshotManagerBase _projectManager;
+    private readonly IProjectSnapshotManager _projectManager;
     private readonly ProjectSnapshotManagerDispatcher _dispatcher;
     private readonly LanguageServerFeatureOptions _options;
     private readonly IReadOnlyList<DocumentProcessedListener> _listeners;
     private readonly BatchingWorkQueue _workQueue;
 
     public OpenDocumentGenerator(
         IEnumerable<DocumentProcessedListener> listeners,
-        ProjectSnapshotManagerBase projectManager,
+        IProjectSnapshotManager projectManager,
         ProjectSnapshotManagerDispatcher dispatcher,
         LanguageServerFeatureOptions options,
         IErrorReporter errorReporter)

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/ProjectSystem/MonitorProjectConfigurationFilePathEndpoint.cs

@@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
 [RazorLanguageServerEndpoint(LanguageServerConstants.RazorMonitorProjectConfigurationFilePathEndpoint)]
 internal class MonitorProjectConfigurationFilePathEndpoint : IRazorNotificationHandler<MonitorProjectConfigurationFilePathParams>, IDisposable
 {
-    private readonly ProjectSnapshotManagerBase _projectManager;
+    private readonly IProjectSnapshotManager _projectManager;
     private readonly ProjectSnapshotManagerDispatcher _dispatcher;
     private readonly WorkspaceDirectoryPathResolver _workspaceDirectoryPathResolver;
     private readonly IEnumerable<IProjectConfigurationFileChangeListener> _listeners;
@@ -34,7 +34,7 @@ internal class MonitorProjectConfigurationFilePathEndpoint : IRazorNotificationH
     public bool MutatesSolutionState => false;
 
     public MonitorProjectConfigurationFilePathEndpoint(
-        ProjectSnapshotManagerBase projectManager,
+        IProjectSnapshotManager projectManager,
         ProjectSnapshotManagerDispatcher dispatcher,
         WorkspaceDirectoryPathResolver workspaceDirectoryPathResolver,
         IEnumerable<IProjectConfigurationFileChangeListener> listeners,
@@ -163,7 +163,7 @@ public async Task HandleNotificationAsync(MonitorProjectConfigurationFilePathPar
         }
     }
 
-    private async Task RemoveMonitorAsync(string projectKeyId, bool removeProject, CancellationToken cancellationToken)
+    private Task RemoveMonitorAsync(string projectKeyId, bool removeProject, CancellationToken cancellationToken)
     {
         // Should no longer monitor configuration output paths for the project
         if (_outputPathMonitors.TryRemove(projectKeyId, out var removedEntry))
@@ -178,11 +178,16 @@ private async Task RemoveMonitorAsync(string projectKeyId, bool removeProject, C
 
         if (removeProject)
         {
-            await _dispatcher.RunAsync(() =>
-            {
-                _projectManager.ProjectRemoved(ProjectKey.FromString(projectKeyId));
-            }, cancellationToken).ConfigureAwait(false);
+            return _projectManager.UpdateAsync(
+                (updater, projectKey) =>
+                {
+                    updater.ProjectRemoved(projectKey);
+                },
+                state: ProjectKey.FromString(projectKeyId),
+                cancellationToken);
         }
+
+        return Task.CompletedTask;
     }
 
     public void Dispose()