Version 2.15.0-290.0.dev

Merge commit 'b0bca6ae6a0cff71ee763c32ce5924f84a40346e' into 'dev'

Author: Dart CI

pkg/_js_interop_checks/lib/src/transformations/js_util_optimizer.dart

@@ -139,11 +139,10 @@ class JsUtilOptimizer extends Transformer {
           VariableGet(function.positionalParameters.first),
           StringLiteral(_getExtensionMemberName(node))
         ], types: [
-          DynamicType()
+          function.returnType
         ]))
       ..fileOffset = node.fileOffset;
-    return ReturnStatement(
-        AsExpression(getPropertyInvocation, function.returnType));
+    return ReturnStatement(getPropertyInvocation);
   }
 
   /// Returns a new function body for the given [node] external setter.
@@ -153,18 +152,18 @@ class JsUtilOptimizer extends Transformer {
   ReturnStatement _getExternalSetterBody(Procedure node) {
     var function = node.function;
     assert(function.positionalParameters.length == 2);
+    var value = function.positionalParameters.last;
     var setPropertyInvocation = StaticInvocation(
         _setPropertyTarget,
         Arguments([
           VariableGet(function.positionalParameters.first),
           StringLiteral(_getExtensionMemberName(node)),
-          VariableGet(function.positionalParameters.last)
+          VariableGet(value)
         ], types: [
-          DynamicType()
+          value.type
         ]))
       ..fileOffset = node.fileOffset;
-    return ReturnStatement(AsExpression(
-        _lowerSetProperty(setPropertyInvocation), function.returnType));
+    return ReturnStatement(_lowerSetProperty(setPropertyInvocation));
   }
 
   /// Returns a new function body for the given [node] external method.
@@ -183,11 +182,10 @@ class JsUtilOptimizer extends Transformer {
               .map((argument) => VariableGet(argument))
               .toList())
         ], types: [
-          DynamicType()
+          function.returnType
         ]))
       ..fileOffset = node.fileOffset;
-    return ReturnStatement(AsExpression(
-        _lowerCallMethod(callMethodInvocation), function.returnType));
+    return ReturnStatement(_lowerCallMethod(callMethodInvocation));
   }
 
   /// Returns the extension member name.

pkg/analysis_server/doc/api.html

@@ -350,6 +350,8 @@ const String SERVER_NOTIFICATION_ERROR = 'server.error';
 const String SERVER_NOTIFICATION_ERROR_IS_FATAL = 'isFatal';
 const String SERVER_NOTIFICATION_ERROR_MESSAGE = 'message';
 const String SERVER_NOTIFICATION_ERROR_STACK_TRACE = 'stackTrace';
+const String SERVER_NOTIFICATION_LOG = 'server.log';
+const String SERVER_NOTIFICATION_LOG_ENTRY = 'entry';
 const String SERVER_NOTIFICATION_STATUS = 'server.status';
 const String SERVER_NOTIFICATION_STATUS_ANALYSIS = 'analysis';
 const String SERVER_NOTIFICATION_STATUS_PUB = 'pub';

pkg/analysis_server/lib/protocol/protocol_constants.dart

@@ -15871,18 +15871,249 @@ class ServerGetVersionResult implements ResponseResult {
   int get hashCode => version.hashCode;
 }
 
