SymbolSearchOptions

src/Features/Core/Portable/AddPackage/AbstractAddPackageCodeFixProvider.cs

@@ -51,7 +51,7 @@ protected async Task<ImmutableArray<CodeAction>> GetAddPackagesCodeActionsAsync(
 
             var language = document.Project.Language;
 
-            var options = workspaceServices.Workspace.Options;
+            var options = document.Project.Solution.Options;
             var searchNugetPackages = options.GetOption(
                 SymbolSearchOptions.SuggestForTypesInNuGetPackages, language);
 

src/VisualStudio/Core/Def/Packaging/PackageInstallerServiceFactory.cs

@@ -18,6 +18,7 @@
 using Microsoft.CodeAnalysis.ErrorReporting;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Notification;
+using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Packaging;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Shared.TestHooks;
@@ -97,6 +98,7 @@ public PackageInstallerService(
             VSUtilities.IUIThreadOperationExecutor operationExecutor,
             IAsynchronousOperationListenerProvider listenerProvider,
             VisualStudioWorkspaceImpl workspace,
+            IGlobalOptionService globalOptions,
             SVsServiceProvider serviceProvider,
             [Import("Microsoft.VisualStudio.Shell.Interop.SAsyncServiceProvider")] object asyncServiceProvider,
             IVsEditorAdaptersFactoryService editorAdaptersFactoryService,
@@ -105,6 +107,7 @@ public PackageInstallerService(
             [Import(AllowDefault = true)] Lazy<IVsPackageSourceProvider>? packageSourceProvider)
             : base(threadingContext,
                    workspace,
+                   globalOptions,
                    SymbolSearchOptions.Enabled,
                    SymbolSearchOptions.SuggestForTypesInReferenceAssemblies,
                    SymbolSearchOptions.SuggestForTypesInNuGetPackages)

src/VisualStudio/Core/Def/SymbolSearch/AbstractDelayStartedService.cs

@@ -29,9 +29,10 @@ internal abstract class AbstractDelayStartedService : ForegroundThreadAffinitize
         private readonly List<string> _registeredLanguageNames = new();
 
         protected readonly Workspace Workspace;
+        private readonly IGlobalOptionService _globalOptions;
 
         // Option that controls if this service is enabled or not (regardless of language).
-        private readonly Option2<bool> _serviceOnOffOption;
+        private readonly Option2<bool> _globalSwitch;
 
         // Options that control if this service is enabled or not for a particular language.
         private readonly ImmutableArray<PerLanguageOption2<bool>> _perLanguageOptions;
@@ -43,12 +44,14 @@ internal abstract class AbstractDelayStartedService : ForegroundThreadAffinitize
         protected AbstractDelayStartedService(
             IThreadingContext threadingContext,
             Workspace workspace,
-            Option2<bool> onOffOption,
+            IGlobalOptionService globalOptions,
+            Option2<bool> globalSwitch,
             params PerLanguageOption2<bool>[] perLanguageOptions)
             : base(threadingContext)
         {
             Workspace = workspace;
-            _serviceOnOffOption = onOffOption;
+            _globalOptions = globalOptions;
+            _globalSwitch = globalSwitch;
             _perLanguageOptions = perLanguageOptions.ToImmutableArray();
             DisposalToken = threadingContext.DisposalToken;
         }
@@ -61,8 +64,7 @@ internal void Connect(string languageName)
         {
             this.AssertIsForeground();
 
-            var options = Workspace.Options;
-            if (!options.GetOption(_serviceOnOffOption))
+            if (!_globalOptions.GetOption(_globalSwitch))
             {
                 // Feature is totally disabled.  Do nothing.
                 return;

src/VisualStudio/Core/Def/SymbolSearch/SymbolSearchGlobalOptions.cs

@@ -0,0 +1,33 @@
+// 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.Immutable;
+using System.Composition;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Options.Providers;
+
+namespace Microsoft.CodeAnalysis.SymbolSearch
+{
+    [ExportGlobalOptionProvider, Shared]
+    internal sealed class SymbolSearchGlobalOptions : IOptionProvider
+    {
+        [ImportingConstructor]
+        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+        public SymbolSearchGlobalOptions()
+        {
+        }
+
+        ImmutableArray<IOption> IOptionProvider.Options => ImmutableArray.Create<IOption>(
+            Enabled);
+
+        private const string LocalRegistryPath = @"Roslyn\Features\SymbolSearch\";
+        private const string FeatureName = "SymbolSearchOptions";
+
+        public static readonly Option2<bool> Enabled = new(
+            FeatureName, "Enabled", defaultValue: true,
+            storageLocation: new LocalUserProfileStorageLocation(LocalRegistryPath + "Enabled"));
+    }
+}

src/VisualStudio/Core/Def/SymbolSearch/VisualStudioSymbolSearchService.cs

@@ -15,6 +15,7 @@
 using Microsoft.CodeAnalysis.AddImport;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Packaging;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.SymbolSearch;
@@ -53,10 +54,10 @@ internal partial class VisualStudioSymbolSearchService : AbstractDelayStartedSer
         public VisualStudioSymbolSearchService(
             IThreadingContext threadingContext,
             VisualStudioWorkspaceImpl workspace,
+            IGlobalOptionService globalOptions,
             VSShell.SVsServiceProvider serviceProvider)
-            : base(threadingContext, workspace, SymbolSearchOptions.Enabled,
-                              SymbolSearchOptions.SuggestForTypesInReferenceAssemblies,
-                              SymbolSearchOptions.SuggestForTypesInNuGetPackages)
+            : base(threadingContext, workspace, globalOptions, SymbolSearchOptions.Enabled,
+                  SymbolSearchOptions.SuggestForTypesInReferenceAssemblies, SymbolSearchOptions.SuggestForTypesInNuGetPackages)
         {
             _workspace = workspace;
             _installerService = workspace.Services.GetService<IPackageInstallerService>();

src/Workspaces/Core/Portable/SymbolSearch/SymbolSearchOptions.cs

@@ -2,24 +2,36 @@
 // 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.Immutable;
+using System.Composition;
+using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Options;
+using Microsoft.CodeAnalysis.Options.Providers;
 
 namespace Microsoft.CodeAnalysis.SymbolSearch
 {
-    internal static class SymbolSearchOptions
+    [ExportSolutionOptionProvider, Shared]
+    internal sealed class SymbolSearchOptions : IOptionProvider
     {
-        private const string LocalRegistryPath = @"Roslyn\Features\SymbolSearch\";
+        [ImportingConstructor]
+        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+        public SymbolSearchOptions()
+        {
+        }
 
-        public static readonly Option2<bool> Enabled = new(
-            nameof(SymbolSearchOptions), nameof(Enabled), defaultValue: true,
-            storageLocation: new LocalUserProfileStorageLocation(LocalRegistryPath + nameof(Enabled)));
+        public ImmutableArray<IOption> Options { get; } = ImmutableArray.Create<IOption>(
+            SuggestForTypesInReferenceAssemblies,
+            SuggestForTypesInNuGetPackages);
+
+        private const string FeatureName = "SymbolSearchOptions";
 
         public static PerLanguageOption2<bool> SuggestForTypesInReferenceAssemblies =
-            new(nameof(SymbolSearchOptions), nameof(SuggestForTypesInReferenceAssemblies), defaultValue: true,
+            new(FeatureName, "SuggestForTypesInReferenceAssemblies", defaultValue: true,
                 storageLocation: new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.SuggestForTypesInReferenceAssemblies"));
 
         public static PerLanguageOption2<bool> SuggestForTypesInNuGetPackages =
-            new(nameof(SymbolSearchOptions), nameof(SuggestForTypesInNuGetPackages), defaultValue: true,
+            new(FeatureName, "SuggestForTypesInNuGetPackages", defaultValue: true,
                 storageLocation: new RoamingProfileStorageLocation("TextEditor.%LANGUAGE%.Specific.SuggestForTypesInNuGetPackages"));
     }
 }