Merge pull request #56051 from dibarbet/lsp_editor_features

Move VS lsp client implementation to EditorFeatures for VSMac

Author: dibarbet

src/EditorFeatures/Core/EditorFeaturesResources.resx

@@ -1119,4 +1119,8 @@ Do you want to proceed?</value>
   <data name="Execute_Suggested_Action" xml:space="preserve">
     <value>Execute Suggested Action</value>
   </data>
+  <data name="Language_client_initialization_failed" xml:space="preserve">
+    <value>{0} failed to initialize. Status = {1}. Exception = {2}</value>
+    <comment>{0} is the language server name.  Status is the status of the initialization.  Exception is the exception encountered during initialization.</comment>
+  </data>
 </root>

src/VisualStudio/Core/Def/Implementation/LanguageClient/AbstractInProcLanguageClient.cs renamed to src/EditorFeatures/Core/Implementation/LanguageServer/AbstractInProcLanguageClient.cs

@@ -8,7 +8,6 @@
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.LanguageServer;
@@ -21,7 +20,7 @@
 using Roslyn.Utilities;
 using StreamJsonRpc;
 
-namespace Microsoft.VisualStudio.LanguageServices.Implementation.LanguageClient
+namespace Microsoft.CodeAnalysis.Editor.Implementation.LanguageClient
 {
     internal abstract partial class AbstractInProcLanguageClient : ILanguageClient, ILanguageServerFactory, ICapabilitiesProvider
     {
@@ -224,7 +223,7 @@ public ILanguageServerTarget Create(
         public Task<InitializationFailureContext?> OnServerInitializeFailedAsync(ILanguageClientInitializationInfo initializationState)
         {
             var initializationFailureContext = new InitializationFailureContext();
-            initializationFailureContext.FailureMessage = string.Format(ServicesVSResources.Language_client_initialization_failed,
+            initializationFailureContext.FailureMessage = string.Format(EditorFeaturesResources.Language_client_initialization_failed,
                 Name, initializationState.StatusMessage, initializationState.InitializationException?.ToString());
             return Task.FromResult<InitializationFailureContext?>(initializationFailureContext);
         }

src/VisualStudio/Core/Def/Implementation/LanguageClient/AlwaysActivateInProcLanguageClient.cs renamed to src/EditorFeatures/Core/Implementation/LanguageServer/AlwaysActivateInProcLanguageClient.cs

@@ -16,7 +16,7 @@
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 using Microsoft.VisualStudio.Utilities;
 
-namespace Microsoft.VisualStudio.LanguageServices.Implementation.LanguageClient
+namespace Microsoft.CodeAnalysis.Editor.Implementation.LanguageClient
 {
     /// <summary>
     /// Language client responsible for handling C# / VB / F# LSP requests in any scenario (both local and codespaces).

src/VisualStudio/Core/Def/Implementation/LanguageClient/AlwaysActiveLanguageClientEventListener.cs renamed to src/EditorFeatures/Core/Implementation/LanguageServer/AlwaysActiveLanguageClientEventListener.cs

@@ -17,7 +17,7 @@
 using Microsoft.VisualStudio.LanguageServer.Client;
 using Microsoft.VisualStudio.Threading;
 
-namespace Microsoft.VisualStudio.LanguageServices.Implementation.LanguageClient
+namespace Microsoft.CodeAnalysis.Editor.Implementation.LanguageClient
 {
     // unfortunately, we can't implement this on LanguageServerClient since this uses MEF v2 and
     // ILanguageClient requires MEF v1 and two can't be mixed exported in 1 class.

src/Features/LanguageServer/Protocol/Handler/CodeActions/CodeActionHelpers.cs renamed to src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/CodeActions/CodeActionHelpers.cs

@@ -26,6 +26,10 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler
     /// system allows the basic code action data to be computed quickly, and the
     /// complex data, such as edits and commands, to be computed only when necessary
     /// (i.e. when hovering/previewing a code action).
+    /// 
+    /// TODO - This must be moved to the MS.CA.LanguageServer.Protocol project once the
+    /// EditorFeatures references in <see cref="RunCodeActionHandler"/> are removed.
+    /// See https://github.com/dotnet/roslyn/issues/55142
     /// </summary>
     internal class CodeActionResolveHandler : IRequestHandler<LSP.CodeAction, LSP.CodeAction>
     {

src/Features/LanguageServer/Protocol/Handler/CodeActions/CodeActionResolveData.cs renamed to src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/CodeActions/CodeActionResolveData.cs

@@ -17,6 +17,10 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler
     /// Handles the initial request for code actions. Leaves the Edit and Command properties
     /// of the returned VSCodeActions blank, as these properties should be populated by the
     /// CodeActionsResolveHandler only when the user requests them.
+    /// 
+    /// TODO - This must be moved to the MS.CA.LanguageServer.Protocol project once the
+    /// EditorFeatures references in <see cref="RunCodeActionHandler"/> are removed.
+    /// See https://github.com/dotnet/roslyn/issues/55142
     /// </summary>
     internal class CodeActionsHandler : IRequestHandler<LSP.CodeActionParams, LSP.CodeAction[]>
     {