Move LSP client integration down to editor features to support VSMac

dibarbet · dibarbet · commit 85406c0cb034 · 2021-08-31T15:49:15.000-07:00
diff --git a/src/EditorFeatures/Core/Implementation/LanguageServer/AbstractInProcLanguageClient.cs b/src/EditorFeatures/Core/Implementation/LanguageServer/AbstractInProcLanguageClient.cs
@@ -10,7 +10,9 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Editor.Implementation.LanguageServer;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
+using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.LanguageServer;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
 using Microsoft.VisualStudio.LanguageServer.Client;
@@ -36,7 +38,7 @@ internal abstract partial class AbstractInProcLanguageClient : ILanguageClient,
         private readonly AbstractRequestDispatcherFactory _requestDispatcherFactory;
         private readonly ILspWorkspaceRegistrationService _lspWorkspaceRegistrationService;
 
-        protected readonly Workspace Workspace;
+        protected readonly HostWorkspaceServices WorkspaceServices;
 
         /// <summary>
         /// Created when <see cref="ActivateAsync"/> is called.
@@ -81,7 +83,7 @@ public event AsyncEventHandler<EventArgs>? StopAsync { add { } remove { } }
 
         public AbstractInProcLanguageClient(
             AbstractRequestDispatcherFactory requestDispatcherFactory,
-            VisualStudioWorkspace workspace,
+            ILspWorkspaceServicesProvider workspaceServicesProvider,
             IDiagnosticService? diagnosticService,
             IAsynchronousOperationListenerProvider listenerProvider,
             ILspWorkspaceRegistrationService lspWorkspaceRegistrationService,
@@ -90,13 +92,14 @@ public AbstractInProcLanguageClient(
             string? diagnosticsClientName)
         {
             _requestDispatcherFactory = requestDispatcherFactory;
-            Workspace = workspace;
             _diagnosticService = diagnosticService;
             _listenerProvider = listenerProvider;
             _lspWorkspaceRegistrationService = lspWorkspaceRegistrationService;
             _diagnosticsClientName = diagnosticsClientName;
             _lspLoggerFactory = lspLoggerFactory;
             _threadingContext = threadingContext;
+
+            WorkspaceServices = workspaceServicesProvider.GetHostWorkspaceServices();
         }
 
         public async Task<Connection?> ActivateAsync(CancellationToken cancellationToken)
diff --git a/src/EditorFeatures/Core/Implementation/LanguageServer/AlwaysActivateInProcLanguageClient.cs b/src/EditorFeatures/Core/Implementation/LanguageServer/AlwaysActivateInProcLanguageClient.cs
@@ -7,6 +7,7 @@
 using System.ComponentModel.Composition;
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Editor;
+using Microsoft.CodeAnalysis.Editor.Implementation.LanguageServer;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Experiments;
 using Microsoft.CodeAnalysis.Host.Mef;
@@ -36,13 +37,13 @@ internal class AlwaysActivateInProcLanguageClient : AbstractInProcLanguageClient
         [Obsolete(MefConstruction.ImportingConstructorMessage, true)]
         public AlwaysActivateInProcLanguageClient(
             RequestDispatcherFactory csharpVBRequestDispatcherFactory,
-            VisualStudioWorkspace workspace,
+            ILspWorkspaceServicesProvider workspaceServices,
             IAsynchronousOperationListenerProvider listenerProvider,
             ILspWorkspaceRegistrationService lspWorkspaceRegistrationService,
             DefaultCapabilitiesProvider defaultCapabilitiesProvider,
             ILspLoggerFactory lspLoggerFactory,
             IThreadingContext threadingContext)
-            : base(csharpVBRequestDispatcherFactory, workspace, diagnosticService: null, listenerProvider, lspWorkspaceRegistrationService, lspLoggerFactory, threadingContext, diagnosticsClientName: null)
+            : base(csharpVBRequestDispatcherFactory, workspaceServices, diagnosticService: null, listenerProvider, lspWorkspaceRegistrationService, lspLoggerFactory, threadingContext, diagnosticsClientName: null)
         {
             _defaultCapabilitiesProvider = defaultCapabilitiesProvider;
         }
@@ -56,7 +57,7 @@ public override ServerCapabilities GetCapabilities(ClientCapabilities clientCapa
             var serverCapabilities = new VSInternalServerCapabilities();
 
             // If the LSP editor feature flag is enabled advertise support for LSP features here so they are available locally and remote.
-            var isLspEditorEnabled = Workspace.Services.GetRequiredService<IExperimentationService>().IsExperimentEnabled(DefaultWorkspaceContextService.LspEditorFeatureFlagName);
+            var isLspEditorEnabled = WorkspaceServices.GetRequiredService<IExperimentationService>().IsExperimentEnabled(DefaultWorkspaceContextService.LspEditorFeatureFlagName);
             if (isLspEditorEnabled)
             {
                 serverCapabilities = (VSInternalServerCapabilities)_defaultCapabilitiesProvider.GetCapabilities(clientCapabilities);
@@ -71,7 +72,7 @@ public override ServerCapabilities GetCapabilities(ClientCapabilities clientCapa
                 };
             }
 
-            serverCapabilities.SupportsDiagnosticRequests = Workspace.IsPullDiagnostics(InternalDiagnosticsOptions.NormalDiagnosticMode);
+            serverCapabilities.SupportsDiagnosticRequests = WorkspaceServices.IsPullDiagnostics(InternalDiagnosticsOptions.NormalDiagnosticMode);
 
             // This capability is always enabled as we provide cntrl+Q VS search only via LSP in ever scenario.
             serverCapabilities.WorkspaceSymbolProvider = true;
@@ -89,6 +90,6 @@ public override ServerCapabilities GetCapabilities(ClientCapabilities clientCapa
         /// they will get no diagnostics.  When not enabled we don't show the failure box (failure will still be recorded in the task status center)
         /// as the failure is not catastrophic.
         /// </summary>
-        public override bool ShowNotificationOnInitializeFailed => Workspace.IsPullDiagnostics(InternalDiagnosticsOptions.NormalDiagnosticMode);
+        public override bool ShowNotificationOnInitializeFailed => WorkspaceServices.IsPullDiagnostics(InternalDiagnosticsOptions.NormalDiagnosticMode);
     }
 }
diff --git a/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/CodeActions/CodeActionResolveHandler.cs b/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/CodeActions/CodeActionResolveHandler.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>
     {
diff --git a/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/CodeActions/CodeActionsHandler.cs b/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/CodeActions/CodeActionsHandler.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[]>
     {
diff --git a/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/CodeActions/RunCodeActionHandler.cs b/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/CodeActions/RunCodeActionHandler.cs
@@ -23,6 +23,10 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler
     /// TO-DO: Currently, any ApplyChangesOperation that adds or removes a document must also be
     /// applied as a command due to an LSP bug (see https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1147293/).
     /// Commands must be applied from the UI thread in VS.
+    /// 
+    /// TODO - This must be moved to the MS.CA.LanguageServer.Protocol project once the
+    /// UI thread dependencies are resolved and <see cref="IThreadingContext"/> references are removed.
+    /// See https://github.com/dotnet/roslyn/issues/55142
     /// </summary>
     internal class RunCodeActionHandler : AbstractExecuteWorkspaceCommandHandler
     {
diff --git a/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/Completion/CompletionHandler.cs b/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/Completion/CompletionHandler.cs
@@ -27,6 +27,10 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler
 {
     /// <summary>
     /// Handle a completion request.
+    ///
+    /// TODO - This must be moved to the MS.CA.LanguageServer.Protocol project once the
+    /// references to VS Icon types are removed.
+    /// See https://github.com/dotnet/roslyn/issues/55142
     /// </summary>
     internal class CompletionHandler : IRequestHandler<LSP.CompletionParams, LSP.CompletionList?>
     {
diff --git a/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/Completion/CompletionResolveHandler.cs b/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/Completion/CompletionResolveHandler.cs
@@ -18,6 +18,10 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler
 {
     /// <summary>
     /// Handle a completion resolve request to add description.
+    /// 
+    /// TODO - This must be moved to the MS.CA.LanguageServer.Protocol project once the
+    /// references to VS icon types and classified text runs are removed.
+    /// See https://github.com/dotnet/roslyn/issues/55142
     /// </summary>
     internal class CompletionResolveHandler : IRequestHandler<LSP.CompletionItem, LSP.CompletionItem>
     {
diff --git a/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/Hover/HoverHandler.cs b/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/Hover/HoverHandler.cs
@@ -19,6 +19,11 @@
 
 namespace Microsoft.CodeAnalysis.LanguageServer.Handler
 {
+    /// <summary>
+    /// TODO - This must be moved to the MS.CA.LanguageServer.Protocol project once it
+    /// no longer references VS icon or classified text run types.
+    /// See https://github.com/dotnet/roslyn/issues/55142
+    /// </summary>
     [ExportRoslynLanguagesLspRequestHandlerProvider, Shared]
     [ProvidesMethod(Methods.TextDocumentHoverName)]
     internal class HoverHandler : AbstractStatelessRequestHandler<TextDocumentPositionParams, Hover?>
diff --git a/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/References/FindAllReferencesHandler.cs b/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/References/FindAllReferencesHandler.cs
@@ -18,6 +18,12 @@
 
 namespace Microsoft.CodeAnalysis.LanguageServer.Handler
 {
+    /// <summary>
+    /// TODO - This must be moved to the MS.CA.LanguageServer.Protocol project once
+    /// the <see cref="IFindUsagesService"/> is moved down to the features layer and
+    /// we no longer reference VS classified text runs.
+    /// See https://github.com/dotnet/roslyn/issues/55142
+    /// </summary>
     [ExportRoslynLanguagesLspRequestHandlerProvider, Shared]
     [ProvidesMethod(LSP.Methods.TextDocumentReferencesName)]
     internal class FindAllReferencesHandler : AbstractStatelessRequestHandler<LSP.ReferenceParams, LSP.VSInternalReferenceItem[]?>
diff --git a/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/Rename/RenameHandler.cs b/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/Rename/RenameHandler.cs
@@ -16,6 +16,11 @@
 
 namespace Microsoft.CodeAnalysis.LanguageServer.Handler
 {
+    /// <summary>
+    /// TODO - This must be moved to the MS.CA.LanguageServer.Protocol project once
+    /// we no longer reference the <see cref="IInlineRenameService"/>
+    /// See https://github.com/dotnet/roslyn/issues/55142
+    /// </summary>
     [ExportRoslynLanguagesLspRequestHandlerProvider, Shared]
     [ProvidesMethod(LSP.Methods.TextDocumentRenameName)]
     internal class RenameHandler : AbstractStatelessRequestHandler<LSP.RenameParams, WorkspaceEdit?>
diff --git a/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/Symbols/DocumentSymbolsHandler.cs b/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/Symbols/DocumentSymbolsHandler.cs
@@ -19,6 +19,10 @@
 
 namespace Microsoft.CodeAnalysis.LanguageServer.Handler
 {
+    /// <summary>
+    /// TODO - This must be moved to the MS.CA.LanguageServer.Protocol project once
+    /// we no longer reference VS icon types.
+    /// </summary>
     [ExportRoslynLanguagesLspRequestHandlerProvider, Shared]
     [ProvidesMethod(Methods.TextDocumentDocumentSymbolName)]
     internal class DocumentSymbolsHandler : AbstractStatelessRequestHandler<DocumentSymbolParams, object[]>
diff --git a/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/Symbols/WorkspaceSymbolsHandler.cs b/src/EditorFeatures/Core/Implementation/LanguageServer/Handlers/Symbols/WorkspaceSymbolsHandler.cs
@@ -16,6 +16,10 @@
 
 namespace Microsoft.CodeAnalysis.LanguageServer.Handler
 {
+    /// <summary>
+    /// TODO - This must be moved to the MS.CA.LanguageServer.Protocol project once
+    /// we no longer reference VS icon types.
+    /// </summary>
     [ExportRoslynLanguagesLspRequestHandlerProvider, Shared]
     [ProvidesMethod(Methods.WorkspaceSymbolName)]
     internal class WorkspaceSymbolsHandler : AbstractStatelessRequestHandler<WorkspaceSymbolParams, SymbolInformation[]?>
diff --git a/src/EditorFeatures/Core/Implementation/LanguageServer/ILspWorkspaceServicesProvider.cs b/src/EditorFeatures/Core/Implementation/LanguageServer/ILspWorkspaceServicesProvider.cs
@@ -0,0 +1,15 @@
+﻿// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.CodeAnalysis.Host;
+
+namespace Microsoft.CodeAnalysis.Editor.Implementation.LanguageServer;
+
+internal interface ILspWorkspaceServicesProvider
+{
+    HostWorkspaceServices GetHostWorkspaceServices();
+}
diff --git a/src/EditorFeatures/Core/Implementation/LanguageServer/LiveShareInProcLanguageClient.cs b/src/EditorFeatures/Core/Implementation/LanguageServer/LiveShareInProcLanguageClient.cs
@@ -6,6 +6,7 @@
 using System.Collections.Immutable;
 using System.ComponentModel.Composition;
 using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Editor.Implementation.LanguageServer;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Experiments;
 using Microsoft.CodeAnalysis.Host.Mef;
@@ -31,14 +32,14 @@ internal class LiveShareInProcLanguageClient : AbstractInProcLanguageClient
         [Obsolete(MefConstruction.ImportingConstructorMessage, true)]
         public LiveShareInProcLanguageClient(
             RequestDispatcherFactory csharpVBRequestDispatcherFactory,
-            VisualStudioWorkspace workspace,
+            ILspWorkspaceServicesProvider workspaceServices,
             IDiagnosticService diagnosticService,
             IAsynchronousOperationListenerProvider listenerProvider,
             ILspWorkspaceRegistrationService lspWorkspaceRegistrationService,
             DefaultCapabilitiesProvider defaultCapabilitiesProvider,
             ILspLoggerFactory lspLoggerFactory,
             IThreadingContext threadingContext)
-            : base(csharpVBRequestDispatcherFactory, workspace, diagnosticService, listenerProvider, lspWorkspaceRegistrationService, lspLoggerFactory, threadingContext, diagnosticsClientName: null)
+            : base(csharpVBRequestDispatcherFactory, workspaceServices, diagnosticService, listenerProvider, lspWorkspaceRegistrationService, lspLoggerFactory, threadingContext, diagnosticsClientName: null)
         {
             _defaultCapabilitiesProvider = defaultCapabilitiesProvider;
         }
@@ -49,7 +50,7 @@ public LiveShareInProcLanguageClient(
 
         public override ServerCapabilities GetCapabilities(ClientCapabilities clientCapabilities)
         {
-            var experimentationService = Workspace.Services.GetRequiredService<IExperimentationService>();
+            var experimentationService = WorkspaceServices.GetRequiredService<IExperimentationService>();
             var isLspEditorEnabled = experimentationService.IsExperimentEnabled(DefaultWorkspaceContextService.LspEditorFeatureFlagName);
 
             // If the preview feature flag to turn on the LSP editor in local scenarios is on, advertise no capabilities for this Live Share
diff --git a/src/EditorFeatures/Core/Implementation/LanguageServer/RazorInProcLanguageClient.cs b/src/EditorFeatures/Core/Implementation/LanguageServer/RazorInProcLanguageClient.cs
@@ -6,6 +6,7 @@
 using System.Collections.Immutable;
 using System.ComponentModel.Composition;
 using Microsoft.CodeAnalysis.Diagnostics;
+using Microsoft.CodeAnalysis.Editor.Implementation.LanguageServer;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.LanguageServer;
@@ -51,14 +52,14 @@ internal class RazorInProcLanguageClient : AbstractInProcLanguageClient
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
         public RazorInProcLanguageClient(
             RequestDispatcherFactory csharpVBRequestDispatcherFactory,
-            VisualStudioWorkspace workspace,
+            ILspWorkspaceServicesProvider workspaceServices,
             IDiagnosticService diagnosticService,
             IAsynchronousOperationListenerProvider listenerProvider,
             ILspWorkspaceRegistrationService lspWorkspaceRegistrationService,
             DefaultCapabilitiesProvider defaultCapabilitiesProvider,
             IThreadingContext threadingContext,
             ILspLoggerFactory lspLoggerFactory)
-            : base(csharpVBRequestDispatcherFactory, workspace, diagnosticService, listenerProvider, lspWorkspaceRegistrationService, lspLoggerFactory, threadingContext, ClientName)
+            : base(csharpVBRequestDispatcherFactory, workspaceServices, diagnosticService, listenerProvider, lspWorkspaceRegistrationService, lspLoggerFactory, threadingContext, ClientName)
         {
             _defaultCapabilitiesProvider = defaultCapabilitiesProvider;
         }
@@ -72,7 +73,7 @@ public override ServerCapabilities GetCapabilities(ClientCapabilities clientCapa
 
             if (capabilities is VSInternalServerCapabilities vsServerCapabilities)
             {
-                vsServerCapabilities.SupportsDiagnosticRequests = this.Workspace.IsPullDiagnostics(InternalDiagnosticsOptions.RazorDiagnosticMode);
+                vsServerCapabilities.SupportsDiagnosticRequests = this.WorkspaceServices.IsPullDiagnostics(InternalDiagnosticsOptions.RazorDiagnosticMode);
                 return vsServerCapabilities;
             }
 
diff --git a/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj b/src/EditorFeatures/Core/Microsoft.CodeAnalysis.EditorFeatures.csproj
@@ -47,6 +47,7 @@
   <ItemGroup>
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.CSharp.EditorFeatures" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.EditorFeatures.Wpf" />
+    <InternalsVisibleTo Include="Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.LanguageServer.Protocol" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.LanguageServer.Protocol.UnitTests" />
     <InternalsVisibleTo Include="Microsoft.CodeAnalysis.ExternalAccess.Debugger" />
diff --git a/src/EditorFeatures/TestUtilities/LanguageServer/AbstractLanguageServerProtocolTests.cs b/src/EditorFeatures/TestUtilities/LanguageServer/AbstractLanguageServerProtocolTests.cs
@@ -188,7 +188,7 @@ internal static LSP.SymbolInformation CreateSymbolInformation(LSP.SymbolKind kin
                 Kind = kind,
                 Name = name,
                 Location = location,
-                Icon = ProtocolConversions.GetImageIdFromGlyph(glyph)
+                Icon = VSLspExtensionConversions.GetImageIdFromGlyph(glyph)
             };
 
             if (containerName != null)
diff --git a/src/Features/Core/Portable/Diagnostics/IDiagnosticModeService.cs b/src/Features/Core/Portable/Diagnostics/IDiagnosticModeService.cs
@@ -18,22 +18,26 @@ internal interface IDiagnosticModeService : IWorkspaceService
 
     internal static class DiagnosticModeExtensions
     {
-        public static DiagnosticMode GetDiagnosticMode(this Workspace workspace, Option2<DiagnosticMode> option)
+        public static DiagnosticMode GetDiagnosticMode(this HostWorkspaceServices workspaceServices, Option2<DiagnosticMode> option)
         {
-            var service = workspace.Services.GetRequiredService<IDiagnosticModeService>();
+            var service = workspaceServices.GetRequiredService<IDiagnosticModeService>();
             return service.GetDiagnosticMode(option);
         }
 
-        public static bool IsPullDiagnostics(this Workspace workspace, Option2<DiagnosticMode> option)
+        public static bool IsPullDiagnostics(this HostWorkspaceServices workspaceServices, Option2<DiagnosticMode> option)
         {
-            var mode = GetDiagnosticMode(workspace, option);
+            var mode = GetDiagnosticMode(workspaceServices, option);
             return mode == DiagnosticMode.Pull;
         }
 
-        public static bool IsPushDiagnostics(this Workspace workspace, Option2<DiagnosticMode> option)
+        public static bool IsPullDiagnostics(this Workspace workspace, Option2<DiagnosticMode> option) => workspace.Services.IsPullDiagnostics(option);
+
+        public static bool IsPushDiagnostics(this HostWorkspaceServices workspaceServices, Option2<DiagnosticMode> option)
         {
-            var mode = GetDiagnosticMode(workspace, option);
+            var mode = GetDiagnosticMode(workspaceServices, option);
             return mode == DiagnosticMode.Push;
         }
+
+        public static bool IsPushDiagnostics(this Workspace workspace, Option2<DiagnosticMode> option) => workspace.Services.IsPushDiagnostics(option);
     }
 }
diff --git a/src/Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj b/src/Features/Lsif/Generator/Microsoft.CodeAnalysis.LanguageServerIndexFormat.Generator.csproj
@@ -54,6 +54,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\..\EditorFeatures\Core\Microsoft.CodeAnalysis.EditorFeatures.csproj" />
     <ProjectReference Include="..\..\..\Workspaces\Core\MSBuild\Microsoft.CodeAnalysis.Workspaces.MSBuild.csproj" />
     <ProjectReference Include="..\..\..\Workspaces\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.Workspaces.csproj" />
     <ProjectReference Include="..\..\..\Workspaces\VisualBasic\Portable\Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj" />
diff --git a/src/VisualStudio/Core/Def/Implementation/LanguageClient/VisualStudioLspWorkspaceServicesProvider.cs b/src/VisualStudio/Core/Def/Implementation/LanguageClient/VisualStudioLspWorkspaceServicesProvider.cs
diff --git a/src/VisualStudio/Core/Def/Implementation/VisualStudioWorkspaceContextService.cs b/src/VisualStudio/Core/Def/Implementation/VisualStudioWorkspaceContextService.cs
diff --git a/src/VisualStudio/Core/Test.Next/Services/LspDiagnosticsTests.cs b/src/VisualStudio/Core/Test.Next/Services/LspDiagnosticsTests.cs
diff --git a/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioInstanceFactory.cs b/src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioInstanceFactory.cs
diff --git a/src/VisualStudio/Xaml/Impl/Implementation/LanguageClient/XamlInProcLanguageClient.cs b/src/VisualStudio/Xaml/Impl/Implementation/LanguageClient/XamlInProcLanguageClient.cs
diff --git a/src/VisualStudio/Xaml/Impl/Implementation/LanguageClient/XamlInProcLanguageClientDisableUX.cs b/src/VisualStudio/Xaml/Impl/Implementation/LanguageClient/XamlInProcLanguageClientDisableUX.cs
diff --git a/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj b/src/Workspaces/Remote/ServiceHub/Microsoft.CodeAnalysis.Remote.ServiceHub.csproj

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,10 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler`
`27`	`27`	`{`
`28`	`28`	`/// <summary>`
`29`	`29`	`/// Handle a completion request.`
	`30`	`+ ///`
	`31`	`+ /// TODO - This must be moved to the MS.CA.LanguageServer.Protocol project once the`
	`32`	`+ /// references to VS Icon types are removed.`
	`33`	`+ /// See https://github.com/dotnet/roslyn/issues/55142`
`30`	`34`	`/// </summary>`
`31`	`35`	`internal class CompletionHandler : IRequestHandler<LSP.CompletionParams, LSP.CompletionList?>`
`32`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,10 @@ namespace Microsoft.CodeAnalysis.LanguageServer.Handler`
`18`	`18`	`{`
`19`	`19`	`/// <summary>`
`20`	`20`	`/// Handle a completion resolve request to add description.`
	`21`	`+ ///`
	`22`	`+ /// TODO - This must be moved to the MS.CA.LanguageServer.Protocol project once the`
	`23`	`+ /// references to VS icon types and classified text runs are removed.`
	`24`	`+ /// See https://github.com/dotnet/roslyn/issues/55142`
`21`	`25`	`/// </summary>`
`22`	`26`	`internal class CompletionResolveHandler : IRequestHandler<LSP.CompletionItem, LSP.CompletionItem>`
`23`	`27`	`{`