Make ProjectSnapshotManagerDispatcher an implementation detail and restrict access (#10291)

This is the final change to remove the ProjectSnapshotManagerDispatcher
virus that has spread throughout Razor.

Author: DustinCampbell

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

@@ -39,8 +39,6 @@ public class RazorSemanticTokensBenchmark : RazorLanguageServerBenchmarkBase
 
     private Range Range { get; set; }
 
-    private ProjectSnapshotManagerDispatcher ProjectSnapshotManagerDispatcher { get; set; }
-
     private string PagesDirectory { get; set; }
 
     private string ProjectFilePath { get; set; }
@@ -90,17 +88,11 @@ public async Task RazorSemanticTokensRangeAsync()
         var cancellationToken = CancellationToken.None;
         var documentVersion = 1;
 
-        await UpdateDocumentAsync(documentVersion, DocumentSnapshot, cancellationToken).ConfigureAwait(false);
+        VersionCache.TrackDocumentVersion(DocumentSnapshot, documentVersion);
 
         await RazorSemanticTokenService.GetSemanticTokensAsync(DocumentContext, Range.ToLinePositionSpan(), colorBackground: false, Guid.Empty, cancellationToken: cancellationToken).ConfigureAwait(false);
     }
 
-    private async Task UpdateDocumentAsync(int newVersion, IDocumentSnapshot documentSnapshot, CancellationToken cancellationToken)
-    {
-        await ProjectSnapshotManagerDispatcher.RunAsync(
-            () => VersionCache.TrackDocumentVersion(documentSnapshot, newVersion), cancellationToken).ConfigureAwait(false);
-    }
-
     [GlobalCleanup]
     public async Task CleanupServerAsync()
     {
@@ -121,7 +113,6 @@ private void EnsureServicesInitialized()
         var legend = new RazorSemanticTokensLegendService(capabilitiesService);
         RazorSemanticTokenService = languageServer.GetRequiredService<IRazorSemanticTokensInfoService>();
         VersionCache = languageServer.GetRequiredService<IDocumentVersionCache>();
-        ProjectSnapshotManagerDispatcher = languageServer.GetRequiredService<ProjectSnapshotManagerDispatcher>();
     }
 
     internal class TestRazorSemanticTokensInfoService : RazorSemanticTokensInfoService

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

@@ -42,8 +42,6 @@ public class RazorSemanticTokensRangeEndpointBenchmark : RazorLanguageServerBenc
 
     private Range Range { get; set; }
 
-    private ProjectSnapshotManagerDispatcher ProjectSnapshotManagerDispatcher { get; set; }
-
     private string PagesDirectory { get; set; }
 
     private string ProjectFilePath { get; set; }
@@ -90,8 +88,7 @@ public async Task InitializeRazorSemanticAsync()
         };
 
         var documentVersion = 1;
-        CancellationToken = CancellationToken.None;
-        await UpdateDocumentAsync(documentVersion, DocumentSnapshot, CancellationToken).ConfigureAwait(false);
+        VersionCache.TrackDocumentVersion(DocumentSnapshot, documentVersion);
 
         var languageServer = RazorLanguageServer.GetInnerLanguageServerForTesting();
         RequestContext = new RazorRequestContext(DocumentContext, languageServer.GetLspServices(), "lsp/method", uri: null);
@@ -124,14 +121,6 @@ public async Task RazorSemanticTokensRangeEndpointRangesAsync()
         await SemanticTokensRangeEndpoint.HandleRequestAsync(request, RequestContext, CancellationToken);
     }
 
-    private async Task UpdateDocumentAsync(int newVersion, IDocumentSnapshot documentSnapshot,
-        CancellationToken cancellationToken)
-    {
-        await ProjectSnapshotManagerDispatcher.RunAsync(
-                () => VersionCache.TrackDocumentVersion(documentSnapshot, newVersion), cancellationToken)
-            .ConfigureAwait(false);
-    }
-
     [GlobalCleanup]
     public async Task CleanupServerAsync()
     {
@@ -150,7 +139,6 @@ private void EnsureServicesInitialized()
         var languageServer = RazorLanguageServer.GetInnerLanguageServerForTesting();
         RazorSemanticTokenService = languageServer.GetRequiredService<IRazorSemanticTokensInfoService>();
         VersionCache = languageServer.GetRequiredService<IDocumentVersionCache>();
-        ProjectSnapshotManagerDispatcher = languageServer.GetRequiredService<ProjectSnapshotManagerDispatcher>();
     }
 
     internal class TestCustomizableRazorSemanticTokensInfoService : RazorSemanticTokensInfoService

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