+/// ServerLogEntry
+///
+/// {
+///   "time": int
+///   "kind": ServerLogEntryKind
+///   "data": String
+/// }
+///
+/// Clients may not extend, implement or mix-in this class.
+class ServerLogEntry implements HasToJson {
+  /// The time (milliseconds since epoch) at which the server created this log
+  /// entry.
+  int time;
+
+  /// The kind of the entry, used to determine how to interpret the "data"
+  /// field.
+  ServerLogEntryKind kind;
+
+  /// The payload of the entry, the actual format is determined by the "kind"
+  /// field.
+  String data;
+
+  ServerLogEntry(this.time, this.kind, this.data);
+
+  factory ServerLogEntry.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object? json) {
+    json ??= {};
+    if (json is Map) {
+      int time;
+      if (json.containsKey('time')) {
+        time = jsonDecoder.decodeInt(jsonPath + '.time', json['time']);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, 'time');
+      }
+      ServerLogEntryKind kind;
+      if (json.containsKey('kind')) {
+        kind = ServerLogEntryKind.fromJson(
+            jsonDecoder, jsonPath + '.kind', json['kind']);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, 'kind');
+      }
+      String data;
+      if (json.containsKey('data')) {
+        data = jsonDecoder.decodeString(jsonPath + '.data', json['data']);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, 'data');
+      }
+      return ServerLogEntry(time, kind, data);
+    } else {
+      throw jsonDecoder.mismatch(jsonPath, 'ServerLogEntry', json);
+    }
+  }
+
+  @override
+  Map<String, Object> toJson() {
+    var result = <String, Object>{};
+    result['time'] = time;
+    result['kind'] = kind.toJson();
+    result['data'] = data;
+    return result;
+  }
+
+  @override
+  String toString() => json.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is ServerLogEntry) {
+      return time == other.time && kind == other.kind && data == other.data;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode => Object.hash(
+        time,
+        kind,
+        data,
+      );
+}
+
+/// ServerLogEntryKind
+///
+/// enum {
+///   NOTIFICATION
+///   RAW
+///   REQUEST
+///   RESPONSE
+/// }
+///
+/// Clients may not extend, implement or mix-in this class.
+class ServerLogEntryKind implements Enum {
+  /// A notification from the server, such as "analysis.highlights". The "data"
+  /// field contains a JSON object with abbreviated notification.
+  static const ServerLogEntryKind NOTIFICATION =
+      ServerLogEntryKind._('NOTIFICATION');
+
+  /// Arbitrary string, describing some event that happened in the server, e.g.
+  /// starting a file analysis, and details which files were accessed. These
+  /// entries are not structured, but provide context information about
+  /// requests and notification, and can be related by "time" for further
+  /// manual analysis.
+  static const ServerLogEntryKind RAW = ServerLogEntryKind._('RAW');
+
+  /// A request from the client, as the server views it, e.g.
+  /// "edit.getAssists". The "data" field contains a JSON object with
+  /// abbreviated request.
+  static const ServerLogEntryKind REQUEST = ServerLogEntryKind._('REQUEST');
+
+  /// Various counters and measurements related to execution of a request. The
+  /// "data" field contains a JSON object with following fields:
+  ///
+  /// - "id" - the id of the request - copied from the request.
+  /// - "method" - the method of the request, e.g. "edit.getAssists".
+  /// - "clientRequestTime" - the time (milliseconds since epoch) at which the
+  ///   client made the request - copied from the request.
+  /// - "serverRequestTime" - the time (milliseconds since epoch) at which the
+  ///   server received and decoded the JSON request.
+  /// - "responseTime" - the time (milliseconds since epoch) at which the
+  ///   server created the response to be encoded into JSON and sent to the
+  ///   client.
+  static const ServerLogEntryKind RESPONSE = ServerLogEntryKind._('RESPONSE');
+
+  /// A list containing all of the enum values that are defined.
+  static const List<ServerLogEntryKind> VALUES = <ServerLogEntryKind>[
+    NOTIFICATION,
+    RAW,
+    REQUEST,
+    RESPONSE
+  ];
+
+  @override
+  final String name;
+
+  const ServerLogEntryKind._(this.name);
+
+  factory ServerLogEntryKind(String name) {
+    switch (name) {
+      case 'NOTIFICATION':
+        return NOTIFICATION;
+      case 'RAW':
+        return RAW;
+      case 'REQUEST':
+        return REQUEST;
+      case 'RESPONSE':
+        return RESPONSE;
+    }
+    throw Exception('Illegal enum value: $name');
+  }
+
+  factory ServerLogEntryKind.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object? json) {
+    if (json is String) {
+      try {
+        return ServerLogEntryKind(json);
+      } catch (_) {
+        // Fall through
+      }
+    }
+    throw jsonDecoder.mismatch(jsonPath, 'ServerLogEntryKind', json);
+  }
+
+  @override
+  String toString() => 'ServerLogEntryKind.$name';
+
+  String toJson() => name;
+}
+
+/// server.log params
+///
+/// {
+///   "entry": ServerLogEntry
+/// }
+///
+/// Clients may not extend, implement or mix-in this class.
+class ServerLogParams implements HasToJson {
+  ServerLogEntry entry;
+
+  ServerLogParams(this.entry);
+
+  factory ServerLogParams.fromJson(
+      JsonDecoder jsonDecoder, String jsonPath, Object? json) {
+    json ??= {};
+    if (json is Map) {
+      ServerLogEntry entry;
+      if (json.containsKey('entry')) {
+        entry = ServerLogEntry.fromJson(
+            jsonDecoder, jsonPath + '.entry', json['entry']);
+      } else {
+        throw jsonDecoder.mismatch(jsonPath, 'entry');
+      }
+      return ServerLogParams(entry);
+    } else {
+      throw jsonDecoder.mismatch(jsonPath, 'server.log params', json);
+    }
+  }
+
+  factory ServerLogParams.fromNotification(Notification notification) {
+    return ServerLogParams.fromJson(
+        ResponseDecoder(null), 'params', notification.params);
+  }
+
+  @override
+  Map<String, Object> toJson() {
+    var result = <String, Object>{};
+    result['entry'] = entry.toJson();
+    return result;
+  }
+
+  Notification toNotification() {
+    return Notification('server.log', toJson());
+  }
+
+  @override
+  String toString() => json.encode(toJson());
+
+  @override
+  bool operator ==(other) {
+    if (other is ServerLogParams) {
+      return entry == other.entry;
+    }
+    return false;
+  }
+
+  @override
+  int get hashCode => entry.hashCode;
+}
+
 /// ServerService
 ///
 /// enum {
