Version 2.18.0-158.0.dev

Merge commit '1e7bc687a7931c7bd837147b6fef60b9cf4fa42c' into 'dev'

Author: Dart CI

DEPS

@@ -90,7 +90,7 @@ vars = {
   "cli_util_rev": "b0adbba89442b2ea6fef39c7a82fe79cb31e1168",
   "clock_rev": "f594d86da123015186d5680b0d0e8255c52fc162",
   "collection_rev": "e1407da23b9f17400b3a905aafe2b8fa10db3d86",
-  "convert_rev": "e063fdca4bebffecbb5e6aa5525995120982d9ce",
+  "convert_rev": "00b251529c074df394b3391c7e3eea3dd9e5778e",
   "crypto_rev": "4297d240b0e1e780ec0a9eab23eaf1ad491f3e68",
   "csslib_rev": "518761b166974537f334dbf264e7f56cb157a96a",
 

pkg/analysis_server/lib/src/analysis_server_abstract.dart

@@ -534,6 +534,11 @@ abstract class AbstractAnalysisServer {
 
   @mustCallSuper
   void shutdown() {
+    // 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.
+    analyticsManager.changedPlugins(pluginManager);
+
     pubPackageService.shutdown();
     analyticsManager.shutdown();
   }

pkg/analysis_server/lib/src/analytics/analytics_manager.dart

@@ -5,6 +5,7 @@
 import 'package:analysis_server/lsp_protocol/protocol.dart';
 import 'package:analysis_server/protocol/protocol.dart';
 import 'package:analysis_server/src/analytics/google_analytics_manager.dart';
+import 'package:analysis_server/src/plugin/plugin_manager.dart';
 import 'package:telemetry/telemetry.dart';
 
 /// An interface for managing and reporting analytics.
@@ -19,6 +20,9 @@ abstract class AnalyticsManager {
   factory AnalyticsManager.forAnalytics(Analytics analytics) =
       GoogleAnalyticsManager;
 
+  /// Record that the set of plugins known to the [pluginManager] has changed.
+  void changedPlugins(PluginManager pluginManager);
+
   /// Record that the given [response] was sent to the client.
   void sentResponse({required Response response});
 

pkg/analysis_server/lib/src/analytics/google_analytics_manager.dart

@@ -2,10 +2,13 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+import 'dart:convert';
+
 import 'package:analysis_server/lsp_protocol/protocol.dart';
 import 'package:analysis_server/protocol/protocol.dart';
 import 'package:analysis_server/src/analytics/analytics_manager.dart';
 import 'package:analysis_server/src/analytics/percentile_calculator.dart';
+import 'package:analysis_server/src/plugin/plugin_manager.dart';
 import 'package:telemetry/telemetry.dart';
 
 /// An implementation of [AnalyticsManager] that's appropriate to use when
@@ -18,6 +21,8 @@ class GoogleAnalyticsManager implements AnalyticsManager {
   /// been invoked.
   _SessionData? _sessionData;
 
+  final _PluginData _pluginData = _PluginData();
+
   /// A map from the id of a request to data about the request.
   final Map<String, _ActiveRequestData> _activeRequests = {};
 
@@ -29,6 +34,11 @@ class GoogleAnalyticsManager implements AnalyticsManager {
   /// service.
   GoogleAnalyticsManager(this.analytics);
 
+  @override
+  void changedPlugins(PluginManager pluginManager) {
+    _pluginData.recordPlugins(pluginManager);
+  }
+
   @override
   void sentResponse({required Response response}) {
     var sendTime = DateTime.now();
@@ -59,10 +69,7 @@ class GoogleAnalyticsManager implements AnalyticsManager {
       'clientId': sessionData.clientId,
       'sdkVersion': sessionData.sdkVersion,
       'duration': duration.toString(),
-      // TODO(brianwilkerson) Report a list of the names of the plugins that
-      //  were loaded, or possibly a map from plugin names to the number of
-      //  analysis roots in which the plugins were loaded.
-      'plugins': '',
+      'plugins': _pluginData.usageCountData,
     });
     // Send response data.
     for (var data in _completedRequests.values) {
@@ -148,6 +155,48 @@ class _ActiveRequestData {
   _ActiveRequestData(this.requestName, this.clientRequestTime, this.startTime);
 }
 
+/// Data about the plugins associated with the context roots.
+class _PluginData {
+  /// The number of times that plugin information has been recorded.
+  int recordCount = 0;
+
+  /// A table mapping the ids of running plugins to the number of context roots
+  /// associated with each of the plugins.
+  Map<String, PercentileCalculator> usageCounts = {};
+
+  /// Initialize a newly created holder of plugin data.
+  _PluginData();
+
+  String get usageCountData {
+    return json.encode({
+      'recordCount': recordCount,
+      'rootCounts': _encodeUsageCounts(),
+    });
+  }
+
+  /// Use the [pluginManager] to record data about the plugins that are
+  /// currently running.
+  void recordPlugins(PluginManager pluginManager) {
+    recordCount++;
+    var plugins = pluginManager.plugins;
+    for (var i = 0; i < plugins.length; i++) {
+      var info = plugins[i];
+      usageCounts
+          .putIfAbsent(info.pluginId, () => PercentileCalculator())
+          .addValue(info.contextRoots.length);
+    }
+  }
+
+  /// Return an encoding of the [usageCounts].
+  Map<String, String> _encodeUsageCounts() {
+    var encoded = <String, String>{};
+    for (var entry in usageCounts.entries) {
+      encoded[entry.key] = entry.value.toAnalyticsString();
+    }
+    return encoded;
+  }
+}
+
 /// Data about the requests that have been responded to that have the same name.
 class _RequestData {
   /// The name of the requests.

pkg/analysis_server/lib/src/analytics/noop_analytics_manager.dart

@@ -5,10 +5,14 @@
 import 'package:analysis_server/lsp_protocol/protocol.dart';
 import 'package:analysis_server/protocol/protocol.dart';
 import 'package:analysis_server/src/analytics/analytics_manager.dart';
+import 'package:analysis_server/src/plugin/plugin_manager.dart';
 
 /// An implementation of [AnalyticsManager] that's appropriate to use when
 /// analytics have not been enabled.
 class NoopAnalyticsManager implements AnalyticsManager {
+  @override
+  void changedPlugins(PluginManager pluginManager) {}
+
   @override
   void sentResponse({required Response response}) {}
 

pkg/analysis_server_client/README.md

@@ -1,6 +1,7 @@
-# analysis_server_client
+[![pub package](https://img.shields.io/pub/v/analysis_server_client.svg)](https://pub.dev/packages/analysis_server_client)
+[![package publisher](https://img.shields.io/pub/publisher/analysis_server_client.svg)](https://pub.dev/packages/analysis_server_client/publisher)
 
-analysis_server_client is a client wrapper over Analysis Server.
+`package:analysis_server_client` is a client wrapper over the Analysis Server.
 
 ## Overview
 

pkg/analyzer/README.md

@@ -1,4 +1,5 @@
-# Analyzer for Dart
+[![pub package](https://img.shields.io/pub/v/analyzer.svg)](https://pub.dev/packages/analyzer)
+[![package publisher](https://img.shields.io/pub/publisher/analyzer.svg)](https://pub.dev/packages/analyzer/publisher)
 
 This package provides a library that performs static analysis
 of Dart code. It is useful for tool integration and embedding.

pkg/analyzer/lib/src/dart/error/ffi_code.g.dart

@@ -19,6 +19,7 @@ class FfiCode extends AnalyzerErrorCode {
     correctionMessage:
         "Try removing all type parameters, removing all members, and adding "
         "one const constructor.",
+    hasPublishedDocs: true,
   );
 
   ///  No parameters.
@@ -28,6 +29,7 @@ class FfiCode extends AnalyzerErrorCode {
         "'AbiSpecificIntegerMapping' annotation specifying the mapping from "
         "ABI to a 'NativeType' integer with a fixed size.",
     correctionMessage: "Try removing the extra annotation.",
+    hasPublishedDocs: true,
   );
 
   ///  No parameters.
@@ -37,6 +39,7 @@ class FfiCode extends AnalyzerErrorCode {
         "'AbiSpecificIntegerMapping' annotation specifying the mapping from "
         "ABI to a 'NativeType' integer with a fixed size.",
     correctionMessage: "Try adding an annotation.",
+    hasPublishedDocs: true,
   );
 
   ///  No parameters.
@@ -47,6 +50,7 @@ class FfiCode extends AnalyzerErrorCode {
     correctionMessage:
         "Try changing the value to 'Int8', 'Int16', 'Int32', 'Int64', 'Uint8', "
         "'Uint16', 'UInt32', or 'Uint64'.",
+    hasPublishedDocs: true,
   );
 
   ///  No parameters.

pkg/analyzer/lib/src/dart/error/hint_codes.g.dart

@@ -187,6 +187,7 @@ class HintCode extends AnalyzerErrorCode {
     "The operator x ~/ y is more efficient than (x / y).toInt().",
     correctionMessage:
         "Try re-writing the expression to use the '~/' operator.",
+    hasPublishedDocs: true,
   );
 
   ///  No parameters.
@@ -543,6 +544,7 @@ class HintCode extends AnalyzerErrorCode {
     "The annotation '@nonVirtual' can only be applied to a concrete instance "
         "member.",
     correctionMessage: "Try removing '@nonVirtual'.",
+    hasPublishedDocs: true,
   );
 
   ///  This hint is generated anywhere where an instance member annotated with
@@ -555,6 +557,7 @@ class HintCode extends AnalyzerErrorCode {
     'INVALID_OVERRIDE_OF_NON_VIRTUAL_MEMBER',
     "The member '{0}' is declared non-virtual in '{1}' and can't be overridden "
         "in subclasses.",
+    hasPublishedDocs: true,
   );
 
   ///  This hint is generated anywhere where `@required` annotates a named
@@ -601,6 +604,7 @@ class HintCode extends AnalyzerErrorCode {
     'INVALID_SEALED_ANNOTATION',
     "The annotation '@sealed' can only be applied to classes.",
     correctionMessage: "Try removing the '@sealed' annotation.",
+    hasPublishedDocs: true,
   );
 
   ///  Parameters:
@@ -651,6 +655,7 @@ class HintCode extends AnalyzerErrorCode {
   static const HintCode INVALID_USE_OF_VISIBLE_FOR_TESTING_MEMBER = HintCode(
     'INVALID_USE_OF_VISIBLE_FOR_TESTING_MEMBER',
     "The member '{0}' can only be used within '{1}' or a test.",
+    hasPublishedDocs: true,
   );
 
   ///  This hint is generated anywhere where a private declaration is annotated
@@ -1177,6 +1182,7 @@ class HintCode extends AnalyzerErrorCode {
     "The keyword 'final' isn't necessary because the parameter is implicitly "
         "'final'.",
     correctionMessage: "Try removing the 'final'.",
+    hasPublishedDocs: true,
   );
 
   ///  Parameters:

pkg/analyzer/lib/src/error/codes.g.dart

@@ -2762,6 +2762,7 @@ class CompileTimeErrorCode extends AnalyzerErrorCode {
     'MIXIN_SUPER_CLASS_CONSTRAINT_DEFERRED_CLASS',
     "Deferred classes can't be used as superclass constraints.",
     correctionMessage: "Try changing the import to not be deferred.",
+    hasPublishedDocs: true,
   );
 
   ///  Parameters: