Merge pull request #14058 from CyrusNajmabadi/delayLoadSimplification

Simplify our delay-loaded services.

src/VisualStudio/Core/Def/Implementation/LanguageService/AbstractPackage`2.cs

@@ -127,9 +127,6 @@ protected void RegisterLanguageService(Type t, Func<object> serviceCreator)
 
         protected override void Dispose(bool disposing)
         {
-            _packageInstallerService?.Disconnect(this.RoslynLanguageName);
-            _symbolSearchService?.Disconnect(this.RoslynLanguageName);
-
             if (_miscellaneousFilesWorkspace != null)
             {
                 _miscellaneousFilesWorkspace.StopSolutionCrawler();

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

@@ -101,20 +101,6 @@ protected override void EnableService()
             _packageServices.SourcesChanged += OnSourceProviderSourcesChanged;
         }
 
-        protected override void StopWorking()
-        {
-            this.AssertIsForeground();
-
-            if (!IsEnabled)
-            {
-                return;
-            }
-
-            // Stop listening to workspace changes.
-            _workspace.WorkspaceChanged -= OnWorkspaceChanged;
-            _packageServices.SourcesChanged -= OnSourceProviderSourcesChanged;
-        }
-
         protected override void StartWorking()
         {
             this.AssertIsForeground();

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

@@ -43,7 +43,6 @@ internal abstract class AbstractDelayStartedService : ForegroundThreadAffinitize
         protected abstract void EnableService();
 
         protected abstract void StartWorking();
-        protected abstract void StopWorking();
 
         internal void Connect(string languageName)
         {
@@ -95,30 +94,5 @@ private bool IsRegisteredForLanguage(string language)
             var options = Workspace.Options;
             return _perLanguageOptions.Any(o => options.GetOption(o, language));
         }
-
-        internal void Disconnect(string languageName)
-        {
-            this.AssertIsForeground();
-
-            var options = Workspace.Options;
-            if (!options.GetOption(_serviceOnOffOption))
-            {
-                // Feature is totally disabled.  Do nothing.
-                return;
-            }
-
-            _registeredLanguageNames.Remove(languageName);
-            if (_registeredLanguageNames.Count == 0)
-            {
-                if (_enabled)
-                {
-                    _enabled = false;
-                    StopWorking();
-                }
-
-                var optionsService = Workspace.Services.GetService<IOptionService>();
-                optionsService.OptionChanged -= OnOptionChanged;
-            }
-        }
     }
 }
\ No newline at end of file

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

@@ -140,12 +140,6 @@ protected override void StartWorking()
             }
         }
 
-        protected override void StopWorking()
-        {
-            _installerService.PackageSourcesChanged -= OnPackageSourcesChanged;
-            _cancellationTokenSource.Cancel();
-        }
-
         public IEnumerable<PackageWithTypeResult> FindPackagesWithType(
             string source, string name, int arity, CancellationToken cancellationToken)
         {