+///   LOG
 ///   STATUS
 /// }
 ///
 /// Clients may not extend, implement or mix-in this class.
 class ServerService implements Enum {
+  static const ServerService LOG = ServerService._('LOG');
+
   static const ServerService STATUS = ServerService._('STATUS');
 
   /// A list containing all of the enum values that are defined.
-  static const List<ServerService> VALUES = <ServerService>[STATUS];
+  static const List<ServerService> VALUES = <ServerService>[LOG, STATUS];
 
   @override
   final String name;
@@ -15891,6 +16122,8 @@ class ServerService implements Enum {
 
   factory ServerService(String name) {
     switch (name) {
+      case 'LOG':
+        return LOG;
       case 'STATUS':
         return STATUS;
     }

pkg/analysis_server/lib/protocol/protocol_generated.dart

@@ -32,6 +32,7 @@ import 'package:analysis_server/src/operation/operation_analysis.dart';
 import 'package:analysis_server/src/plugin/notification_manager.dart';
 import 'package:analysis_server/src/protocol_server.dart' as server;
 import 'package:analysis_server/src/search/search_domain.dart';
+import 'package:analysis_server/src/server/completion_request_aborting.dart';
 import 'package:analysis_server/src/server/crash_reporting_attachments.dart';
 import 'package:analysis_server/src/server/detachable_filesystem_manager.dart';
 import 'package:analysis_server/src/server/diagnostic_server.dart';
@@ -40,6 +41,7 @@ import 'package:analysis_server/src/server/features.dart';
 import 'package:analysis_server/src/server/sdk_configuration.dart';
 import 'package:analysis_server/src/services/flutter/widget_descriptions.dart';
 import 'package:analysis_server/src/utilities/process.dart';
+import 'package:analysis_server/src/utilities/request_statistics.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/exception/exception.dart';
@@ -114,6 +116,9 @@ class AnalysisServer extends AbstractAnalysisServer {
 
   final DetachableFileSystemManager? detachableFileSystemManager;
 
+  final CompletionRequestAborting completionRequestAborting =
+      CompletionRequestAborting();
+
   /// Initialize a newly created server to receive requests from and send
   /// responses to the given [channel].
   ///
@@ -130,6 +135,7 @@ class AnalysisServer extends AbstractAnalysisServer {
     InstrumentationService instrumentationService, {
     http.Client? httpClient,
     ProcessRunner? processRunner,
+    RequestStatisticsHelper? requestStatistics,
     DiagnosticServer? diagnosticServer,
     this.detachableFileSystemManager,
     // Disable to avoid using this in unit tests.
@@ -144,6 +150,7 @@ class AnalysisServer extends AbstractAnalysisServer {
           httpClient,
           processRunner,
           NotificationManager(channel, baseResourceProvider.pathContext),
+          requestStatistics: requestStatistics,
           enableBazelWatcher: enableBazelWatcher,
         ) {
     var contextManagerCallbacks =
@@ -164,7 +171,7 @@ class AnalysisServer extends AbstractAnalysisServer {
         io.pid,
       ).toNotification(),
     );
-    channel.listen(handleRequest, onDone: done, onError: error);
+    channel.requests.listen(handleRequest, onDone: done, onError: error);
     handlers = <server.RequestHandler>[
       ServerDomainHandler(this),
       AnalysisDomainHandler(this),