Stop listening AnalysisDriverScheduler stream during server shutdown.

So, that we don't send analyzing/idle during drivers dispose. Change-Id: I589cc368b2877baa0878d405f7ab3ca7daf31f3c Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/348763 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
dart-lang · Jan 27, 2024 · b6647fd · b6647fd
1 parent c975fdf
commit b6647fd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/pkg/analysis_server/lib/src/analysis_server.dart b/pkg/analysis_server/lib/src/analysis_server.dart
@@ -138,6 +138,8 @@ abstract class AnalysisServer {
 
   late analysis.AnalysisDriverScheduler analysisDriverScheduler;
 
+  late StreamSubscription<Object?>? analysisDriverSchedulerEventsSubscription;
+
   DeclarationsTracker? declarationsTracker;
 
   /// The DiagnosticServer for this AnalysisServer. If available, it can be used
@@ -849,6 +851,9 @@ abstract class AnalysisServer {
 
   @mustCallSuper
   Future<void> shutdown() async {
+    await analysisDriverSchedulerEventsSubscription?.cancel();
+    analysisDriverSchedulerEventsSubscription = null;
+
     // For now we record plugins only on shutdown. We might want to record them
     // every time the set of plugins changes, in which case we'll need to listen
     // to the `PluginManager.pluginsChanged` stream.

diff --git a/pkg/analysis_server/lib/src/legacy_analysis_server.dart b/pkg/analysis_server/lib/src/legacy_analysis_server.dart
@@ -406,7 +406,8 @@ class LegacyAnalysisServer extends AnalysisServer {
         ServerContextManagerCallbacks(this, resourceProvider);
     contextManager.callbacks = contextManagerCallbacks;
 
-    analysisDriverScheduler.events.listen(handleAnalysisEvent);
+    analysisDriverSchedulerEventsSubscription =
+        analysisDriverScheduler.events.listen(handleAnalysisEvent);
     analysisDriverScheduler.start();
 
     onAnalysisStarted.first.then((_) {

diff --git a/pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart b/pkg/analysis_server/lib/src/lsp/lsp_analysis_server.dart
@@ -178,7 +178,8 @@ class LspAnalysisServer extends AnalysisServer {
         LspServerContextManagerCallbacks(this, resourceProvider);
     contextManager.callbacks = contextManagerCallbacks;
 
-    analysisDriverScheduler.events.listen(handleAnalysisEvent);
+    analysisDriverSchedulerEventsSubscription =
+        analysisDriverScheduler.events.listen(handleAnalysisEvent);
     analysisDriverScheduler.start();
 
     _channelSubscription =