Make IOnInitialized a bit more general purpose

Author: DustinCampbell

src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/LanguageServer/RazorLanguageServerBenchmarkBase.cs

@@ -87,7 +87,7 @@ await projectManager.UpdateAsync(
 
     private class NoopClientNotifierService : IClientConnection, IOnInitialized
     {
-        public Task OnInitializedAsync(VSInternalClientCapabilities clientCapabilities, CancellationToken cancellationToken)
+        public Task OnInitializedAsync(ILspServices services, CancellationToken cancellationToken)
         {
             return Task.CompletedTask;
         }

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

@@ -5,6 +5,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
+using Microsoft.CommonLanguageServerProtocol.Framework;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 using StreamJsonRpc;
 
@@ -47,7 +48,7 @@ public async Task SendNotificationAsync(string method, CancellationToken cancell
     /// <summary>
     /// Fires when the language server is set to "Started".
     /// </summary>
-    public Task OnInitializedAsync(VSInternalClientCapabilities clientCapabilities, CancellationToken cancellationToken)
+    public Task OnInitializedAsync(ILspServices services, CancellationToken cancellationToken)
     {
         _initializedCompletionSource.TrySetResult(true);
         return Task.CompletedTask;

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

@@ -3,11 +3,12 @@
 
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CommonLanguageServerProtocol.Framework;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer;
 
 internal interface IOnInitialized
 {
-    Task OnInitializedAsync(VSInternalClientCapabilities clientCapabilities, CancellationToken cancellationToken);
+    Task OnInitializedAsync(ILspServices services, CancellationToken cancellationToken);
 }

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

@@ -6,6 +6,8 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.LanguageServer.EndpointContracts;
 using Microsoft.CodeAnalysis.Razor.Logging;
+using Microsoft.CodeAnalysis.Razor.Protocol;
+using Microsoft.CommonLanguageServerProtocol.Framework;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer;
@@ -25,8 +27,11 @@ public async Task HandleNotificationAsync(DidChangeConfigurationParams request,
         await _optionsMonitor.UpdateAsync(cancellationToken).ConfigureAwait(false);
     }
 
-    public async Task OnInitializedAsync(VSInternalClientCapabilities clientCapabilities, CancellationToken cancellationToken)
+    public async Task OnInitializedAsync(ILspServices services, CancellationToken cancellationToken)
     {
+        var capabilitiesService = services.GetRequiredService<IClientCapabilitiesService>();
+        var clientCapabilities = capabilitiesService.ClientCapabilities;
+
         if (clientCapabilities.Workspace?.Configuration == true)
         {
             await _optionsMonitor.UpdateAsync(cancellationToken).ConfigureAwait(false);

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

@@ -19,7 +19,6 @@ internal class RazorInitializedEndpoint : INotificationHandler<InitializedParams
     public async Task HandleNotificationAsync(InitializedParams request, RazorRequestContext requestContext, CancellationToken cancellationToken)
     {
         var onStartedItems = requestContext.LspServices.GetRequiredServices<IOnInitialized>();
-        var capabilitiesService = requestContext.GetRequiredService<IClientCapabilitiesService>();
 
         var snapshotResolver = requestContext.LspServices.GetRequiredService<ISnapshotResolver>();
         await snapshotResolver.InitializeAsync(cancellationToken).ConfigureAwait(false);
@@ -29,7 +28,7 @@ public async Task HandleNotificationAsync(InitializedParams request, RazorReques
 
         foreach (var onStartedItem in onStartedItems)
         {
-            await onStartedItem.OnInitializedAsync(capabilitiesService.ClientCapabilities, cancellationToken).ConfigureAwait(false);
+            await onStartedItem.OnInitializedAsync(requestContext.LspServices, cancellationToken).ConfigureAwait(false);
         }
     }
 }