Version 3.4.0-82.0.dev

Merge b6647fd into dev

Author: Dart CI

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.

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((_) {

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 =

tools/VERSION

@@ -27,5 +27,5 @@ CHANNEL dev
 MAJOR 3
 MINOR 4
 PATCH 0
-PRERELEASE 81
+PRERELEASE 82
 PRERELEASE_PATCH 0