Make ISnapshotResolver.ResolveDocumentInAnyProject synchronous

Author: DustinCampbell

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

@@ -92,9 +92,7 @@ internal sealed class DocumentContextFactory(
     {
         if (projectContext is null)
         {
-            return await _snapshotResolver
-                .ResolveDocumentInAnyProjectAsync(filePath, cancellationToken)
-                .ConfigureAwait(false);
+            return _snapshotResolver.ResolveDocumentInAnyProject(filePath);
         }
 
         if (_projectManager.TryGetLoadedProject(projectContext.ToProjectKey(), out var project) &&

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

@@ -23,5 +23,5 @@ internal interface ISnapshotResolver
     /// Finds a <see cref="IDocumentSnapshot"/> for the given document path that is contained within any project, and returns the first
     /// one found if it does. This method should be avoided where possible, and the overload that takes a <see cref="ProjectKey"/> should be used instead
     /// </summary>
-    Task<IDocumentSnapshot?> ResolveDocumentInAnyProjectAsync(string documentFilePath, CancellationToken cancellationToken);
+    IDocumentSnapshot? ResolveDocumentInAnyProject(string documentFilePath);
 }

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

@@ -123,9 +123,7 @@ public async Task OpenDocumentAsync(string filePath, SourceText sourceText, int
         // We are okay to use the non-project-key overload of TryResolveDocument here because we really are just checking if the document
         // has been added to _any_ project. AddDocument will take care of adding to all of the necessary ones, and then below we ensure
         // we process them all too
-        var document = await _snapshotResolver
-            .ResolveDocumentInAnyProjectAsync(textDocumentPath, cancellationToken)
-            .ConfigureAwait(false);
+        var document = _snapshotResolver.ResolveDocumentInAnyProject(textDocumentPath);
 
         if (document is null)
         {

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

@@ -78,7 +78,7 @@ public IProjectSnapshot GetMiscellaneousProject()
         return _projectManager.GetLoadedProject(MiscellaneousHostProject.Key);
     }
 
-    public async Task<IDocumentSnapshot?> ResolveDocumentInAnyProjectAsync(string documentFilePath, CancellationToken cancellationToken)
+    public IDocumentSnapshot? ResolveDocumentInAnyProject(string documentFilePath)
     {
         _logger.LogTrace($"Looking for {documentFilePath}.");
 

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

@@ -217,9 +217,9 @@ public ImmutableArray<IProjectSnapshot> FindPotentialProjects(string documentFil
         public IProjectSnapshot GetMiscellaneousProject()
             => throw new NotImplementedException();
 
-        public Task<IDocumentSnapshot?> ResolveDocumentInAnyProjectAsync(string documentFilePath, CancellationToken cancellationToken)
+        public IDocumentSnapshot? ResolveDocumentInAnyProject(string documentFilePath)
             => documentFilePath == _documentSnapshot?.FilePath
-                ? Task.FromResult<IDocumentSnapshot?>(_documentSnapshot)
-                : Task.FromResult<IDocumentSnapshot?>(null);
+                ? _documentSnapshot
+                : null;
     }
 }

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

@@ -24,7 +24,7 @@ public async Task TryResolveDocumentInAnyProject_AsksPotentialParentProjectForDo
         var snapshotResolver = await CreateSnapshotResolverAsync(normalizedFilePath);
 
         // Act
-        var document = await snapshotResolver.ResolveDocumentInAnyProjectAsync(documentFilePath, DisposalToken);
+        var document = snapshotResolver.ResolveDocumentInAnyProject(documentFilePath);
 
         // Assert
         Assert.NotNull(document);
@@ -52,7 +52,7 @@ await projectManager.UpdateAsync(updater =>
         });
 
         // Act
-        var document = await snapshotResolver.ResolveDocumentInAnyProjectAsync(documentFilePath, DisposalToken);
+        var document = snapshotResolver.ResolveDocumentInAnyProject(documentFilePath);
 
         // Assert
         Assert.NotNull(document);
@@ -69,7 +69,7 @@ public async Task TryResolveDocumentInAnyProject_AsksPotentialParentProjectForDo
         await snapshotResolver.InitializeAsync(DisposalToken);
 
         // Act
-        var document = await snapshotResolver.ResolveDocumentInAnyProjectAsync(documentFilePath, DisposalToken);
+        var document = snapshotResolver.ResolveDocumentInAnyProject(documentFilePath);
 
         // Assert
         Assert.Null(document);

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

@@ -38,6 +38,6 @@ public ImmutableArray<IProjectSnapshot> FindPotentialProjects(string documentFil
     public IProjectSnapshot GetMiscellaneousProject()
         => _miscProject;
 
-    public Task<IDocumentSnapshot?> ResolveDocumentInAnyProjectAsync(string documentFilePath, CancellationToken cancellationToken)
-        => Task.FromResult<IDocumentSnapshot?>(null);
+    public IDocumentSnapshot? ResolveDocumentInAnyProject(string documentFilePath)
+        => null;
 }