Make RazorFileChangeDetectorManager implement IOnInitialized

Author: DustinCampbell

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

@@ -212,6 +212,7 @@ public static void AddDocumentManagementServices(this IServiceCollection service
         services.AddSingleton<IRazorStartupService, OpenDocumentGenerator>();
         services.AddSingleton<IRazorDocumentMappingService, RazorDocumentMappingService>();
         services.AddSingleton<RazorFileChangeDetectorManager>();
+        services.AddSingleton<IOnInitialized>(sp => sp.GetRequiredService<RazorFileChangeDetectorManager>());
 
         if (featureOptions.UseProjectConfigurationEndpoint)
         {

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

@@ -7,19 +7,20 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CommonLanguageServerProtocol.Framework;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer;
 
 internal class RazorFileChangeDetectorManager(
     WorkspaceDirectoryPathResolver workspaceDirectoryPathResolver,
-    IEnumerable<IFileChangeDetector> fileChangeDetectors) : IDisposable
+    IEnumerable<IFileChangeDetector> fileChangeDetectors) : IOnInitialized, IDisposable
 {
     private readonly WorkspaceDirectoryPathResolver _workspaceDirectoryPathResolver = workspaceDirectoryPathResolver;
     private readonly ImmutableArray<IFileChangeDetector> _fileChangeDetectors = fileChangeDetectors.ToImmutableArray();
     private readonly object _disposeLock = new();
     private bool _disposed;
 
-    public async Task InitializedAsync(CancellationToken cancellationToken)
+    public async Task OnInitializedAsync(ILspServices services, CancellationToken cancellationToken)
     {
         // Initialized request, this occurs once the server and client have agreed on what sort of features they both support. It only happens once.
 

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

@@ -20,9 +20,6 @@ public async Task HandleNotificationAsync(InitializedParams request, RazorReques
     {
         var onStartedItems = requestContext.LspServices.GetRequiredServices<IOnInitialized>();
 
-        var fileChangeDetectorManager = requestContext.LspServices.GetRequiredService<RazorFileChangeDetectorManager>();
-        await fileChangeDetectorManager.InitializedAsync(cancellationToken).ConfigureAwait(false);
-
         foreach (var onStartedItem in onStartedItems)
         {
             await onStartedItem.OnInitializedAsync(requestContext.LspServices, cancellationToken).ConfigureAwait(false);

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

@@ -60,7 +60,7 @@ public async Task InitializedAsync_StartsFileChangeDetectors()
         using (var detectorManager = new RazorFileChangeDetectorManager(workspaceDirectoryPathResolver, [detectorMock1.Object, detectorMock2.Object]))
         {
             // Act
-            await detectorManager.InitializedAsync(DisposalToken);
+            await detectorManager.OnInitializedAsync(StrictMock.Of<ILspServices>(), DisposalToken);
         }
 
         // Assert
@@ -98,7 +98,7 @@ public async Task InitializedAsync_Disposed_ReStopsFileChangeDetectors()
         using var detectorManager = new RazorFileChangeDetectorManager(workspaceDirectoryPathResolver, [detectorMock.Object]);
 
         // Act
-        var initializeTask = detectorManager.InitializedAsync(DisposalToken);
+        var initializeTask = detectorManager.OnInitializedAsync(StrictMock.Of<ILspServices>(), DisposalToken);
         detectorManager.Dispose();
 
         // Unblock the detector start