Remove some uses of the dispatcher

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

@@ -15,64 +15,37 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer;
 
 internal class DefaultDocumentContextFactory : DocumentContextFactory
 {
-    private readonly ProjectSnapshotManagerDispatcher _projectSnapshotManagerDispatcher;
     private readonly ISnapshotResolver _snapshotResolver;
     private readonly DocumentVersionCache _documentVersionCache;
     private readonly ILogger<DefaultDocumentContextFactory> _logger;
 
     public DefaultDocumentContextFactory(
-        ProjectSnapshotManagerDispatcher projectSnapshotManagerDispatcher,
         ISnapshotResolver snapshotResolver,
         DocumentVersionCache documentVersionCache,
         ILoggerFactory loggerFactory)
     {
-        _projectSnapshotManagerDispatcher = projectSnapshotManagerDispatcher;
         _snapshotResolver = snapshotResolver;
         _documentVersionCache = documentVersionCache;
         _logger = loggerFactory.CreateLogger<DefaultDocumentContextFactory>();
     }
 
-    protected override async Task<DocumentContext?> TryCreateCoreAsync(Uri documentUri, VSProjectContext? projectContext, bool versioned, CancellationToken cancellationToken)
+    protected override Task<DocumentContext?> TryCreateCoreAsync(Uri documentUri, VSProjectContext? projectContext, bool versioned, CancellationToken cancellationToken)
     {
         var filePath = documentUri.GetAbsoluteOrUNCPath();
 
-        var documentAndVersion = await _projectSnapshotManagerDispatcher.RunOnDispatcherThreadAsync(() =>
-        {
-            // TODO: Use project context to resolve the document.
-            if (_snapshotResolver.TryResolveDocument(filePath,  out var documentSnapshot))
-            {
-                if (!versioned)
-                {
-                    return new DocumentSnapshotAndVersion(documentSnapshot, Version: null);
-                }
-
-                if (_documentVersionCache.TryGetDocumentVersion(documentSnapshot, out var version))
-                {
-                    return new DocumentSnapshotAndVersion(documentSnapshot, version.Value);
-                }
-            }
-
-            // This is super rare, if we get here it could mean many things. Some of which:
-            //     1. Stale request:
-            //          - Got queued after a "document closed" / "document removed" type action
-            //          - Took too long to run and by the time the request needed the document context the
-            //            version cache has evicted the entry
-            //     2. Client is misbehaving and sending requests for a document that we've never seen before.
-            _logger.LogWarning("Tried to create context for document {documentUri} which was not found.", documentUri);
-            return null;
-        }, cancellationToken).ConfigureAwait(false);
+        var documentAndVersion = TryGetDocumentAndVersion(filePath, versioned);
 
         if (documentAndVersion is null)
         {
             // Stale request or misbehaving client, see above comment.
-            return null;
+            return Task.FromResult<DocumentContext?>(null);
         }
 
         var (documentSnapshot, version) = documentAndVersion;
         if (documentSnapshot is null)
         {
             Debug.Fail($"Document snapshot should never be null here for '{filePath}'. This indicates that our acquisition of documents / versions did not behave as expected.");
-            return null;
+            return Task.FromResult<DocumentContext?>(null);
         }
 
         cancellationToken.ThrowIfCancellationRequested();
@@ -82,13 +55,41 @@ public DefaultDocumentContextFactory(
             // If we were asked for a versioned document, but have no version info, then we didn't find the document
             if (version is null)
             {
-                return null;
+                return Task.FromResult<DocumentContext?>(null);
             }
 
-            return new VersionedDocumentContext(documentUri, documentSnapshot, projectContext, version.Value);
+            return Task.FromResult<DocumentContext?>(
+                new VersionedDocumentContext(documentUri, documentSnapshot, projectContext, version.Value));
+        }
+
+        return Task.FromResult<DocumentContext?>(
+            new DocumentContext(documentUri, documentSnapshot, projectContext));
+    }
+
+    private DocumentSnapshotAndVersion? TryGetDocumentAndVersion(string filePath, bool versioned)
+    {
+        // TODO: Use project context to resolve the document.
+        if (_snapshotResolver.TryResolveDocument(filePath, out var documentSnapshot))
+        {
+            if (!versioned)
+            {
+                return new DocumentSnapshotAndVersion(documentSnapshot, Version: null);
+            }
+
+            if (_documentVersionCache.TryGetDocumentVersion(documentSnapshot, out var version))
+            {
+                return new DocumentSnapshotAndVersion(documentSnapshot, version.Value);
+            }
         }
 
-        return new DocumentContext(documentUri, documentSnapshot, projectContext);
+        // This is super rare, if we get here it could mean many things. Some of which:
+        //     1. Stale request:
+        //          - Got queued after a "document closed" / "document removed" type action
+        //          - Took too long to run and by the time the request needed the document context the
+        //            version cache has evicted the entry
+        //     2. Client is misbehaving and sending requests for a document that we've never seen before.
+        _logger.LogWarning("Tried to create context for document {filePath} which was not found.", filePath);
+        return null;
     }
 
     private record DocumentSnapshotAndVersion(IDocumentSnapshot Snapshot, int? Version);

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

@@ -16,12 +16,10 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer;
 
 internal class DefaultRazorComponentSearchEngine : RazorComponentSearchEngine
 {
-    private readonly ProjectSnapshotManagerDispatcher _projectSnapshotManagerDispatcher;
     private readonly ProjectSnapshotManager _projectSnapshotManager;
     private readonly ILogger<DefaultRazorComponentSearchEngine> _logger;
 
     public DefaultRazorComponentSearchEngine(
-        ProjectSnapshotManagerDispatcher projectSnapshotManagerDispatcher,
         ProjectSnapshotManagerAccessor projectSnapshotManagerAccessor,
         ILoggerFactory loggerFactory)
     {
@@ -30,7 +28,6 @@ public DefaultRazorComponentSearchEngine(
             throw new ArgumentNullException(nameof(loggerFactory));
         }
 
-        _projectSnapshotManagerDispatcher = projectSnapshotManagerDispatcher ?? throw new ArgumentNullException(nameof(projectSnapshotManagerDispatcher));
         _projectSnapshotManager = projectSnapshotManagerAccessor?.Instance ?? throw new ArgumentNullException(nameof(projectSnapshotManagerAccessor));
         _logger = loggerFactory.CreateLogger<DefaultRazorComponentSearchEngine>();
     }
@@ -49,9 +46,7 @@ public DefaultRazorComponentSearchEngine(
             return null;
         }
 
-        var projects = await _projectSnapshotManagerDispatcher.RunOnDispatcherThreadAsync(
-             () => _projectSnapshotManager.GetProjects().ToArray(),
-             cancellationToken).ConfigureAwait(false);
+        var projects = _projectSnapshotManager.GetProjects();
 
         foreach (var project in projects)
         {
@@ -110,9 +105,7 @@ public DefaultRazorComponentSearchEngine(
 
         var lookupSymbolName = RemoveGenericContent(typeName.AsMemory());
 
-        var projects = await _projectSnapshotManagerDispatcher.RunOnDispatcherThreadAsync(
-            () => _projectSnapshotManager.GetProjects(),
-            CancellationToken.None).ConfigureAwait(false);
+        var projects = _projectSnapshotManager.GetProjects();
 
         foreach (var project in projects)
         {

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

@@ -32,7 +32,7 @@ public async Task TryCreateAsync_CanNotResolveDocument_ReturnsNull()
     {
         // Arrange
         var uri = new Uri("C:/path/to/file.cshtml");
-        var factory = new DefaultDocumentContextFactory(Dispatcher, new TestDocumentResolver(), _documentVersionCache, LoggerFactory);
+        var factory = new DefaultDocumentContextFactory(new TestDocumentResolver(), _documentVersionCache, LoggerFactory);
 
         // Act
         var documentContext = await factory.TryCreateAsync(uri, DisposalToken);
@@ -46,7 +46,7 @@ public async Task TryCreateForOpenDocumentAsync_CanNotResolveDocument_ReturnsNul
     {
         // Arrange
         var uri = new Uri("C:/path/to/file.cshtml");
-        var factory = new DefaultDocumentContextFactory(Dispatcher, new TestDocumentResolver(), _documentVersionCache, LoggerFactory);
+        var factory = new DefaultDocumentContextFactory(new TestDocumentResolver(), _documentVersionCache, LoggerFactory);
 
         // Act
         var documentContext = await factory.TryCreateForOpenDocumentAsync(uri, DisposalToken);
@@ -62,7 +62,7 @@ public async Task TryCreateForOpenDocumentAsync_CanNotResolveVersion_ReturnsNull
         var uri = new Uri("C:/path/to/file.cshtml");
         var documentSnapshot = TestDocumentSnapshot.Create(uri.GetAbsoluteOrUNCPath());
         var documentResolver = new TestDocumentResolver(documentSnapshot);
-        var factory = new DefaultDocumentContextFactory(Dispatcher, documentResolver, _documentVersionCache, LoggerFactory);
+        var factory = new DefaultDocumentContextFactory(documentResolver, _documentVersionCache, LoggerFactory);
 
         // Act
         var documentContext = await factory.TryCreateForOpenDocumentAsync(uri, DisposalToken);
@@ -80,7 +80,7 @@ public async Task TryCreateAsync_ResolvesContent()
         var codeDocument = RazorCodeDocument.Create(RazorSourceDocument.Create(string.Empty, documentSnapshot.FilePath));
         documentSnapshot.With(codeDocument);
         var documentResolver = new TestDocumentResolver(documentSnapshot);
-        var factory = new DefaultDocumentContextFactory(Dispatcher, documentResolver, _documentVersionCache, LoggerFactory);
+        var factory = new DefaultDocumentContextFactory(documentResolver, _documentVersionCache, LoggerFactory);
 
         // Act
         var documentContext = await factory.TryCreateAsync(uri, DisposalToken);
@@ -101,7 +101,7 @@ public async Task TryCreateForOpenDocumentAsync_ResolvesContent()
         documentSnapshot.With(codeDocument);
         var documentResolver = new TestDocumentResolver(documentSnapshot);
         await Dispatcher.RunOnDispatcherThreadAsync(() => _documentVersionCache.TrackDocumentVersion(documentSnapshot, version: 1337), DisposalToken);
-        var factory = new DefaultDocumentContextFactory(Dispatcher, documentResolver, _documentVersionCache, LoggerFactory);
+        var factory = new DefaultDocumentContextFactory(documentResolver, _documentVersionCache, LoggerFactory);
 
         // Act
         var documentContext = await factory.TryCreateForOpenDocumentAsync(uri, DisposalToken);

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

@@ -35,7 +35,7 @@ public async Task Handle_SearchFound_GenericComponent()
         // Arrange
         var tagHelperDescriptor1 = CreateRazorComponentTagHelperDescriptor("First", "First.Components", "Component1", typeName: "Component1<TItem>");
         var tagHelperDescriptor2 = CreateRazorComponentTagHelperDescriptor("Second", "Second.Components", "Component3", typeName: "Component3<TItem>");
-        var searchEngine = new DefaultRazorComponentSearchEngine(Dispatcher, s_projectSnapshotManager, LoggerFactory);
+        var searchEngine = new DefaultRazorComponentSearchEngine(s_projectSnapshotManager, LoggerFactory);
 
         // Act
         var documentSnapshot1 = await searchEngine.TryLocateComponentAsync(tagHelperDescriptor1);
@@ -52,7 +52,7 @@ public async Task Handle_SearchFound()
         // Arrange
         var tagHelperDescriptor1 = CreateRazorComponentTagHelperDescriptor("First", "First.Components", "Component1");
         var tagHelperDescriptor2 = CreateRazorComponentTagHelperDescriptor("Second", "Second.Components", "Component3");
-        var searchEngine = new DefaultRazorComponentSearchEngine(Dispatcher, s_projectSnapshotManager, LoggerFactory);
+        var searchEngine = new DefaultRazorComponentSearchEngine(s_projectSnapshotManager, LoggerFactory);
 
         // Act
         var documentSnapshot1 = await searchEngine.TryLocateComponentAsync(tagHelperDescriptor1);
@@ -68,7 +68,7 @@ public async Task Handle_SearchFound_SetNamespace()
     {
         // Arrange
         var tagHelperDescriptor = CreateRazorComponentTagHelperDescriptor("First", "Test", "Component2");
-        var searchEngine = new DefaultRazorComponentSearchEngine(Dispatcher, s_projectSnapshotManager, LoggerFactory);
+        var searchEngine = new DefaultRazorComponentSearchEngine(s_projectSnapshotManager, LoggerFactory);
 
         // Act
         var documentSnapshot = await searchEngine.TryLocateComponentAsync(tagHelperDescriptor);
@@ -82,7 +82,7 @@ public async Task Handle_SearchMissing_IncorrectAssembly()
     {
         // Arrange
         var tagHelperDescriptor = CreateRazorComponentTagHelperDescriptor("Third", "First.Components", "Component3");
-        var searchEngine = new DefaultRazorComponentSearchEngine(Dispatcher, s_projectSnapshotManager, LoggerFactory);
+        var searchEngine = new DefaultRazorComponentSearchEngine(s_projectSnapshotManager, LoggerFactory);
 
         // Act
         var documentSnapshot = await searchEngine.TryLocateComponentAsync(tagHelperDescriptor);
@@ -96,7 +96,7 @@ public async Task Handle_SearchMissing_IncorrectNamespace()
     {
         // Arrange
         var tagHelperDescriptor = CreateRazorComponentTagHelperDescriptor("First", "First.Components", "Component2");
-        var searchEngine = new DefaultRazorComponentSearchEngine(Dispatcher, s_projectSnapshotManager, LoggerFactory);
+        var searchEngine = new DefaultRazorComponentSearchEngine(s_projectSnapshotManager, LoggerFactory);
 
         // Act
         var documentSnapshot = await searchEngine.TryLocateComponentAsync(tagHelperDescriptor);
@@ -110,7 +110,7 @@ public async Task Handle_SearchMissing_IncorrectComponent()
     {
         // Arrange
         var tagHelperDescriptor = CreateRazorComponentTagHelperDescriptor("First", "First.Components", "Component3");
-        var searchEngine = new DefaultRazorComponentSearchEngine(Dispatcher, s_projectSnapshotManager, LoggerFactory);
+        var searchEngine = new DefaultRazorComponentSearchEngine(s_projectSnapshotManager, LoggerFactory);
 
         // Act
         var documentSnapshot = await searchEngine.TryLocateComponentAsync(tagHelperDescriptor);
@@ -124,7 +124,7 @@ public async Task Handle_FilePathAndAssemblyNameDifferent()
     {
         // Arrange
         var tagHelperDescriptor = CreateRazorComponentTagHelperDescriptor("AssemblyName", "Test", "Component2");
-        var searchEngine = new DefaultRazorComponentSearchEngine(Dispatcher, s_projectSnapshotManager, LoggerFactory);
+        var searchEngine = new DefaultRazorComponentSearchEngine(s_projectSnapshotManager, LoggerFactory);
 
         // Act
         var documentSnapshot = await searchEngine.TryLocateComponentAsync(tagHelperDescriptor);

src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Definition/DefinitionEndpointDelegationTest.cs

@@ -211,7 +211,7 @@ private async Task VerifyCSharpGoToDefinitionAsync(string input, string? filePat
         var projectSnapshotManager = Mock.Of<ProjectSnapshotManagerBase>(p => p.GetProjects() == new[] { Mock.Of<IProjectSnapshot>(MockBehavior.Strict) }.ToImmutableArray(), MockBehavior.Strict);
         var projectSnapshotManagerAccessor = new TestProjectSnapshotManagerAccessor(projectSnapshotManager);
         var projectSnapshotManagerDispatcher = new LSPProjectSnapshotManagerDispatcher(LoggerFactory);
-        var searchEngine = new DefaultRazorComponentSearchEngine(Dispatcher, projectSnapshotManagerAccessor, LoggerFactory);
+        var searchEngine = new DefaultRazorComponentSearchEngine(projectSnapshotManagerAccessor, LoggerFactory);
 
         var razorUri = new Uri(razorFilePath);
         var documentContext = await DocumentContextFactory.TryCreateForOpenDocumentAsync(razorUri, DisposalToken);

src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Refactoring/RenameEndpointDelegationTest.cs

@@ -64,7 +64,7 @@ public async Task Handle_Rename_SingleServer_CSharpEditsAreMapped()
         var projectSnapshotManager = Mock.Of<ProjectSnapshotManagerBase>(p => p.GetProjects() == new[] { Mock.Of<IProjectSnapshot>(MockBehavior.Strict) }.ToImmutableArray(), MockBehavior.Strict);
         var projectSnapshotManagerAccessor = new TestProjectSnapshotManagerAccessor(projectSnapshotManager);
         using var projectSnapshotManagerDispatcher = new LSPProjectSnapshotManagerDispatcher(LoggerFactory);
-        var searchEngine = new DefaultRazorComponentSearchEngine(Dispatcher, projectSnapshotManagerAccessor, LoggerFactory);
+        var searchEngine = new DefaultRazorComponentSearchEngine(projectSnapshotManagerAccessor, LoggerFactory);
 
         var endpoint = new RenameEndpoint(
             projectSnapshotManagerDispatcher,

src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Refactoring/RenameEndpointTest.cs

@@ -699,7 +699,7 @@ private RenameEndpoint CreateEndpoint(LanguageServerFeatureOptions languageServe
 
         var projectSnapshotManagerDispatcher = new LSPProjectSnapshotManagerDispatcher(LoggerFactory);
 
-        var searchEngine = new DefaultRazorComponentSearchEngine(Dispatcher, projectSnapshotManagerAccessor, LoggerFactory);
+        var searchEngine = new DefaultRazorComponentSearchEngine(projectSnapshotManagerAccessor, LoggerFactory);
         languageServerFeatureOptions ??= Mock.Of<LanguageServerFeatureOptions>(
             options => options.SupportsFileManipulation == true && options.SingleServerSupport == false && options.ReturnCodeActionAndRenamePathsWithPrefixedSlash == false, MockBehavior.Strict);