Make IDocumentContextFactory synchronous

Now that ISnapshotResolver is synchronous, there's no reason for IDocumentContextFactory to be synchronous.

Author: DustinCampbell

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/CSharp/DefaultCSharpCodeActionResolver.cs

@@ -73,7 +73,7 @@ public async override Task<CodeAction> ResolveAsync(
             throw new ArgumentNullException(nameof(codeAction));
         }
 
-        var documentContext = await _documentContextFactory.TryCreateForOpenDocumentAsync(csharpParams.RazorFileIdentifier, cancellationToken).ConfigureAwait(false);
+        var documentContext = _documentContextFactory.TryCreateForOpenDocument(csharpParams.RazorFileIdentifier);
         if (documentContext is null)
         {
             return codeAction;

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/CSharp/UnformattedRemappingCSharpCodeActionResolver.cs

@@ -54,7 +54,7 @@ public async override Task<CodeAction> ResolveAsync(
 
         cancellationToken.ThrowIfCancellationRequested();
 
-        var documentContext = await _documentContextFactory.TryCreateForOpenDocumentAsync(csharpParams.RazorFileIdentifier, cancellationToken).ConfigureAwait(false);
+        var documentContext = _documentContextFactory.TryCreateForOpenDocument(csharpParams.RazorFileIdentifier);
         if (documentContext is null)
         {
             return codeAction;

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Html/DefaultHtmlCodeActionResolver.cs

@@ -55,7 +55,7 @@ public async override Task<CodeAction> ResolveAsync(
             throw new ArgumentNullException(nameof(codeAction));
         }
 
-        var documentContext = await _documentContextFactory.TryCreateForOpenDocumentAsync(resolveParams.RazorFileIdentifier, cancellationToken).ConfigureAwait(false);
+        var documentContext = _documentContextFactory.TryCreateForOpenDocument(resolveParams.RazorFileIdentifier);
         if (documentContext is null)
         {
             return codeAction;

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Razor/AddUsingsCodeActionResolver.cs

@@ -45,7 +45,7 @@ public AddUsingsCodeActionResolver(IDocumentContextFactory documentContextFactor
             return null;
         }
 
-        var documentContext = await _documentContextFactory.TryCreateAsync(actionParams.Uri, cancellationToken).ConfigureAwait(false);
+        var documentContext = _documentContextFactory.TryCreate(actionParams.Uri);
         if (documentContext is null)
         {
             return null;

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Razor/CreateComponentCodeActionResolver.cs

@@ -43,7 +43,7 @@ public CreateComponentCodeActionResolver(IDocumentContextFactory documentContext
             return null;
         }
 
-        var documentContext = await _documentContextFactory.TryCreateAsync(actionParams.Uri, cancellationToken).ConfigureAwait(false);
+        var documentContext = _documentContextFactory.TryCreate(actionParams.Uri);
         if (documentContext is null)
         {
             return null;

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Razor/ExtractToCodeBehindCodeActionResolver.cs

@@ -60,7 +60,7 @@ public ExtractToCodeBehindCodeActionResolver(
 
         var path = FilePathNormalizer.Normalize(actionParams.Uri.GetAbsoluteOrUNCPath());
 
-        var documentContext = await _documentContextFactory.TryCreateAsync(actionParams.Uri, cancellationToken).ConfigureAwait(false);
+        var documentContext = _documentContextFactory.TryCreate(actionParams.Uri);
         if (documentContext is null)
         {
             return null;

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/CodeActions/Razor/GenerateMethodCodeActionResolver.cs

@@ -72,7 +72,7 @@ public GenerateMethodCodeActionResolver(
             return null;
         }
 
-        var documentContext = await _documentContextFactory.TryCreateForOpenDocumentAsync(actionParams.Uri, cancellationToken).ConfigureAwait(false);
+        var documentContext = _documentContextFactory.TryCreateForOpenDocument(actionParams.Uri);
         if (documentContext is null)
         {
             return null;

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

@@ -100,7 +100,7 @@ private async Task<VSInternalCompletionItem> PostProcessCompletionItemAsync(
         }
 
         var identifier = context.OriginalRequestParams.Identifier.TextDocumentIdentifier;
-        var documentContext = await _documentContextFactory.TryCreateForOpenDocumentAsync(identifier, cancellationToken).ConfigureAwait(false);
+        var documentContext = _documentContextFactory.TryCreateForOpenDocument(identifier);
         if (documentContext is null)
         {
             return resolvedCompletionItem;

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Diagnostics/RazorDiagnosticsPublisher.cs

@@ -183,9 +183,8 @@ .. csharpDiagnostics ?? []
                     delegatedResponse.Value.TryGetFirst(out var fullDiagnostics) &&
                     fullDiagnostics.Items is not null)
                 {
-                    var documentContext = await _documentContextFactory.Value
-                        .TryCreateAsync(delegatedParams.TextDocument.Uri, projectContext: null, token)
-                        .ConfigureAwait(false);
+                    var documentContext = _documentContextFactory.Value
+                        .TryCreate(delegatedParams.TextDocument.Uri, projectContext: null);
 
                     if (documentContext is not null)
                     {

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

@@ -3,6 +3,7 @@
 
 using System;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.LanguageServer.ProjectSystem;
@@ -27,12 +28,11 @@ internal sealed class DocumentContextFactory(
     private readonly IDocumentVersionCache _documentVersionCache = documentVersionCache;
     private readonly ILogger _logger = loggerFactory.GetOrCreateLogger<DocumentContextFactory>();
 
-    public async Task<DocumentContext?> TryCreateAsync(Uri documentUri, VSProjectContext? projectContext, bool versioned, CancellationToken cancellationToken)
+    public DocumentContext? TryCreate(Uri documentUri, VSProjectContext? projectContext, bool versioned)
     {
         var filePath = documentUri.GetAbsoluteOrUNCPath();
-        var documentAndVersion = await TryGetDocumentAndVersionAsync(filePath, projectContext, versioned, cancellationToken).ConfigureAwait(false);
 
-        if (documentAndVersion is null)
+        if (!TryGetDocumentAndVersion(filePath, projectContext, versioned, out var documentAndVersion))
         {
             // Stale request or misbehaving client, see above comment.
             return null;
@@ -59,20 +59,24 @@ internal sealed class DocumentContextFactory(
         return new DocumentContext(documentUri, documentSnapshot, projectContext);
     }
 
-    private async Task<DocumentSnapshotAndVersion?> TryGetDocumentAndVersionAsync(string filePath, VSProjectContext? projectContext, bool versioned, CancellationToken cancellationToken)
+    private bool TryGetDocumentAndVersion(
+        string filePath,
+        VSProjectContext? projectContext,
+        bool versioned,
+        [NotNullWhen(true)] out DocumentSnapshotAndVersion? documentAndVersion)
     {
-        var documentSnapshot = await TryResolveDocumentAsync(filePath, projectContext, cancellationToken).ConfigureAwait(false);
-
-        if (documentSnapshot is not null)
+        if (TryResolveDocument(filePath, projectContext, out var documentSnapshot))
         {
             if (!versioned)
             {
-                return new DocumentSnapshotAndVersion(documentSnapshot, Version: null);
+                documentAndVersion = new DocumentSnapshotAndVersion(documentSnapshot, Version: null);
+                return true;
             }
 
             if (_documentVersionCache.TryGetDocumentVersion(documentSnapshot, out var version))
             {
-                return new DocumentSnapshotAndVersion(documentSnapshot, version.Value);
+                documentAndVersion = new DocumentSnapshotAndVersion(documentSnapshot, version.Value);
+                return true;
             }
 
             _logger.LogWarning($"Tried to create context for document {filePath} and project {projectContext?.Id} and a document was found, but version didn't match.");
@@ -85,20 +89,26 @@ internal sealed class DocumentContextFactory(
         //            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} and project {projectContext?.Id} which was not found.");
-        return null;
+        documentAndVersion = null;
+        return false;
     }
 
-    private async Task<IDocumentSnapshot?> TryResolveDocumentAsync(string filePath, VSProjectContext? projectContext, CancellationToken cancellationToken)
+    private bool TryResolveDocument(
+        string filePath,
+        VSProjectContext? projectContext,
+        [NotNullWhen(true)] out IDocumentSnapshot? documentSnapshot)
     {
         if (projectContext is null)
         {
-            return _snapshotResolver.ResolveDocumentInAnyProject(filePath);
+            documentSnapshot = _snapshotResolver.ResolveDocumentInAnyProject(filePath);
+            return documentSnapshot is not null;
         }
 
         if (_projectManager.TryGetLoadedProject(projectContext.ToProjectKey(), out var project) &&
             project.GetDocument(filePath) is { } document)
         {
-            return document;
+            documentSnapshot = document;
+            return true;
         }
 
         // Couldn't find the document in a real project. Maybe the language server doesn't yet know about the project
@@ -109,10 +119,12 @@ internal sealed class DocumentContextFactory(
         if (miscellaneousProject.GetDocument(normalizedDocumentPath) is { } miscDocument)
         {
             _logger.LogDebug($"Found document {filePath} in the misc files project, but was asked for project context {projectContext.Id}");
-            return miscDocument;
+            documentSnapshot = miscDocument;
+            return true;
         }
 
-        return null;
+        documentSnapshot = null;
+        return false;
     }
 
     private record DocumentSnapshotAndVersion(IDocumentSnapshot Snapshot, int? Version);