Version 2.19.0-95.0.dev

Merge commit '7d87a37d57f2b69b4e8a9ce15678aa1fe5e048d6' into 'dev'

Author: Dart CI

pkg/analysis_server/lib/src/services/refactoring/framework/refactoring_processor.dart

@@ -12,7 +12,7 @@ typedef ProducerGenerator = RefactoringProducer Function(RefactoringContext);
 class RefactoringProcessor {
   /// A list of the generators used to produce refactorings.
   static const Map<String, ProducerGenerator> generators = {
-    // 'move_to_file': MoveTopLevelToFile.new,
+    // MoveTopLevelToFile.commandName: MoveTopLevelToFile.new,
   };
 
   /// The context in which the refactorings could be applied.

pkg/analysis_server/lib/src/services/refactoring/framework/refactoring_producer.dart

@@ -17,9 +17,6 @@ abstract class RefactoringProducer {
   /// the given [_context].
   RefactoringProducer(this._context);
 
-  /// Return the command name used to apply this refactoring.
-  String get commandName;
-
   /// Return the kind of refactoring this producer produces. Subclasses should
   /// override this method if they produce a subtype of the type
   /// [CodeActionKind.Refactor], such as [CodeActionKind.RefactorExtract],

pkg/analysis_server/lib/src/services/refactoring/move_top_level_to_file.dart

@@ -8,6 +8,9 @@ import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dar
 
 /// An object that can compute a refactoring in a Dart file.
 class MoveTopLevelToFile extends RefactoringProducer {
+  /// Return the name used for this command when communicating with the client.
+  static const String commandName = 'move_top_level_to_file';
+
   @override
   late String title;
 
@@ -18,9 +21,6 @@ class MoveTopLevelToFile extends RefactoringProducer {
   /// [context].
   MoveTopLevelToFile(super.context);
 
-  @override
-  String get commandName => 'move_top_level_to_file';
-
   @override
   List<CommandParameter> get parameters => [
         CommandParameter(

pkg/analyzer/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.7.0-dev
+* Add `addImplicitCallReference` to `NodeLintRegistry`.
+
 ## 4.6.0
 * Added `DartType.element2`, so that `InterfaceType.element2` overrides it.
 

pkg/analyzer/lib/dart/ast/ast.dart

@@ -4102,9 +4102,6 @@ abstract class RecordTypeAnnotationField implements AstNode {
   /// The annotations associated with the field.
   NodeList<Annotation> get metadata;
 
-  /// The optional name of the field.
-  Token? get name;
-
   /// The type of the field.
   TypeAnnotation get type;
 }
@@ -4116,7 +4113,6 @@ abstract class RecordTypeAnnotationField implements AstNode {
 abstract class RecordTypeAnnotationNamedField
     implements RecordTypeAnnotationField {
   /// The name of the field.
-  @override
   Token get name;
 }
 

pkg/analyzer/lib/dart/element/type.dart

@@ -22,6 +22,7 @@
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type_visitor.dart';
+import 'package:meta/meta.dart';
 
 /// The type associated with elements in the element model.
 ///
@@ -424,6 +425,45 @@ abstract class ParameterizedType implements DartType {
   List<DartType> get typeArguments;
 }
 
+/// The type of a record literal or a record type annotation.
+///
+/// Clients may not extend, implement or mix-in this class.
+@experimental
+abstract class RecordType implements DartType {
+  /// The named fields (might be empty).
+  List<RecordTypeNamedField> get namedFields;
+
+  /// The positional fields (might be empty).
+  List<RecordTypePositionalField> get positionalFields;
+}
+
+/// A field in a [RecordType].
+///
+/// Clients may not extend, implement or mix-in this class.
+@experimental
+abstract class RecordTypeField {
+  /// Returns metadata associated with the field.
+  List<ElementAnnotation> get metadata;
+
+  /// The type of the field.
+  DartType get type;
+}
+
+/// A named field in a [RecordType].
+///
+/// Clients may not extend, implement or mix-in this class.
+@experimental
+abstract class RecordTypeNamedField implements RecordTypeField {
+  /// The name of the field.
+  String get name;
+}
+
+/// A positional field in a [RecordType].
+///
+/// Clients may not extend, implement or mix-in this class.
+@experimental
+abstract class RecordTypePositionalField implements RecordTypeField {}
+
 /// The type introduced by a type parameter.
 ///
 /// Clients may not extend, implement or mix-in this class.

pkg/analyzer/lib/src/lint/linter_visitor.dart

@@ -402,6 +402,12 @@ class LinterVisitor extends RecursiveAstVisitor<void> {
     super.visitImplementsClause(node);
   }
 
+  @override
+  void visitImplicitCallReference(ImplicitCallReference node) {
+    _runSubscriptions(node, registry._forImplicitCallReference);
+    super.visitImplicitCallReference(node);
+  }
+
   @override
   void visitImportDirective(ImportDirective node) {
     _runSubscriptions(node, registry._forImportDirective);
@@ -861,6 +867,8 @@ class NodeLintRegistry {
   final List<_Subscription<IfElement>> _forIfElement = [];
   final List<_Subscription<IfStatement>> _forIfStatement = [];
   final List<_Subscription<ImplementsClause>> _forImplementsClause = [];
+  final List<_Subscription<ImplicitCallReference>> _forImplicitCallReference =
+      [];
   final List<_Subscription<ImportDirective>> _forImportDirective = [];
   final List<_Subscription<IndexExpression>> _forIndexExpression = [];
   final List<_Subscription<InstanceCreationExpression>>
@@ -1215,6 +1223,11 @@ class NodeLintRegistry {
     _forImplementsClause.add(_Subscription(linter, visitor, _getTimer(linter)));
   }
 
+  void addImplicitCallReference(LintRule linter, AstVisitor visitor) {
+    _forImplicitCallReference
+        .add(_Subscription(linter, visitor, _getTimer(linter)));
+  }
+
   void addImportDirective(LintRule linter, AstVisitor visitor) {
     _forImportDirective.add(_Subscription(linter, visitor, _getTimer(linter)));
   }

pkg/analyzer/pubspec.yaml

@@ -1,5 +1,5 @@
 name: analyzer
-version: 4.6.0
+version: 4.7.0-dev
 description: This package provides a library that performs static analysis of Dart code.
 repository: https://github.com/dart-lang/sdk/tree/main/pkg/analyzer
 

pkg/dart2js_info/bin/src/to_devtools_format.dart

@@ -60,6 +60,18 @@ class DevtoolsFormatCommand extends Command<void> with PrintUsageException {
     output['n'] = '';
     output['type'] = "web";
 
+    /// Adds "isDeferred" flag to each child of a treeMap using a helper stack.
+    void addDeferredFlag(Map<String, dynamic> treeMap, bool flag) {
+      List<dynamic> stack = [];
+      treeMap['isDeferred'] = flag;
+      stack.add(treeMap);
+      while (stack.isNotEmpty) {
+        var item = stack.removeLast();
+        item['isDeferred'] = flag;
+        stack.addAll(item['children'] ?? []);
+      }
+    }
+
     if (outputUnits.length == 1) {
       vm.ProgramInfo programInfoTree =
           builder.build(allInfo, outputUnits.keys.first);
@@ -77,34 +89,18 @@ class DevtoolsFormatCommand extends Command<void> with PrintUsageException {
         treeMap['n'] = treemapRoots[outputUnitName];
         if (treeMap['n'] == 'main') {
           mainOutput.addAll(treeMap);
-          treeMap['isDeferred'] = false;
-          // recursively visit children
-          List<dynamic> mainStack = [];
-          mainStack.add(treeMap);
-          while (mainStack.isNotEmpty) {
-            var item = mainStack.removeLast();
-            item['isDeferred'] = false;
-            mainStack.addAll(item['children'] ?? []);
-          }
+          // Recursively tag each child in treeMap with "isDeferred" flag
+          addDeferredFlag(treeMap, false);
         } else {
           Map<String, dynamic> deferredOutput = {};
           deferredOutput.addAll(treeMap);
-          treeMap['isDeferred'] = true;
-          List<dynamic> deferredStack = [];
-          deferredStack.add(treeMap);
-          while (deferredStack.isNotEmpty) {
-            var item = deferredStack.removeLast();
-            item['isDeferred'] = true;
-            deferredStack.addAll(item['children'] ?? []);
-          }
+          addDeferredFlag(treeMap, true);
           deferredOutputs.add(deferredOutput);
         }
         treeMap['value'] = treemapSizes[outputUnitName];
       }
       output['children'].add(mainOutput);
-      for (var deferredUnit in deferredOutputs) {
-        output['children'].add(deferredUnit);
-      }
+      output['children'].addAll(deferredOutputs);
     }
     if (outputPath == null) {
       print(jsonEncode(output));
@@ -119,7 +115,7 @@ class DevtoolsFormatCommand extends Command<void> with PrintUsageException {
 /// The [vm.ProgramInfoNode] tree has a similar structure to the [AllInfo] tree
 /// except that the root has packages, libraries, constants, and typedefs as
 /// immediate children.
-class ProgramInfoBuilder extends VMProgramInfoVisitor<vm.ProgramInfoNode> {
+class ProgramInfoBuilder extends VMProgramInfoVisitor<vm.ProgramInfoNode?> {
   final AllInfo info;
 
   final program = vm.ProgramInfo();
@@ -141,9 +137,12 @@ class ProgramInfoBuilder extends VMProgramInfoVisitor<vm.ProgramInfoNode> {
   String compositeName(String name, String outputUnitName) =>
       "$name/$outputUnitName";
 
+  /// Mapping between the name of an OutputUnitInfo and the OutputUnitInfo object.
+  Map<String, OutputUnitInfo> outputUnitInfos = {};
+
   /// Mapping between the composite name of a package and the corresponding
-  /// [vm.ProgramInfoNode] objects of [vm.NodeType.packageNode].
-  final Map<String, dynamic> packageInfoNodes = {};
+  /// [PackageInfo] objects.
+  final Map<String, PackageInfo> packageInfos = {};
 
   /// Mapping between an <unnamed> [LibraryInfo] object and the name of the
   /// corresponding [vm.ProgramInfoNode] object.
@@ -159,25 +158,42 @@ class ProgramInfoBuilder extends VMProgramInfoVisitor<vm.ProgramInfoNode> {
       libraryName = longName(libraryInfo, useLibraryUri: true, forId: true);
     }
     String packageName = libraryGroupName(libraryInfo) ?? libraryName;
-    vm.ProgramInfoNode? packageInfoNode = packageInfoNodes[packageName];
+    String compositePackageName = compositeName(packageName, outputUnitName);
+    vm.ProgramInfoNode? packageInfoNode = infoNodesByName[compositePackageName];
     if (packageInfoNode == null) {
-      String compositePackageName = compositeName(packageName, outputUnitName);
       vm.ProgramInfoNode newPackage = outputUnit.makeNode(
-          name: compositePackageName,
+          name: packageName,
           parent: outputUnit.root,
           type: vm.NodeType.packageNode);
-      newPackage.size = libraryInfo.size;
-      packageInfoNodes[compositePackageName] = newPackage;
+      newPackage.size = 0;
       outputUnit.root.children[compositePackageName] = newPackage;
       var packageNode = infoNodesByName[compositePackageName];
       assert(packageNode == null,
           "encountered package with duplicated name: $compositePackageName");
       infoNodesByName[compositePackageName] = newPackage;
-    } else {
-      packageInfoNode.size = (packageInfoNode.size ?? 0) + libraryInfo.size;
+
+      /// Add the corresponding [PackageInfo] node in the [AllInfo] tree.
+      OutputUnitInfo packageUnit = outputUnitInfos[outputUnitName]!;
+      PackageInfo newPackageInfo =
+          PackageInfo(packageName, packageUnit, newPackage.size!);
+      newPackageInfo.libraries.add(libraryInfo);
+      info.packages.add(newPackageInfo);
     }
   }
 
+  /// Aggregates the size of a library [vm.ProgramInfoNode] from the sizes of
+  /// its top level children in the same output unit.
+  int collectSizesForOutputUnit(
+      Iterable<BasicInfo> infos, String outputUnitName) {
+    int sizes = 0;
+    for (var info in infos) {
+      if (info.outputUnit!.filename == outputUnitName) {
+        sizes += info.size;
+      }
+    }
+    return sizes;
+  }
+
   void makeLibrary(LibraryInfo libraryInfo, String outputUnitName) {
     vm.ProgramInfo outputUnit = outputUnits[outputUnitName]!;
     String libraryName = libraryInfo.name;
@@ -190,11 +206,18 @@ class ProgramInfoBuilder extends VMProgramInfoVisitor<vm.ProgramInfoNode> {
     vm.ProgramInfoNode parentNode = infoNodesByName[compositePackageName]!;
     String compositeLibraryName = compositeName(libraryName, outputUnitName);
     vm.ProgramInfoNode newLibrary = outputUnit.makeNode(
-        name: compositeLibraryName,
-        parent: parentNode,
-        type: vm.NodeType.libraryNode);
-    newLibrary.size = libraryInfo.size;
+        name: libraryName, parent: parentNode, type: vm.NodeType.libraryNode);
+    newLibrary.size = 0;
+    newLibrary.size = (newLibrary.size ?? 0) +
+        collectSizesForOutputUnit(
+            libraryInfo.topLevelFunctions, outputUnitName) +
+        collectSizesForOutputUnit(
+            libraryInfo.topLevelVariables, outputUnitName) +
+        collectSizesForOutputUnit(libraryInfo.classes, outputUnitName) +
+        collectSizesForOutputUnit(libraryInfo.classTypes, outputUnitName) +
+        collectSizesForOutputUnit(libraryInfo.typedefs, outputUnitName);
     parentNode.children[newLibrary.name] = newLibrary;
+    parentNode.size = (parentNode.size ?? 0) + newLibrary.size!;
     vm.ProgramInfoNode? libraryNode = infoNodesByName[compositeLibraryName];
     assert(libraryNode == null,
         "encountered library with duplicated name: $compositeLibraryName");
@@ -268,7 +291,7 @@ class ProgramInfoBuilder extends VMProgramInfoVisitor<vm.ProgramInfoNode> {
   ///
   /// Note: we might want to create a separate [vm.NodeType.fieldNode] to
   /// differentiate fields from other miscellaneous nodes for constructing
-  /// the call graph.
+  /// the call graph in the future.
   void makeField(FieldInfo fieldInfo) {
     Info? parent = fieldInfo.parent;
     String outputUnitName = fieldInfo.outputUnit!.filename;
@@ -387,6 +410,7 @@ class ProgramInfoBuilder extends VMProgramInfoVisitor<vm.ProgramInfoNode> {
   @override
   vm.ProgramInfoNode visitOutput(OutputUnitInfo info) {
     vm.ProgramInfo? outputUnit = outputUnits[info.filename];
+    outputUnitInfos[info.filename] = info;
     assert(outputUnit == null, "encountered outputUnit with duplicated name");
     var newUnit = vm.ProgramInfo();
     outputUnits[info.filename] = newUnit;
@@ -399,9 +423,6 @@ class ProgramInfoBuilder extends VMProgramInfoVisitor<vm.ProgramInfoNode> {
     for (var package in info.packages) {
       visitPackage(package, outputUnitName);
     }
-    for (var library in info.libraries) {
-      visitLibrary(library, outputUnitName);
-    }
     info.constants.forEach(makeConstant);
     info.constants.forEach(visitConstant);
     return outputUnits[outputUnitName]!.root;
@@ -422,7 +443,7 @@ class ProgramInfoBuilder extends VMProgramInfoVisitor<vm.ProgramInfoNode> {
   }
 
   @override
-  vm.ProgramInfoNode visitLibrary(LibraryInfo info, String outputUnitName) {
+  vm.ProgramInfoNode? visitLibrary(LibraryInfo info, String outputUnitName) {
     info.topLevelFunctions.forEach(makeFunction);
     info.topLevelFunctions.forEach(visitFunction);
     info.topLevelVariables.forEach(makeField);
@@ -433,9 +454,11 @@ class ProgramInfoBuilder extends VMProgramInfoVisitor<vm.ProgramInfoNode> {
     info.classTypes.forEach(visitClassType);
     info.typedefs.forEach(makeTypedef);
     info.typedefs.forEach(visitTypedef);
-    return infoNodesByName[compositeName(info.name, outputUnitName)] ??
-        infoNodesByName[
-            compositeName(unnamedLibraries[info]!, outputUnitName)]!;
+    vm.ProgramInfoNode currentLibrary =
+        infoNodesByName[compositeName(info.name, outputUnitName)] ??
+            infoNodesByName[
+                compositeName(unnamedLibraries[info]!, outputUnitName)]!;
+    return currentLibrary;
   }
 
   @override

pkg/dart2js_info/lib/info.dart

@@ -193,13 +193,10 @@ class ProgramInfo {
 /// Note that PackageInfo is only used for converting dart2js info to
 /// vm_snapshot_analysis ProgramInfo and is not expected for --dump-info output.
 class PackageInfo extends BasicInfo {
-  /// Canonical uri that identifies the package
-  late final Uri uri;
-
   /// All libraries defined within the package
   List<LibraryInfo> libraries = <LibraryInfo>[];
 
-  PackageInfo(String name, this.uri, OutputUnitInfo outputUnit, int size)
+  PackageInfo(String name, OutputUnitInfo outputUnit, int size)
       : super(InfoKind.package, name, outputUnit, size, null);
 
   @override