Version 3.7.0-112.0.dev

Merge 9645a71 into dev

BUILD.gn

@@ -29,9 +29,14 @@ group("most") {
     ":dartanalyzer",
     ":ddc",
     ":runtime",
+    ":samples",
   ]
 }
 
+group("samples") {
+  deps = [ "samples/embedder:all" ]
+}
+
 group("runtime") {
   import("runtime/runtime_args.gni")
 

pkg/analysis_server/lib/src/legacy_analysis_server.dart

@@ -537,7 +537,7 @@ class LegacyAnalysisServer extends AnalysisServer {
   }
 
   /// Handle a [request] that was read from the communication channel.
-  void handleRequest(Request request) {
+  void handleRequest(Request request, CancelableToken? cancellationToken) {
     var startTime = DateTime.now();
     performance.logRequestTiming(request.clientRequestTime);
 
@@ -556,12 +556,11 @@ class LegacyAnalysisServer extends AnalysisServer {
         );
         recentPerformance.requests.add(requestPerformance!);
 
-        var cancellationToken = CancelableToken();
-        cancellationTokens[request.id] = cancellationToken;
+        var token = cancellationToken ??= CancelableToken();
+        cancellationTokens[request.id] = token;
         var generator = requestHandlerGenerators[request.method];
         if (generator != null) {
-          var handler =
-              generator(this, request, cancellationToken, performance);
+          var handler = generator(this, request, token, performance);
           if (!handler.recordsOwnAnalytics) {
             analyticsManager.startedRequest(
                 request: request, startTime: startTime);
@@ -607,7 +606,10 @@ class LegacyAnalysisServer extends AnalysisServer {
   /// Handle a [request] that was read from the communication channel.
   void handleRequestOrResponse(RequestOrResponse requestOrResponse) {
     if (requestOrResponse is Request) {
-      messageScheduler.add(LegacyMessage(request: requestOrResponse));
+      var cancellationToken = CancelableToken();
+      cancellationTokens[requestOrResponse.id] = cancellationToken;
+      messageScheduler.add(LegacyMessage(
+          request: requestOrResponse, cancellationToken: cancellationToken));
       messageScheduler.notify();
     } else if (requestOrResponse is Response) {
       handleResponse(requestOrResponse);

pkg/analysis_server/lib/src/server/message_scheduler.dart

@@ -29,8 +29,9 @@ final class DtdMessage extends MessageObject {
 /// Represents a message in the Legacy protocol format.
 final class LegacyMessage extends MessageObject {
   final legacy.Request request;
+  CancelableToken? cancellationToken;
 
-  LegacyMessage({required this.request});
+  LegacyMessage({required this.request, this.cancellationToken});
 }
 
 /// Represents a message in the LSP protocol format.
@@ -81,7 +82,8 @@ final class MessageScheduler {
             cancellationToken: message.cancellationToken);
       case LegacyMessage():
         var request = message.request;
-        (server as LegacyAnalysisServer).handleRequest(request);
+        (server as LegacyAnalysisServer)
+            .handleRequest(request, message.cancellationToken);
       case DtdMessage():
         server.dtd!.processMessage(
             message.message, message.performance, message.completer);