Elements. Require ConstructorElementImpl for ConstructorMember.

Change-Id: I8b9ddca7aeaa6c40a03819d16cea50c189dea426
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/416882
Reviewed-by: Paul Berry <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

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

@@ -15265,7 +15265,7 @@ final class RedirectingConstructorInvocationImpl
   ArgumentListImpl _argumentList;
 
   @override
-  ConstructorElementMixin? staticElement;
+  ConstructorElementImpl? staticElement;
 
   /// Initializes a newly created redirecting invocation to invoke the
   /// constructor with the given name with the given arguments.
@@ -15302,9 +15302,9 @@ final class RedirectingConstructorInvocationImpl
 
   @experimental
   @override
-  ConstructorElementMixin2? get element => staticElement?.asElement2;
+  ConstructorElementImpl2? get element => staticElement?.asElement2;
 
-  set element(ConstructorElementMixin2? value) {
+  set element(ConstructorElementImpl2? value) {
     staticElement = value?.asElement;
   }
 

pkg/analyzer/lib/src/dart/constant/evaluation.dart

@@ -2981,10 +2981,10 @@ class _InstanceCreationEvaluator {
       } else if (initializer is RedirectingConstructorInvocationImpl) {
         // This is a redirecting constructor, so just evaluate the constructor
         // it redirects to.
-        var constructor = initializer.staticElement;
-        if (constructor != null && constructor.isConst) {
+        var baseElement = initializer.staticElement;
+        if (baseElement != null && baseElement.isConst) {
           // Instantiate the constructor with the in-scope type arguments.
-          constructor = ConstructorMember.from(constructor, definingType);
+          var constructor = ConstructorMember.from(baseElement, definingType);
           var result = _evaluationEngine.evaluateConstructorCall(
               _library,
               _errorNode,

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

@@ -6433,7 +6433,7 @@ abstract class InterfaceElementImpl2 extends InstanceElementImpl2
   }
 
   @override
-  ConstructorElementMixin2? get unnamedConstructor2 {
+  ConstructorElementImpl2? get unnamedConstructor2 {
     return getNamedConstructor2('new');
   }
 
@@ -6454,7 +6454,7 @@ abstract class InterfaceElementImpl2 extends InstanceElementImpl2
           .getMember4(this, name);
 
   @override
-  ConstructorElementMixin2? getNamedConstructor2(String name) {
+  ConstructorElementImpl2? getNamedConstructor2(String name) {
     return constructors2.firstWhereOrNull((e) => e.name3 == name);
   }
 

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

@@ -28,7 +28,7 @@ class ConstructorMember extends ExecutableMember
   /// Initialize a newly created element to represent a constructor, based on
   /// the [declaration], and applied [substitution].
   ConstructorMember({
-    required ConstructorElement super.declaration,
+    required ConstructorElementImpl super.declaration,
     required super.substitution,
   }) : super(
           typeParameters: const <TypeParameterElementImpl>[],
@@ -90,7 +90,7 @@ class ConstructorMember extends ExecutableMember
   @override
   ConstructorElementMixin? get redirectedConstructor {
     var element = declaration.redirectedConstructor;
-    return _from2(element);
+    return _redirect(element);
   }
 
   @override
@@ -114,7 +114,7 @@ class ConstructorMember extends ExecutableMember
   @override
   ConstructorElement? get superConstructor {
     var element = declaration.superConstructor;
-    return _from2(element);
+    return _redirect(element);
   }
 
   @override
@@ -138,71 +138,61 @@ class ConstructorMember extends ExecutableMember
     builder.writeConstructorElement(this);
   }
 
-  ConstructorMember? _from2(ConstructorElement? element) {
-    if (element == null) {
-      return null;
-    }
-
-    ConstructorElement declaration;
-    MapSubstitution substitution;
-    if (element is ConstructorMember) {
-      declaration = element._declaration as ConstructorElement;
-      var map = <TypeParameterElement2, DartType>{};
-      var elementMap = element.substitution.map;
-      for (var typeParameter in elementMap.keys) {
-        var type = elementMap[typeParameter]!;
-        map[typeParameter] = this.substitution.substituteType(type);
-      }
-      substitution = Substitution.fromMap2(map);
-    } else {
-      declaration = element;
-      substitution = this.substitution;
+  ConstructorElementMixin? _redirect(ConstructorElementMixin? element) {
+    switch (element) {
+      case null:
+        return null;
+      case ConstructorElementImpl():
+        return element;
+      case ConstructorMember():
+        var memberMap = element.substitution.map;
+        var map = <TypeParameterElement2, DartType>{
+          for (var MapEntry(:key, :value) in memberMap.entries)
+            key: substitution.substituteType(value),
+        };
+        return ConstructorMember(
+          declaration: element.declaration,
+          substitution: Substitution.fromMap2(map),
+        );
+      default:
+        throw UnimplementedError('(${element.runtimeType}) $element');
     }
-
-    return ConstructorMember(
-      declaration: declaration,
-      substitution: substitution,
-    );
   }
 
-  /// If the given [constructor]'s type is different when any type parameters
+  /// If the given [element]'s type is different when any type parameters
   /// from the defining type's declaration are replaced with the actual type
   /// arguments from the [definingType], create a constructor member
   /// representing the given constructor. Return the member that was created, or
   /// the original constructor if no member was created.
   static ConstructorElementMixin from(
-      ConstructorElementMixin constructor, InterfaceType definingType) {
+    ConstructorElementImpl element,
+    InterfaceType definingType,
+  ) {
     if (definingType.typeArguments.isEmpty) {
-      return constructor;
-    }
-
-    if (constructor is ConstructorMember) {
-      constructor = constructor.declaration;
+      return element;
     }
 
     return ConstructorMember(
-      declaration: constructor,
+      declaration: element,
       substitution: Substitution.fromInterfaceType(definingType),
     );
   }
 
-  /// If the given [constructor]'s type is different when any type parameters
+  /// If the given [element]'s type is different when any type parameters
   /// from the defining type's declaration are replaced with the actual type
   /// arguments from the [definingType], create a constructor member
   /// representing the given constructor. Return the member that was created, or
   /// the original constructor if no member was created.
   static ConstructorElementMixin2 from2(
-      ConstructorElementMixin2 constructor, InterfaceType definingType) {
+    ConstructorElementImpl2 element,
+    InterfaceType definingType,
+  ) {
     if (definingType.typeArguments.isEmpty) {
-      return constructor;
-    }
-
-    if (constructor is ConstructorMember) {
-      constructor = constructor.baseElement;
+      return element;
     }
 
     return ConstructorMember(
-      declaration: constructor.asElement,
+      declaration: element.asElement,
       substitution: Substitution.fromInterfaceType(definingType),
     );
   }

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

@@ -957,7 +957,7 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
   ConstructorElementMixin2? lookUpConstructor2(
       String? constructorName, LibraryElement2 library) {
     // prepare base ConstructorElement
-    ConstructorElementMixin2? constructorElement;
+    ConstructorElementImpl2? constructorElement;
     if (constructorName == null) {
       constructorElement = element3.unnamedConstructor2;
     } else {

pkg/analyzer/lib/src/dart/resolver/constructor_reference_resolver.dart

@@ -114,7 +114,7 @@ class ConstructorReferenceResolver {
       // Get back to the uninstantiated generic constructor.
       // TODO(jmesserly): should we store this earlier in resolution?
       // Or look it up, instead of jumping backwards through the Member?
-      var rawElement = elementToInfer.element2;
+      var rawElement = elementToInfer.element2.baseElement;
       var constructorType = elementToInfer.asType;
 
       var inferred = _resolver.inferenceHelper.inferTearOff(

pkg/analyzer/lib/src/dart/resolver/invocation_inferrer.dart

@@ -90,8 +90,9 @@ class AnnotationInferrer extends FullInvocationInferrer<AnnotationImpl> {
   List<FormalParameterElement>? _storeResult(
       List<DartType>? typeArgumentTypes, FunctionType? invokeType) {
     if (invokeType != null) {
+      var elementOrMember = node.element2 as ConstructorElementMixin2;
       var constructorElement = ConstructorMember.from2(
-        node.element2 as ConstructorElementMixin2,
+        elementOrMember.baseElement,
         invokeType.returnType as InterfaceType,
       );
       constructorName?.element = constructorElement;
@@ -393,7 +394,7 @@ class InstanceCreationInferrer
       var constructedType = invokeType.returnType;
       node.constructorName.type.type = constructedType;
       var constructorElement = ConstructorMember.from2(
-        node.constructorName.element!,
+        node.constructorName.element!.baseElement,
         constructedType as InterfaceType,
       );
       node.constructorName.element = constructorElement;

pkg/analyzer/lib/src/generated/element_resolver.dart

@@ -302,7 +302,7 @@ class ElementResolver {
       // TODO(brianwilkerson): Report this error.
       return;
     }
-    ConstructorElementMixin2? element;
+    ConstructorElementImpl2? element;
     var name = node.constructorName;
     if (name == null) {
       element = enclosingClass.unnamedConstructor2;

pkg/analyzer/lib/src/summary2/ast_binary_reader.dart

@@ -1158,7 +1158,7 @@ class AstBinaryReader {
       constructorName: constructorName,
       argumentList: argumentList,
     );
-    node.element = _reader.readElement2() as ConstructorElementMixin2?;
+    node.element = _reader.readElement2() as ConstructorElementImpl2?;
     _resolveNamedExpressions(node.element, node.argumentList);
     return node;
   }

pkg/analyzer/test/src/dart/resolution/resolution.dart

@@ -468,7 +468,8 @@ mixin ResolutionTest implements ResourceProviderMixin {
         ..withInterfaceTypeElements =
             nodeTextConfiguration.withInterfaceTypeElements
         ..withRedirectedConstructors =
-            nodeTextConfiguration.withRedirectedConstructors,
+            nodeTextConfiguration.withRedirectedConstructors
+        ..withSuperConstructors = nodeTextConfiguration.withSuperConstructors,
     );
     node.accept(
       ResolvedAstPrinter(