@@ -33,8 +33,6 @@ public class RazorSemanticTokensScrollingBenchmark : RazorLanguageServerBenchmar
 
     private Range Range { get; set; }
 
-    private ProjectSnapshotManagerDispatcher ProjectSnapshotManagerDispatcher { get; set; }
-
     private string PagesDirectory { get; set; }
 
     private string ProjectFilePath { get; set; }
@@ -80,7 +78,7 @@ public async Task RazorSemanticTokensRangeScrollingAsync()
         var cancellationToken = CancellationToken.None;
         var documentVersion = 1;
 
-        await UpdateDocumentAsync(documentVersion, DocumentSnapshot).ConfigureAwait(false);
+        VersionCache!.TrackDocumentVersion(DocumentSnapshot, documentVersion);
 
         var documentLineCount = Range.End.Line;
 
@@ -100,12 +98,6 @@ public async Task RazorSemanticTokensRangeScrollingAsync()
         }
     }
 
-    private async Task UpdateDocumentAsync(int newVersion, IDocumentSnapshot documentSnapshot)
-    {
-        await ProjectSnapshotManagerDispatcher!.RunAsync(
-            () => VersionCache!.TrackDocumentVersion(documentSnapshot, newVersion), CancellationToken.None).ConfigureAwait(false);
-    }
-
     [GlobalCleanup]
     public async Task CleanupServerAsync()
     {
@@ -125,6 +117,5 @@ private void EnsureServicesInitialized()
         var languageServer = RazorLanguageServer.GetInnerLanguageServerForTesting();
         RazorSemanticTokenService = languageServer.GetRequiredService<IRazorSemanticTokensInfoService>();
         VersionCache = languageServer.GetRequiredService<IDocumentVersionCache>();
-        ProjectSnapshotManagerDispatcher = languageServer.GetRequiredService<ProjectSnapshotManagerDispatcher>();
     }
 }

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

@@ -53,7 +53,7 @@ await ProjectManager.UpdateAsync(
             cancellationSource.Cancel();
         });
 
-        _readThread = new Thread(async () =>
+        _readThread = new Thread(() =>
         {
             while (true)
             {
@@ -63,9 +63,9 @@ await ProjectManager.UpdateAsync(
                     return;
                 }
 
-                await Dispatcher.RunAsync(() => ProjectManager.GetProjects(), CancellationToken.None).ConfigureAwait(false);
+                _ = ProjectManager.GetProjects();
                 Thread.Sleep(0);
-                await Dispatcher.RunAsync(() => ProjectManager.GetOpenDocuments(), CancellationToken.None).ConfigureAwait(false);
+                _ = ProjectManager.GetOpenDocuments();
                 Thread.Sleep(0);
             }
         });

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

@@ -5,15 +5,11 @@
 using System.Collections.Immutable;
 using System.IO;
 using Microsoft.AspNetCore.Razor.Language;
-using Microsoft.AspNetCore.Razor.LanguageServer;
 using Microsoft.AspNetCore.Razor.Logging;
 using Microsoft.AspNetCore.Razor.PooledObjects;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Text;
-using Moq;
 
 namespace Microsoft.AspNetCore.Razor.Microbenchmarks;
 
@@ -23,7 +19,6 @@ public abstract partial class ProjectSnapshotManagerBenchmarkBase
     internal ImmutableArray<HostDocument> Documents { get; }
     internal ImmutableArray<TextLoader> TextLoaders { get; }
     protected string RepoRoot { get; }
-    private protected ProjectSnapshotManagerDispatcher Dispatcher { get; }
 
     protected ProjectSnapshotManagerBenchmarkBase(int documentCount = 100)
     {
@@ -61,19 +56,12 @@ protected ProjectSnapshotManagerBenchmarkBase(int documentCount = 100)
         }
 
         Documents = documents.ToImmutable();
-
-        var loggerFactoryMock = new Mock<ILoggerFactory>(MockBehavior.Strict);
-        loggerFactoryMock
-            .Setup(x => x.GetOrCreateLogger(It.IsAny<string>()))
-            .Returns(Mock.Of<ILogger>(MockBehavior.Strict));
-
-        Dispatcher = new LSPProjectSnapshotManagerDispatcher(EmptyLoggingFactory.Instance);
     }
 
     internal ProjectSnapshotManager CreateProjectSnapshotManager()
     {
         return new ProjectSnapshotManager(
             projectEngineFactoryProvider: StaticProjectEngineFactoryProvider.Instance,
-            dispatcher: Dispatcher);
+            loggerFactory: EmptyLoggingFactory.Instance);
     }
 }

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Hosting/RazorLanguageServerWrapper.cs

