From 7039c4c223e84299eeb3f05d1d5a08a63ee7d6ac Mon Sep 17 00:00:00 2001
From: Andrew Hall <andrha@microsoft.com>
Date: Thu, 27 Jun 2024 21:29:40 -0700
Subject: [PATCH] Consume new Razor EA (#74134)

Update to open a named pipe communication to rzls
---
 eng/Directory.Packages.props                        |  2 +-
 .../HostWorkspace/RazorInitializeHandler.cs         | 13 ++++++++++---
 .../RazorWorkspaceListenerInitializer.cs            | 10 +++-------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props
index e93b49fa24c55..ca108aa72ad55 100644
--- a/eng/Directory.Packages.props
+++ b/eng/Directory.Packages.props
@@ -144,7 +144,7 @@
     <PackageVersion Include="NuGet.ProjectModel" Version="6.8.0-rc.112" />
     <PackageVersion Include="Microsoft.TestPlatform.TranslationLayer" Version="$(MicrosoftTestPlatformVersion)" />
     <PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="$(MicrosoftTestPlatformVersion)" />
-    <PackageVersion Include="Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace" Version="9.0.0-preview.24316.1" />
+    <PackageVersion Include="Microsoft.AspNetCore.Razor.ExternalAccess.RoslynWorkspace" Version="9.0.0-preview.24327.6" />
 
     <!--
       Analyzers
diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/RazorInitializeHandler.cs b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/RazorInitializeHandler.cs
index dd1dd878f1102..c872b2303ef39 100644
--- a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/RazorInitializeHandler.cs
+++ b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/RazorInitializeHandler.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Composition;
+using System.Text.Json.Serialization;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.LanguageServer.Handler;
 using Microsoft.CommonLanguageServerProtocol.Framework;
@@ -11,7 +12,7 @@ namespace Microsoft.CodeAnalysis.LanguageServer.HostWorkspace;
 
 [ExportCSharpVisualBasicStatelessLspService(typeof(RazorInitializeHandler)), Shared]
 [Method("razor/initialize")]
-internal class RazorInitializeHandler : ILspServiceNotificationHandler<object>
+internal class RazorInitializeHandler : ILspServiceNotificationHandler<RazorInitializeParams>
 {
     private readonly Lazy<RazorWorkspaceListenerInitializer> _razorWorkspaceListenerInitializer;
 
@@ -25,10 +26,16 @@ public RazorInitializeHandler(Lazy<RazorWorkspaceListenerInitializer> razorWorks
     public bool MutatesSolutionState => false;
     public bool RequiresLSPSolution => false;
 
-    Task INotificationHandler<object, RequestContext>.HandleNotificationAsync(object request, RequestContext requestContext, CancellationToken cancellationToken)
+    Task INotificationHandler<RazorInitializeParams, RequestContext>.HandleNotificationAsync(RazorInitializeParams request, RequestContext requestContext, CancellationToken cancellationToken)
     {
-        _razorWorkspaceListenerInitializer.Value.Initialize();
+        _razorWorkspaceListenerInitializer.Value.Initialize(request.PipeName);
 
         return Task.CompletedTask;
     }
 }
+
+internal class RazorInitializeParams
+{
+    [JsonPropertyName("pipeName")]
+    public required string PipeName { get; set; }
+}
diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/RazorWorkspaceListenerInitializer.cs b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/RazorWorkspaceListenerInitializer.cs
index e091a4b80372e..b0d2ab8a94e4c 100644
--- a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/RazorWorkspaceListenerInitializer.cs
+++ b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/HostWorkspace/RazorWorkspaceListenerInitializer.cs
@@ -12,10 +12,6 @@ namespace Microsoft.CodeAnalysis.LanguageServer.HostWorkspace;
 [Export(typeof(RazorWorkspaceListenerInitializer)), Shared]
 internal sealed class RazorWorkspaceListenerInitializer
 {
-    // This should be moved to the Razor side once things are announced, so defaults are all in one
-    // place, in case things ever need to change
-    private const string _projectRazorJsonFileName = "project.razor.vscode.bin";
-
     private readonly ILogger _logger;
     private readonly Workspace _workspace;
     private readonly ILoggerFactory _loggerFactory;
@@ -36,7 +32,7 @@ public RazorWorkspaceListenerInitializer(LanguageServerWorkspaceFactory workspac
         _loggerFactory = loggerFactory;
     }
 
-    internal void Initialize()
+    internal void Initialize(string pipeName)
     {
         HashSet<ProjectId> projectsToInitialize;
         lock (_initializeGate)
@@ -47,9 +43,9 @@ internal void Initialize()
                 return;
             }
 
-            _logger.LogTrace("Initializing the Razor workspace listener");
+            _logger.LogTrace("Initializing the Razor workspace listener with pipe name {0}", pipeName);
             _razorWorkspaceListener = new RazorWorkspaceListener(_loggerFactory);
-            _razorWorkspaceListener.EnsureInitialized(_workspace, _projectRazorJsonFileName);
+            _razorWorkspaceListener.EnsureInitialized(_workspace, pipeName);
 
             projectsToInitialize = _projectIdWithDynamicFiles;
             // May as well clear out the collection, it will never get used again anyway.