Add a proper initializer, rather that abusing dynamic files

Author: davidwengier

src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/DynamicFileProviderFactory.cs

@@ -11,16 +11,14 @@ namespace Microsoft.VisualStudioCode.RazorExtension.Services;
 [ExportRazorLspServiceFactory(typeof(RazorLspDynamicFileInfoProvider)), Shared]
 [method: ImportingConstructor]
 internal sealed class DynamicFileProviderFactory(
-    LanguageServerFeatureOptions featureOptions,
-    VSCodeWorkspaceProvider workspaceProvider) : AbstractRazorLspServiceFactory
+    LanguageServerFeatureOptions featureOptions) : AbstractRazorLspServiceFactory
 {
     private readonly LanguageServerFeatureOptions _featureOptions = featureOptions;
-    private readonly VSCodeWorkspaceProvider _workspaceProvider = workspaceProvider;
 
     protected override AbstractRazorLspService CreateService(IRazorLspServices lspServices)
     {
         var clientLanguageServerManager = lspServices.GetRequiredService<IRazorClientLanguageServerManager>();
-        return new LspDynamicFileProvider(clientLanguageServerManager, _featureOptions, _workspaceProvider);
+        return new LspDynamicFileProvider(clientLanguageServerManager, _featureOptions);
     }
 }
 

src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/LspDynamicFileProvider.cs

@@ -14,22 +14,16 @@ namespace Microsoft.VisualStudioCode.RazorExtension.Services;
 
 internal sealed partial class LspDynamicFileProvider(
     IRazorClientLanguageServerManager clientLanguageServerManager,
-    LanguageServerFeatureOptions languageServerFeatureOptions,
-    VSCodeWorkspaceProvider workspaceProvider) : RazorLspDynamicFileInfoProvider
+    LanguageServerFeatureOptions languageServerFeatureOptions) : RazorLspDynamicFileInfoProvider
 {
     private const string ProvideRazorDynamicFileInfoMethodName = "razor/provideDynamicFileInfo";
     private const string RemoveRazorDynamicFileInfoMethodName = "razor/removeDynamicFileInfo";
 
     private readonly IRazorClientLanguageServerManager _clientLanguageServerManager = clientLanguageServerManager;
     private readonly LanguageServerFeatureOptions _languageServerFeatureOptions = languageServerFeatureOptions;
-    private readonly VSCodeWorkspaceProvider _workspaceProvider = workspaceProvider;
 
     public override async Task<RazorDynamicFileInfo?> GetDynamicFileInfoAsync(Workspace workspace, ProjectId projectId, string? projectFilePath, string filePath, CancellationToken cancellationToken)
     {
-        // TODO: Temporarily using this as a hook to get the workspace into cohosting. In future when we delete the IDynamicFileInfo
-        // system as a whole, we'll need some other hook to get to the LspWorkspace
-        _workspaceProvider.SetWorkspace(workspace);
-
         if (_languageServerFeatureOptions.UseRazorCohostServer)
         {
             return null;

src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/RazorInitializer.cs

@@ -0,0 +1,21 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Composition;
+using Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.VisualStudioCode.RazorExtension.Services;
+
+[Shared]
+[ExportRazorStatelessLspService(typeof(AbstractRazorInitializer))]
+[method: ImportingConstructor]
+internal sealed class RazorInitializer(VSCodeWorkspaceProvider workspaceProvider) : AbstractRazorInitializer
+{
+    private readonly VSCodeWorkspaceProvider _workspaceProvider = workspaceProvider;
+
+    internal override void Initialize(Workspace workspace)
+    {
+        _workspaceProvider.SetWorkspace(workspace);
+    }
+}