Make RewriteCSharpResponseAsync synchronously

Now the completion list rewriters are synchronous, the RazorCodeDocument can be acquired by callers of RewriteCSharpResponseAsync and passed to it. Then, RewriteCSharpResponseAsync can be made synchronous.

Author: DustinCampbell

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/Delegation/DelegatedCompletionListProvider.cs

@@ -81,12 +81,13 @@ public DelegatedCompletionListProvider(
 
         completionContext = rewrittenContext;
 
-        var razorCodeDocument = await documentContext.GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
+        var codeDocument = await documentContext.GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
+
         // It's a bit confusing, but we have two different "add snippets" options - one is a part of
         // RazorCompletionOptions and becomes a part of RazorCompletionContext and is used by
         // RazorCompletionFactsService, and the second one below that's used for delegated completion
         // Their values are not related in any way.
-        var shouldIncludeDelegationSnippets = DelegatedCompletionHelper.ShouldIncludeSnippets(razorCodeDocument, absoluteIndex);
+        var shouldIncludeDelegationSnippets = DelegatedCompletionHelper.ShouldIncludeSnippets(codeDocument, absoluteIndex);
 
         var delegatedParams = new DelegatedCompletionParams(
             documentContext.GetTextDocumentIdentifierAndVersion(),
@@ -103,14 +104,7 @@ public DelegatedCompletionListProvider(
             cancellationToken).ConfigureAwait(false);
 
         var rewrittenResponse = delegatedParams.ProjectedKind == RazorLanguageKind.CSharp
-             ? await DelegatedCompletionHelper.RewriteCSharpResponseAsync(
-                delegatedResponse,
-                absoluteIndex,
-                documentContext,
-                delegatedParams.ProjectedPosition,
-                razorCompletionOptions,
-                cancellationToken)
-                .ConfigureAwait(false)
+             ? DelegatedCompletionHelper.RewriteCSharpResponse(delegatedResponse, absoluteIndex, codeDocument, delegatedParams.ProjectedPosition, razorCompletionOptions)
             : DelegatedCompletionHelper.RewriteHtmlResponse(delegatedResponse, razorCompletionOptions);
 
         var completionCapability = clientCapabilities?.TextDocument?.Completion as VSInternalCompletionSetting;

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/Delegation/DelegatedCompletionHelper.cs

@@ -96,13 +96,12 @@ internal static class DelegatedCompletionHelper
     /// <returns>
     /// Possibly modified completion response.
     /// </returns>
-    public static async ValueTask<VSInternalCompletionList> RewriteCSharpResponseAsync(
+    public static VSInternalCompletionList RewriteCSharpResponse(
         VSInternalCompletionList? delegatedResponse,
         int absoluteIndex,
-        DocumentContext documentContext,
+        RazorCodeDocument codeDocument,
         Position projectedPosition,
-        RazorCompletionOptions completionOptions,
-        CancellationToken cancellationToken)
+        RazorCompletionOptions completionOptions)
     {
         if (delegatedResponse?.Items is null)
         {
@@ -113,8 +112,6 @@ public static async ValueTask<VSInternalCompletionList> RewriteCSharpResponseAsy
             return new VSInternalCompletionList() { IsIncomplete = true, Items = [] };
         }
 
-        var codeDocument = await documentContext.GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
-
         var rewrittenResponse = delegatedResponse;
 
         foreach (var rewriter in s_delegatedCSharpCompletionResponseRewriters)

src/Razor/src/Microsoft.CodeAnalysis.Remote.Razor/Completion/RemoteCompletionService.cs

@@ -212,16 +212,16 @@ private async ValueTask<Response> GetCompletionAsync(
             };
         }
 
+        var codeDocument = await remoteDocumentContext.GetCodeDocumentAsync(cancellationToken).ConfigureAwait(false);
+
         var vsPlatformCompletionList = JsonHelpers.ToVsLSP<VSInternalCompletionList, RoslynCompletionList>(roslynCompletionList);
 
-        var rewrittenResponse = await DelegatedCompletionHelper.RewriteCSharpResponseAsync(
+        var rewrittenResponse = DelegatedCompletionHelper.RewriteCSharpResponse(
             vsPlatformCompletionList,
             documentIndex,
-            remoteDocumentContext,
+            codeDocument,
             mappedPosition,
-            razorCompletionOptions,
-            cancellationToken)
-            .ConfigureAwait(false);
+            razorCompletionOptions);
 
         return rewrittenResponse;
     }