Version 3.7.0-71.0.dev

Merge 2202f10 into dev

DEPS

@@ -71,9 +71,9 @@ vars = {
   # self-service update these by following the go/dart-engprod/browsers.md
   # instructions. d8, the V8 shell, is always checked out.
   "checkout_javascript_engines": False,
-  "d8_tag": "version:13.1.113",
-  "jsshell_tag": "version:130.0.1",
-  "jsc_tag": "version:284301",
+  "d8_tag": "version:13.2.70",
+  "jsshell_tag": "version:131.0.3",
+  "jsc_tag": "version:285702",
 
   # https://chrome-infra-packages.appspot.com/p/fuchsia/third_party/clang
   "clang_version": "git_revision:3928edecfbd116d56bbe7411365d50bb567380a1",

pkg/analyzer/CHANGELOG.md

@@ -32,6 +32,7 @@
 * Remove deprecated `source_io.dart`.
 * Remove deprecated `lint/Spelunker`.
 * Remove deprecated `source_resource.dart`.
+* Remove `MultiplyInheritedExecutableElement`.
 
 ## 6.11.0
 * Un-deprecated `LibraryElement.exportedLibraries`.

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

@@ -2119,15 +2119,6 @@ abstract class MultiplyDefinedElement implements Element {
   List<Element> get conflictingElements;
 }
 
-/// An [ExecutableElement], with the additional information of a list of
-/// [ExecutableElement]s from which this element was composed.
-///
-/// Clients may not extend, implement or mix-in this class.
-abstract class MultiplyInheritedExecutableElement implements ExecutableElement {
-  /// The executable elements defined within this executable element.
-  List<ExecutableElement> get inheritedElements;
-}
-
 /// An object that controls how namespaces are combined.
 ///
 /// Clients may not extend, implement or mix-in this class.

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -96,7 +96,7 @@ import 'package:meta/meta.dart';
 // TODO(scheglov): Clean up the list of implicitly analyzed files.
 class AnalysisDriver {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 403;
+  static const int DATA_VERSION = 404;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.

pkg/analyzer/lib/src/dart/element/element.dart

@@ -175,13 +175,19 @@ abstract class AugmentedInterfaceElementImpl
 
 class AugmentedMixinElementImpl extends AugmentedInterfaceElementImpl
     with MaybeAugmentedMixinElementMixin {
+  @override
+  final Reference reference;
+
   @override
   final MixinElementImpl declaration;
 
   @override
   List<InterfaceType> superclassConstraints = [];
 
-  AugmentedMixinElementImpl(this.declaration);
+  AugmentedMixinElementImpl(this.reference, this.declaration) {
+    reference.element2 = this;
+    declaration.augmentedInternal = this;
+  }
 }
 
 class BindPatternVariableElementImpl extends PatternVariableElementImpl
@@ -7202,6 +7208,9 @@ mixin MaybeAugmentedMixinElementMixin on MaybeAugmentedInterfaceElementMixin
   @override
   bool get isBase => declaration.isBase;
 
+  /// See [ElementImpl2.reference].
+  Reference get reference;
+
   @override
   T? accept2<T>(ElementVisitor2<T> visitor) {
     return visitor.visitMixinElement(this);
@@ -7737,21 +7746,14 @@ class MixinElementImpl extends ClassOrMixinElementImpl
   /// The list will be empty if this class is not a mixin declaration.
   late List<String> superInvokedNames;
 
-  late MaybeAugmentedMixinElementMixin augmentedInternal =
-      NotAugmentedMixinElementImpl(this);
+  late MaybeAugmentedMixinElementMixin augmentedInternal;
 
   /// Initialize a newly created class element to have the given [name] at the
   /// given [offset] in the file that contains the declaration of this element.
   MixinElementImpl(super.name, super.offset);
 
   @override
   MaybeAugmentedMixinElementMixin get augmented {
-    if (isAugmentation) {
-      if (augmentationTarget case var augmentationTarget?) {
-        return augmentationTarget.augmented;
-      }
-    }
-
     linkedData?.read(this);
     return augmentedInternal;
   }
@@ -7771,7 +7773,7 @@ class MixinElementImpl extends ClassOrMixinElementImpl
   }
 
   @override
-  MixinElement2 get element => super.element as MixinElement2;
+  MaybeAugmentedMixinElementMixin get element => augmented;
 
   @override
   bool get isBase {
@@ -8468,10 +8470,16 @@ abstract class NotAugmentedInterfaceElementImpl
 
 class NotAugmentedMixinElementImpl extends NotAugmentedInterfaceElementImpl
     with MaybeAugmentedMixinElementMixin {
+  @override
+  final Reference reference;
+
   @override
   final MixinElementImpl element;
 
-  NotAugmentedMixinElementImpl(this.element);
+  NotAugmentedMixinElementImpl(this.reference, this.element) {
+    reference.element2 = this;
+    declaration.augmentedInternal = this;
+  }
 
   @override
   MixinElementImpl get declaration => element;
@@ -8483,7 +8491,7 @@ class NotAugmentedMixinElementImpl extends NotAugmentedInterfaceElementImpl
 
   @override
   AugmentedMixinElementImpl toAugmented() {
-    var augmented = AugmentedMixinElementImpl(declaration);
+    var augmented = AugmentedMixinElementImpl(reference, declaration);
     declaration.augmentedInternal = augmented;
     return augmented;
   }

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

@@ -204,14 +204,6 @@ abstract class LintRule {
   /// visiting nodes.
   late ErrorReporter _reporter;
 
-  /// Description (in markdown format) suitable for display in a detailed lint
-  /// description.
-  ///
-  /// This property is deprecated and will be removed in a future release.
-  @Deprecated('Use .description for a short description and consider placing '
-      'long-form documentation on an external website.')
-  final String details;
-
   /// Short description suitable for display in console output.
   final String description;
 
@@ -230,9 +222,6 @@ abstract class LintRule {
     @Deprecated('Lint rule categories are no longer used. Remove the argument.')
     this.categories = const <String>{},
     required this.description,
-    @Deprecated("Specify 'details' for a short description and consider "
-        'placing long-form documentation on an external website.')
-    this.details = '',
     State? state,
   }) : state = state ?? State.stable();