pull in options changes from main

Author: dibarbet

src/EditorFeatures/Core/Implementation/LanguageServer/AbstractInProcLanguageClient.cs

@@ -8,11 +8,8 @@
 using System.IO;
 using System.Threading;
 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.Options;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
@@ -39,11 +36,7 @@ internal abstract partial class AbstractInProcLanguageClient : ILanguageClient,
         private readonly AbstractRequestDispatcherFactory _requestDispatcherFactory;
         private readonly ILspWorkspaceRegistrationService _lspWorkspaceRegistrationService;
 
-<<<<<<< HEAD
         protected readonly IGlobalOptionService GlobalOptions;
-=======
-        protected readonly HostWorkspaceServices WorkspaceServices;
->>>>>>> 85406c0cb03 (Move LSP client integration down to editor features to support VSMac)
 
         /// <summary>
         /// Created when <see cref="ActivateAsync"/> is called.
@@ -88,11 +81,7 @@ public event AsyncEventHandler<EventArgs>? StopAsync { add { } remove { } }
 
         public AbstractInProcLanguageClient(
             AbstractRequestDispatcherFactory requestDispatcherFactory,
-<<<<<<< HEAD
             IGlobalOptionService globalOptions,
-=======
-            ILspWorkspaceServicesProvider workspaceServicesProvider,
->>>>>>> 85406c0cb03 (Move LSP client integration down to editor features to support VSMac)
             IDiagnosticService? diagnosticService,
             IAsynchronousOperationListenerProvider listenerProvider,
             ILspWorkspaceRegistrationService lspWorkspaceRegistrationService,
@@ -101,18 +90,13 @@ public AbstractInProcLanguageClient(
             string? diagnosticsClientName)
         {
             _requestDispatcherFactory = requestDispatcherFactory;
-<<<<<<< HEAD
             GlobalOptions = globalOptions;
-=======
->>>>>>> 85406c0cb03 (Move LSP client integration down to editor features to support VSMac)
             _diagnosticService = diagnosticService;
             _listenerProvider = listenerProvider;
             _lspWorkspaceRegistrationService = lspWorkspaceRegistrationService;
             _diagnosticsClientName = diagnosticsClientName;
             _lspLoggerFactory = lspLoggerFactory;
             _threadingContext = threadingContext;
-
-            WorkspaceServices = workspaceServicesProvider.GetHostWorkspaceServices();
         }
 
         public async Task<Connection?> ActivateAsync(CancellationToken cancellationToken)

src/EditorFeatures/Core/Implementation/LanguageServer/AlwaysActivateInProcLanguageClient.cs

@@ -7,7 +7,6 @@
 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.Host.Mef;
 using Microsoft.CodeAnalysis.LanguageServer;
@@ -57,7 +56,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 = WorkspaceServices.GetRequiredService<IExperimentationService>().IsExperimentEnabled(DefaultWorkspaceContextService.LspEditorFeatureFlagName);
+            var isLspEditorEnabled = GlobalOptions.GetOption(LspOptions.LspEditorFeatureFlag);
             if (isLspEditorEnabled)
             {
                 serverCapabilities = (VSInternalServerCapabilities)_defaultCapabilitiesProvider.GetCapabilities(clientCapabilities);

src/EditorFeatures/Core/Implementation/LanguageServer/ILspWorkspaceServicesProvider.cs

@@ -6,7 +6,6 @@
 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;

src/EditorFeatures/Core/Implementation/LanguageServer/LiveShareInProcLanguageClient.cs

@@ -6,7 +6,6 @@
 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;

src/EditorFeatures/Core/Implementation/LanguageServer/RazorInProcLanguageClient.cs

@@ -8,14 +8,12 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Editor;
 using Microsoft.CodeAnalysis.Editor.Implementation.LanguageClient;
-using Microsoft.CodeAnalysis.Editor.Implementation.LanguageServer;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Editor.Xaml;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.LanguageServer;
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
-using Microsoft.VisualStudio.Experimentation;
 using Microsoft.VisualStudio.LanguageServer.Client;
 using Microsoft.VisualStudio.LanguageServer.Protocol;
 using Microsoft.VisualStudio.LanguageServices.Xaml.LanguageServer;
@@ -35,21 +33,13 @@ internal class XamlInProcLanguageClient : AbstractInProcLanguageClient
         [Obsolete(MefConstruction.ImportingConstructorMessage, true)]
         public XamlInProcLanguageClient(
             XamlRequestDispatcherFactory xamlDispatcherFactory,
-<<<<<<< HEAD
             IGlobalOptionService globalOptions,
-=======
-            ILspWorkspaceServicesProvider workspaceServices,
->>>>>>> 85406c0cb03 (Move LSP client integration down to editor features to support VSMac)
             IDiagnosticService diagnosticService,
             IAsynchronousOperationListenerProvider listenerProvider,
             ILspWorkspaceRegistrationService lspWorkspaceRegistrationService,
             ILspLoggerFactory lspLoggerFactory,
             IThreadingContext threadingContext)
-<<<<<<< HEAD
             : base(xamlDispatcherFactory, globalOptions, diagnosticService, listenerProvider, lspWorkspaceRegistrationService, lspLoggerFactory, threadingContext, diagnosticsClientName: null)
-=======
-            : base(xamlDispatcherFactory, workspaceServices, diagnosticService, listenerProvider, lspWorkspaceRegistrationService, lspLoggerFactory, threadingContext, diagnosticsClientName: null)
->>>>>>> 85406c0cb03 (Move LSP client integration down to editor features to support VSMac)
         {
         }
 
@@ -74,13 +64,6 @@ public override ServerCapabilities GetCapabilities(ClientCapabilities clientCapa
         public override bool ShowNotificationOnInitializeFailed => IsXamlLspIntelliSenseEnabled();
 
         private bool IsXamlLspIntelliSenseEnabled()
-<<<<<<< HEAD
             => GlobalOptions.GetOption(XamlOptions.EnableLspIntelliSenseFeatureFlag);
-=======
-        {
-            var experimentationService = WorkspaceServices.GetRequiredService<CodeAnalysis.Experiments.IExperimentationService>();
-            return experimentationService.IsExperimentEnabled(StringConstants.EnableLspIntelliSense);
-        }
->>>>>>> 85406c0cb03 (Move LSP client integration down to editor features to support VSMac)
     }
 }

src/VisualStudio/Core/Def/Implementation/LanguageClient/VisualStudioLspWorkspaceServicesProvider.cs

@@ -8,7 +8,6 @@
 using Microsoft.CodeAnalysis.Diagnostics;
 using Microsoft.CodeAnalysis.Editor;
 using Microsoft.CodeAnalysis.Editor.Implementation.LanguageClient;
-using Microsoft.CodeAnalysis.Editor.Implementation.LanguageServer;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Editor.Xaml;
 using Microsoft.CodeAnalysis.Host.Mef;