Undo some

Author: MikhailArkhipov

src/Analysis/Engine/Impl/Intellisense/AnalysisQueue.cs

@@ -31,7 +31,6 @@ internal sealed class AnalysisQueue : IDisposable {
         private static readonly AsyncLocal<AnalysisQueue> _current = new AsyncLocal<AnalysisQueue>();
         public static AnalysisQueue Current => _current.Value;
 
-        private readonly DisposeToken _disposeToken = DisposeToken.Create<AnalysisQueue>();
         private readonly HashSet<IGroupableAnalysisProject> _enqueuedGroups;
         private readonly PriorityProducerConsumer<QueueItem> _ppc;
         private readonly Task _consumerTask;
@@ -161,7 +160,6 @@ public void Dispose() {
                     Trace.TraceWarning("Failed to wait for worker thread to terminate");
                 }
             }
-            _disposeToken.TryMarkDisposed();
         }
 
         private struct QueueItem {

src/LanguageServer/Impl/Implementation/Server.cs

@@ -95,15 +95,18 @@ public Server() {
             _editorFiles = new EditorFiles(this);
 
             _disposableBag
-                .Add(ProjectFiles)
                 .Add(() => {
                     foreach (var ext in _extensions.Values) {
                         (ext as IDisposable)?.Dispose();
                     }
                     foreach (var ext in _oldExtensions.Values) {
                         (ext as IDisposable)?.Dispose();
                     }
-                });
+                })
+                .Add(ProjectFiles)
+                .Add(() => Analyzer?.Dispose())
+                .Add(AnalysisQueue)
+                .Add(() => _shutdownCts.Cancel());
         }
 
         private void Analysis_UnhandledException(object sender, UnhandledExceptionEventArgs e) {
@@ -118,12 +121,7 @@ private void Analysis_UnhandledException(object sender, UnhandledExceptionEventA
         internal ServerSettings Settings { get; private set; } = new ServerSettings();
         internal ProjectFiles ProjectFiles { get; } = new ProjectFiles();
 
-        public void Dispose() {
-            _shutdownCts.Cancel();
-            AnalysisQueue.Dispose();
-            Analyzer?.Dispose();
-            _disposableBag.TryDispose();
-        }
+        public void Dispose()  => _disposableBag.TryDispose();
 
         #region ILogger
         public void TraceMessage(IFormattable message) {