Elements. Migrate ConstructorElementToInfer to ConstructorElementMixin2 only.

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

Author: scheglov

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

@@ -107,7 +107,7 @@ class ConstructorReferenceResolver {
     // Otherwise we'll have a ConstructorElement, and we can skip inference
     // because there's nothing to infer in a non-generic type.
     if (elementToInfer != null &&
-        elementToInfer.typeParameters2.isNotEmpty &&
+        elementToInfer.typeParameters.isNotEmpty &&
         constructorName.type.typeArguments == null) {
       // TODO(leafp): Currently, we may re-infer types here, since we
       // sometimes resolve multiple times.  We should really check that we
@@ -119,7 +119,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.baseElement;
+      var rawElement = elementToInfer.element.baseElement;
       var constructorType = elementToInfer.asType;
 
       var inferred =

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

@@ -15,7 +15,6 @@ import 'package:analyzer/src/dart/element/type_constraint_gatherer.dart';
 import 'package:analyzer/src/dart/element/type_system.dart';
 import 'package:analyzer/src/dart/resolver/invocation_inferrer.dart';
 import 'package:analyzer/src/generated/resolver.dart';
-import 'package:analyzer/src/utilities/extensions/element.dart';
 
 /// Information about a constructor element to instantiate.
 ///
@@ -31,12 +30,12 @@ import 'package:analyzer/src/utilities/extensions/element.dart';
 /// are the type parameters of the alias.
 class ConstructorElementToInfer {
   /// The type parameters used in [element].
-  final List<TypeParameterElementImpl> typeParameters2;
+  final List<TypeParameterElementImpl> typeParameters;
 
   /// The element, might be [ConstructorMember].
-  final ConstructorElementMixin2 element2;
+  final ConstructorElementMixin2 element;
 
-  ConstructorElementToInfer(this.typeParameters2, this.element2);
+  ConstructorElementToInfer(this.typeParameters, this.element);
 
   /// Return the equivalent generic function type that we could use to
   /// forward to the constructor, or for a non-generic type simply returns
@@ -47,19 +46,13 @@ class ConstructorElementToInfer {
   FunctionType get asType {
     return typeParameters.isEmpty
         ? element.type
-        : FunctionTypeImpl(
-          typeFormals: typeParameters,
-          parameters: element.parameters.map((f) => f.asElement2).toList(),
+        : FunctionTypeImpl.v2(
+          typeParameters: typeParameters,
+          formalParameters: element.formalParameters,
           returnType: element.returnType,
           nullabilitySuffix: NullabilitySuffix.none,
         );
   }
-
-  ConstructorElementMixin get element => element2.asElement;
-
-  List<TypeParameterFragmentImpl> get typeParameters {
-    return typeParameters2.map((e) => e.asElement).toList();
-  }
 }
 
 class InvocationInferenceHelper {

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

@@ -86,7 +86,7 @@ class PropertyElementResolver with ScopeHelpers {
               definingLibrary: _resolver.definingLibrary,
             );
         if (elementToInfer != null &&
-            elementToInfer.typeParameters2.isNotEmpty) {
+            elementToInfer.typeParameters.isNotEmpty) {
           var inferred =
               _resolver.inferenceHelper.inferTearOff(
                     node,
@@ -97,7 +97,7 @@ class PropertyElementResolver with ScopeHelpers {
                   as FunctionType;
           var inferredType = inferred.returnType;
           var constructorElement = ConstructorMember.from2(
-            elementToInfer.element2.baseElement,
+            elementToInfer.element.baseElement,
             inferredType as InterfaceType,
           );
           node.propertyName.element = constructorElement.baseElement;