Fix client capabilities in completion resolve endpoint

Author: davidwengier

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

@@ -34,7 +34,7 @@ internal class DelegatedCompletionItemResolver(
         VSInternalCompletionItem item,
         VSInternalCompletionList containingCompletionList,
         ICompletionResolveContext originalRequestContext,
-        VSInternalClientCapabilities? clientCapabilities,
+        VSInternalClientCapabilities clientCapabilities,
         IComponentAvailabilityService componentAvailabilityService,
         CancellationToken cancellationToken)
     {

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Completion/RazorCompletionResolveEndpoint.cs

@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.LanguageServer.EndpointContracts;
 using Microsoft.CodeAnalysis.Razor.Completion;
+using Microsoft.CodeAnalysis.Razor.Protocol;
 using Microsoft.CodeAnalysis.Razor.Tooltip;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer.Completion;
@@ -13,22 +14,17 @@ namespace Microsoft.AspNetCore.Razor.LanguageServer.Completion;
 internal class RazorCompletionResolveEndpoint(
     AggregateCompletionItemResolver completionItemResolver,
     CompletionListCache completionListCache,
-    IComponentAvailabilityService componentAvailabilityService)
-    : IRazorRequestHandler<VSInternalCompletionItem, VSInternalCompletionItem>, ICapabilitiesProvider
+    IComponentAvailabilityService componentAvailabilityService,
+    IClientCapabilitiesService clientCapabilitiesService)
+    : IRazorRequestHandler<VSInternalCompletionItem, VSInternalCompletionItem>
 {
     private readonly AggregateCompletionItemResolver _completionItemResolver = completionItemResolver;
     private readonly CompletionListCache _completionListCache = completionListCache;
     private readonly IComponentAvailabilityService _componentAvailabilityService = componentAvailabilityService;
-
-    private VSInternalClientCapabilities? _clientCapabilities;
+    private readonly IClientCapabilitiesService _clientCapabilitiesService = clientCapabilitiesService;
 
     public bool MutatesSolutionState => false;
 
-    public void ApplyCapabilities(VSInternalServerCapabilities serverCapabilities, VSInternalClientCapabilities clientCapabilities)
-    {
-        _clientCapabilities = clientCapabilities;
-    }
-
     public TextDocumentIdentifier GetTextDocumentIdentifier(VSInternalCompletionItem request)
     {
         var context = RazorCompletionResolveData.Unwrap(request);
@@ -50,7 +46,7 @@ public async Task<VSInternalCompletionItem> HandleRequestAsync(VSInternalComplet
                 completionItem,
                 containingCompletionList,
                 originalRequestContext,
-                _clientCapabilities,
+                _clientCapabilitiesService.ClientCapabilities,
                 _componentAvailabilityService,
                 cancellationToken)
             .ConfigureAwait(false);

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/Extensions/IServiceCollectionExtensions.cs

@@ -74,7 +74,7 @@ public static void AddCompletionServices(this IServiceCollection services)
     {
         services.AddHandlerWithCapabilities<InlineCompletionEndpoint>();
         services.AddHandlerWithCapabilities<RazorCompletionEndpoint>();
-        services.AddHandlerWithCapabilities<RazorCompletionResolveEndpoint>();
+        services.AddHandler<RazorCompletionResolveEndpoint>();
         services.AddSingleton<CompletionListCache>();
         services.AddSingleton<CompletionListProvider>();
         services.AddSingleton<DelegatedCompletionListProvider>();

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/AggregateCompletionItemResolver.cs

@@ -2,9 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using System.Buffers;
 using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Immutable;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.PooledObjects;
@@ -13,26 +12,20 @@
 
 namespace Microsoft.CodeAnalysis.Razor.Completion;
 
-internal class AggregateCompletionItemResolver
+internal class AggregateCompletionItemResolver(IEnumerable<CompletionItemResolver> completionItemResolvers, ILoggerFactory loggerFactory)
 {
-    private readonly IReadOnlyList<CompletionItemResolver> _completionItemResolvers;
-    private readonly ILogger _logger;
-
-    public AggregateCompletionItemResolver(IEnumerable<CompletionItemResolver> completionItemResolvers, ILoggerFactory loggerFactory)
-    {
-        _completionItemResolvers = completionItemResolvers.ToArray();
-        _logger = loggerFactory.GetOrCreateLogger<AggregateCompletionItemResolver>();
-    }
+    private readonly ImmutableArray<CompletionItemResolver> _completionItemResolvers = [.. completionItemResolvers];
+    private readonly ILogger _logger = loggerFactory.GetOrCreateLogger<AggregateCompletionItemResolver>();
 
     public async Task<VSInternalCompletionItem?> ResolveAsync(
         VSInternalCompletionItem item,
         VSInternalCompletionList containingCompletionList,
         ICompletionResolveContext originalRequestContext,
-        VSInternalClientCapabilities? clientCapabilities,
+        VSInternalClientCapabilities clientCapabilities,
         IComponentAvailabilityService componentAvailabilityService,
         CancellationToken cancellationToken)
     {
-        using var completionItemResolverTasks = new PooledArrayBuilder<Task<VSInternalCompletionItem?>>(_completionItemResolvers.Count);
+        using var completionItemResolverTasks = new PooledArrayBuilder<Task<VSInternalCompletionItem?>>(_completionItemResolvers.Length);
 
         foreach (var completionItemResolver in _completionItemResolvers)
         {

src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Completion/CompletionItemResolver.cs

@@ -13,7 +13,7 @@ internal abstract class CompletionItemResolver
         VSInternalCompletionItem item,
         VSInternalCompletionList containingCompletionList,
         ICompletionResolveContext originalRequestContext,
-        VSInternalClientCapabilities? clientCapabilities,
+        VSInternalClientCapabilities clientCapabilities,
         IComponentAvailabilityService componentAvailabilityService,
         CancellationToken cancellationToken);
 }

src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Completion/RazorCompletionResolveEndpointTest.cs

@@ -7,6 +7,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.LanguageServer.Hover;
+using Microsoft.AspNetCore.Razor.LanguageServer.Test;
 using Microsoft.AspNetCore.Razor.Test.Common;
 using Microsoft.AspNetCore.Razor.Test.Common.LanguageServer;
 using Microsoft.CodeAnalysis.Razor.Completion;
@@ -30,12 +31,6 @@ public RazorCompletionResolveEndpointTest(ITestOutputHelper testOutput)
         var projectManager = CreateProjectSnapshotManager();
         var componentAvailabilityService = new ComponentAvailabilityService(projectManager);
 
-        _endpoint = new RazorCompletionResolveEndpoint(
-            new AggregateCompletionItemResolver(
-                [new TestCompletionItemResolver()],
-                LoggerFactory),
-            _completionListCache,
-            componentAvailabilityService);
         _clientCapabilities = new VSInternalClientCapabilities()
         {
             TextDocument = new TextDocumentClientCapabilities()
@@ -49,7 +44,15 @@ [new TestCompletionItemResolver()],
                 }
             }
         };
-        _endpoint.ApplyCapabilities(new(), _clientCapabilities);
+        var clientCapabilitiesService = new TestClientCapabilitiesService(_clientCapabilities);
+
+        _endpoint = new RazorCompletionResolveEndpoint(
+            new AggregateCompletionItemResolver(
+                [new TestCompletionItemResolver()],
+                LoggerFactory),
+            _completionListCache,
+            componentAvailabilityService,
+            clientCapabilitiesService);
     }
 
     [Fact]