Stop using dispatcher to notify IDocumentProcessedListeners

Author: DustinCampbell

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

@@ -6,7 +6,6 @@
 using System.Collections.Immutable;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Razor.Utilities;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
@@ -29,7 +28,6 @@ internal partial class OpenDocumentGenerator : IRazorStartupService, IDisposable
 
     private readonly ImmutableArray<IDocumentProcessedListener> _listeners;
     private readonly IProjectSnapshotManager _projectManager;
-    private readonly ProjectSnapshotManagerDispatcher _dispatcher;
     private readonly LanguageServerFeatureOptions _options;
 
     private readonly AsyncBatchingWorkQueue<IDocumentSnapshot> _workQueue;
@@ -38,12 +36,10 @@ internal partial class OpenDocumentGenerator : IRazorStartupService, IDisposable
     public OpenDocumentGenerator(
         IEnumerable<IDocumentProcessedListener> listeners,
         IProjectSnapshotManager projectManager,
-        ProjectSnapshotManagerDispatcher dispatcher,
         LanguageServerFeatureOptions options)
     {
         _listeners = listeners.ToImmutableArray();
         _projectManager = projectManager;
-        _dispatcher = dispatcher;
         _options = options;
 
         _disposeTokenSource = new();
@@ -72,25 +68,15 @@ private async ValueTask ProcessBatchAsync(ImmutableArray<IDocumentSnapshot> item
 
             var codeDocument = await document.GetGeneratedOutputAsync().ConfigureAwait(false);
 
-            await _dispatcher
-                .RunAsync(
-                    static state =>
-                    {
-                        var (codeDocument, document, listeners, token) = state;
-
-                        foreach (var listener in listeners)
-                        {
-                            if (token.IsCancellationRequested)
-                            {
-                                return;
-                            }
+            foreach (var listener in _listeners)
+            {
+                if (token.IsCancellationRequested)
+                {
+                    return;
+                }
 
-                            listener.DocumentProcessed(codeDocument, document);
-                        }
-                    },
-                    state: (codeDocument, document, _listeners, token),
-                    token)
-                .ConfigureAwait(false);
+                listener.DocumentProcessed(codeDocument, document);
+            }
         }
     }
 

src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/CodeDocumentReferenceHolderTest.cs

@@ -180,10 +180,7 @@ private async Task<WeakReference<RazorCodeDocument>> ProcessDocumentAndRetrieveO
     {
         var codeDocument = await documentSnapshot.GetGeneratedOutputAsync();
 
-        await RunOnDispatcherAsync(() =>
-        {
-            _referenceHolder.DocumentProcessed(codeDocument, documentSnapshot);
-        });
+        _referenceHolder.DocumentProcessed(codeDocument, documentSnapshot);
 
         return new(codeDocument);
     }

src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/OpenDocumentGeneratorTest.cs

@@ -9,7 +9,6 @@
 using Microsoft.AspNetCore.Razor.Test.Common.LanguageServer;
 using Microsoft.AspNetCore.Razor.Test.Common.Workspaces;
 using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.Razor;
 using Microsoft.CodeAnalysis.Razor.ProjectSystem;
 using Microsoft.CodeAnalysis.Text;
 using Xunit;
@@ -34,7 +33,7 @@ public async Task DocumentAdded_IgnoresClosedDocument()
         // Arrange
         var projectManager = CreateProjectSnapshotManager();
         var listener = new TestDocumentProcessedListener();
-        using var generator = new TestOpenDocumentGenerator(projectManager, Dispatcher, listener);
+        using var generator = new TestOpenDocumentGenerator(projectManager, listener);
 
         await projectManager.UpdateAsync(updater =>
         {
@@ -55,7 +54,7 @@ public async Task DocumentChanged_IgnoresClosedDocument()
         // Arrange
         var projectManager = CreateProjectSnapshotManager();
         var listener = new TestDocumentProcessedListener();
-        using var generator = new TestOpenDocumentGenerator(projectManager, Dispatcher, listener);
+        using var generator = new TestOpenDocumentGenerator(projectManager, listener);
 
         await projectManager.UpdateAsync(updater =>
         {
@@ -77,7 +76,7 @@ public async Task DocumentChanged_ProcessesOpenDocument()
         // Arrange
         var projectManager = CreateProjectSnapshotManager();
         var listener = new TestDocumentProcessedListener();
-        using var generator = new TestOpenDocumentGenerator(projectManager, Dispatcher, listener);
+        using var generator = new TestOpenDocumentGenerator(projectManager, listener);
 
         await projectManager.UpdateAsync(updater =>
         {
@@ -102,7 +101,7 @@ public async Task ProjectChanged_IgnoresClosedDocument()
         // Arrange
         var projectManager = CreateProjectSnapshotManager();
         var listener = new TestDocumentProcessedListener();
-        using var generator = new TestOpenDocumentGenerator(projectManager, Dispatcher, listener);
+        using var generator = new TestOpenDocumentGenerator(projectManager, listener);
 
         await projectManager.UpdateAsync(updater =>
         {
@@ -125,7 +124,7 @@ public async Task ProjectChanged_ProcessesOpenDocument()
         // Arrange
         var projectManager = CreateProjectSnapshotManager();
         var listener = new TestDocumentProcessedListener();
-        using var generator = new TestOpenDocumentGenerator(projectManager, Dispatcher, listener);
+        using var generator = new TestOpenDocumentGenerator(projectManager, listener);
 
         await projectManager.UpdateAsync(updater =>
         {
@@ -146,9 +145,8 @@ await projectManager.UpdateAsync(updater =>
 
     private class TestOpenDocumentGenerator(
         IProjectSnapshotManager projectManager,
-        ProjectSnapshotManagerDispatcher dispatcher,
         params IDocumentProcessedListener[] listeners)
-        : OpenDocumentGenerator(listeners, projectManager, dispatcher, TestLanguageServerFeatureOptions.Instance);
+        : OpenDocumentGenerator(listeners, projectManager, TestLanguageServerFeatureOptions.Instance);
 
     private class TestDocumentProcessedListener : IDocumentProcessedListener
     {