Version 3.7.0-321.0.dev

Merge bdf8c21 into dev
dart-lang · Jan 11, 2025 · 2229972 · 2229972
2 parents f585c17 + bdf8c21
commit 2229972
Show file tree

Hide file tree

Showing 8 changed files with 167 additions and 176 deletions.
diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart
@@ -1191,7 +1191,7 @@ class CompilationUnitElementImpl extends UriReferencedElementImpl
   }
 
   @override
-  ClassElement? getClass(String className) {
+  ClassElementImpl? getClass(String className) {
     for (var class_ in classes) {
       if (class_.name == className) {
         return class_;
@@ -3679,8 +3679,7 @@ abstract class ExecutableElementImpl extends _ExistingElementImpl
   }
 
   @override
-  List<FormalParameterFragment> get formalParameters =>
-      parameters.cast<FormalParameterFragment>();
+  List<ParameterElementImpl> get formalParameters => parameters;
 
   @override
   bool get hasImplicitReturnType {
@@ -5901,11 +5900,11 @@ abstract class InterfaceElementImpl extends InstanceElementImpl
 
   /// The non-nullable instance of this element, without alias.
   /// Should be used only when the element has no type parameters.
-  InterfaceType? _nonNullableInstance;
+  InterfaceTypeImpl? _nonNullableInstance;
 
   /// The nullable instance of this element, without alias.
   /// Should be used only when the element has no type parameters.
-  InterfaceType? _nullableInstance;
+  InterfaceTypeImpl? _nullableInstance;
 
   List<ConstructorElementImpl> _constructors = _Sentinel.constructorElement;
 
@@ -6078,7 +6077,7 @@ abstract class InterfaceElementImpl extends InstanceElementImpl
   }
 
   @override
-  InterfaceType instantiate({
+  InterfaceTypeImpl instantiate({
     required List<DartType> typeArguments,
     required NullabilitySuffix nullabilitySuffix,
   }) {
@@ -7091,7 +7090,7 @@ class LibraryElementImpl extends ElementImpl
   }
 
   @override
-  ClassElement? getClass(String name) {
+  ClassElementImpl? getClass(String name) {
     for (var unitElement in units) {
       var element = unitElement.getClass(name);
       if (element != null) {

diff --git a/pkg/analyzer/lib/src/dart/element/extensions.dart b/pkg/analyzer/lib/src/dart/element/extensions.dart
@@ -205,17 +205,6 @@ extension LibraryExtension2 on LibraryElement2? {
       this?.featureSet.isEnabled(Feature.wildcard_variables) ?? false;
 }
 
-extension ListOfParameterElementExtension on List<ParameterElement> {
-  /// Returns `this` as `List<ParameterElementImpl>`, converting if it isn't
-  /// one already.
-  List<ParameterElementImpl> toImpl() {
-    return switch (this) {
-      List<ParameterElementImpl> already => already,
-      _ => [for (var p in this) p.toImpl()],
-    };
-  }
-}
-
 extension ParameterElementExtension on ParameterElement {
   /// Return [ParameterElement] with the specified properties replaced.
   ParameterElementImpl copyWith({

diff --git a/pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart b/pkg/analyzer/lib/src/dart/element/inheritance_manager3.dart
@@ -1142,7 +1142,11 @@ class InheritanceManager3 {
       result.name2 = fragmentName;
       result.typeParameters = resultType.typeFormals.cast();
       result.returnType = resultType.returnType;
-      result.parameters = resultType.parameters.toImpl();
+      // `resultType` is guaranteed to have been produced by
+      // `TypeSystemImpl.topMerge`; when that function merges function types, it
+      // always produces a `FunctionType` whose parameter list is a
+      // `List<ParameterElementImpl>`.
+      result.parameters = resultType.parameters as List<ParameterElementImpl>;
       result.element = MethodElementImpl2(
         Reference.root(), // TODO(scheglov): wrong
         firstMethod.name,
@@ -1160,7 +1164,11 @@ class InheritanceManager3 {
       result.isGetter = firstAccessor.isGetter;
       result.isSetter = firstAccessor.isSetter;
       result.returnType = resultType.returnType;
-      result.parameters = resultType.parameters.toImpl();
+      // `resultType` is guaranteed to have been produced by
+      // `TypeSystemImpl.topMerge`; when that function merges function types, it
+      // always produces a `FunctionType` whose parameter list is a
+      // `List<ParameterElementImpl>`.
+      result.parameters = resultType.parameters as List<ParameterElementImpl>;
 
       var field = FieldElementImpl(variableName, -1);
       field.enclosingElement3 = targetClass;

diff --git a/pkg/analyzer/lib/src/dart/element/top_merge.dart b/pkg/analyzer/lib/src/dart/element/top_merge.dart
@@ -172,7 +172,7 @@ class TopMergeHelper {
       throw _TopMergeStateError(T, S, 'Different number of formal parameters');
     }
 
-    var R_parameters = <ParameterElement>[];
+    var R_parameters = <ParameterElementImpl>[];
     for (var i = 0; i < T_parameters.length; i++) {
       var T_parameter = T_parameters[i];
       var S_parameter = S_parameters[i];