Make ISnapshotResolver.TryResolveAllProjects synchronous

This extension method no longer has awaits and can be made synchronous. In addition, the cancellation token can be removed.

Author: DustinCampbell

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

@@ -12,10 +12,9 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
 
 internal static class ISnapshotResolverExtensions
 {
-    public static async Task<ImmutableArray<IProjectSnapshot>> TryResolveAllProjectsAsync(
+    public static ImmutableArray<IProjectSnapshot> TryResolveAllProjects(
         this ISnapshotResolver snapshotResolver,
-        string documentFilePath,
-        CancellationToken cancellationToken)
+        string documentFilePath)
     {
         var potentialProjects = snapshotResolver.FindPotentialProjects(documentFilePath);
 

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

@@ -258,7 +258,7 @@ private async Task ActOnDocumentInMultipleProjectsAsync(
         CancellationToken cancellationToken)
     {
         var textDocumentPath = FilePathNormalizer.Normalize(filePath);
-        var projects = await _snapshotResolver.TryResolveAllProjectsAsync(textDocumentPath, cancellationToken).ConfigureAwait(false);
+        var projects = _snapshotResolver.TryResolveAllProjects(textDocumentPath);
         if (projects.IsEmpty)
         {
             var miscFilesProject = _snapshotResolver.GetMiscellaneousProject();

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Tooltip/TagHelperTooltipFactoryBase.cs

@@ -31,7 +31,7 @@ protected TagHelperTooltipFactoryBase(ISnapshotResolver snapshotResolver)
 
     internal async Task<string?> GetProjectAvailabilityAsync(string documentFilePath, string tagHelperTypeName, CancellationToken cancellationToken)
     {
-        var projectSnapshots = await _snapshotResolver.TryResolveAllProjectsAsync(documentFilePath, cancellationToken).ConfigureAwait(false);
+        var projectSnapshots = _snapshotResolver.TryResolveAllProjects(documentFilePath);
         if (projectSnapshots.IsEmpty)
         {
             return null;

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

@@ -85,7 +85,7 @@ public async Task TryResolveAllProjects_NoProjects_ReturnsFalse()
         await snapshotResolver.InitializeAsync(DisposalToken);
 
         // Act
-        var projects = await snapshotResolver.TryResolveAllProjectsAsync(documentFilePath, DisposalToken);
+        var projects = snapshotResolver.TryResolveAllProjects(documentFilePath);
 
         // Assert
         Assert.Empty(projects);
@@ -101,7 +101,7 @@ public async Task TryResolveAllProjects_OnlyMiscellaneousProjectDoesNotContainDo
         await snapshotResolver.InitializeAsync(DisposalToken);
 
         // Act
-        var projects = await snapshotResolver.TryResolveAllProjectsAsync(documentFilePath, DisposalToken);
+        var projects = snapshotResolver.TryResolveAllProjects(documentFilePath);
 
         // Assert
         Assert.Empty(projects);
@@ -116,7 +116,7 @@ public async Task TryResolveAllProjects_OnlyMiscellaneousProjectContainsDocument
         await snapshotResolver.InitializeAsync(DisposalToken);
 
         // Act
-        var projects = await snapshotResolver.TryResolveAllProjectsAsync(documentFilePath, DisposalToken);
+        var projects = snapshotResolver.TryResolveAllProjects(documentFilePath);
 
         // Assert
         var miscFilesProject = snapshotResolver.GetMiscellaneousProject();
@@ -138,7 +138,7 @@ await projectManager.UpdateAsync(updater =>
         });
 
         // Act
-        var projects = await snapshotResolver.TryResolveAllProjectsAsync(documentFilePath, DisposalToken);
+        var projects = snapshotResolver.TryResolveAllProjects(documentFilePath);
 
         // Assert
         Assert.Empty(projects);
@@ -164,7 +164,7 @@ public async Task TryResolveAllProjects_OwnerProjectWithOthers_ReturnsTrue()
         });
 
         // Act
-        var projects = await snapshotResolver.TryResolveAllProjectsAsync(documentFilePath, DisposalToken);
+        var projects = snapshotResolver.TryResolveAllProjects(documentFilePath);
 
         // Assert
         var project = Assert.Single(projects);
@@ -192,7 +192,7 @@ public async Task TryResolveAllProjects_MiscellaneousOwnerProjectWithOthers_Retu
         });
 
         // Act
-        var projects = await snapshotResolver.TryResolveAllProjectsAsync(documentFilePath, DisposalToken);
+        var projects = snapshotResolver.TryResolveAllProjects(documentFilePath);
 
         // Assert
         var project = Assert.Single(projects);
@@ -217,7 +217,7 @@ public async Task TryResolveAllProjects_OwnerProjectDifferentCasing_ReturnsTrue(
         });
 
         // Act
-        var projects = await snapshotResolver.TryResolveAllProjectsAsync(documentFilePath, DisposalToken);
+        var projects = snapshotResolver.TryResolveAllProjects(documentFilePath);
 
         // Assert
         var project = Assert.Single(projects);