@@ -39,7 +39,6 @@ public static RazorLanguageServerWrapper Create(
         Stream output,
         ILoggerFactory loggerFactory,
         ITelemetryReporter telemetryReporter,
-        ProjectSnapshotManagerDispatcher? projectSnapshotManagerDispatcher = null,
         Action<IServiceCollection>? configure = null,
         LanguageServerFeatureOptions? featureOptions = null,
         RazorLSPOptions? razorLSPOptions = null,
@@ -58,7 +57,6 @@ public static RazorLanguageServerWrapper Create(
             jsonRpc,
             jsonSerializer,
             loggerFactory,
-            projectSnapshotManagerDispatcher,
             featureOptions,
             configure,
             razorLSPOptions,

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

@@ -40,7 +40,6 @@ internal partial class RazorLanguageServer : AbstractLanguageServer<RazorRequest
     private readonly JsonRpc _jsonRpc;
     private readonly ILoggerFactory _loggerFactory;
     private readonly LanguageServerFeatureOptions? _featureOptions;
-    private readonly ProjectSnapshotManagerDispatcher? _projectSnapshotManagerDispatcher;
     private readonly Action<IServiceCollection>? _configureServer;
     private readonly RazorLSPOptions _lspOptions;
     private readonly ILspServerActivationTracker? _lspServerActivationTracker;
@@ -54,7 +53,6 @@ public RazorLanguageServer(
         JsonRpc jsonRpc,
         JsonSerializer serializer,
         ILoggerFactory loggerFactory,
-        ProjectSnapshotManagerDispatcher? projectSnapshotManagerDispatcher,
         LanguageServerFeatureOptions? featureOptions,
         Action<IServiceCollection>? configureServer,
         RazorLSPOptions? lspOptions,
@@ -65,7 +63,6 @@ public RazorLanguageServer(
         _jsonRpc = jsonRpc;
         _loggerFactory = loggerFactory;
         _featureOptions = featureOptions;
-        _projectSnapshotManagerDispatcher = projectSnapshotManagerDispatcher;
         _configureServer = configureServer;
         _lspOptions = lspOptions ?? RazorLSPOptions.Default;
         _lspServerActivationTracker = lspServerActivationTracker;
@@ -108,15 +105,6 @@ protected override ILspServices ConstructLspServices()
         // Add the logger as a service in case anything in CLaSP pulls it out to do logging
         services.AddSingleton<ILspLogger>(_logger);
 
-        if (_projectSnapshotManagerDispatcher is null)
-        {
-            services.AddSingleton<ProjectSnapshotManagerDispatcher, LSPProjectSnapshotManagerDispatcher>();
-        }
-        else
-        {
-            services.AddSingleton<ProjectSnapshotManagerDispatcher>(_projectSnapshotManagerDispatcher);
-        }
-
         services.AddSingleton<IAdhocWorkspaceFactory, AdhocWorkspaceFactory>();
         services.AddSingleton<IWorkspaceProvider, LspWorkspaceProvider>();