analyzer: Element model migration type_algebra.dart

Change-Id: I18a9e5858ac016154bf1572e0abebebe94518edf
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/409740
Commit-Queue: Samuel Rawlins <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>

Author: srawlins

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

@@ -156,7 +156,7 @@ class ConstructorMember extends ExecutableMember
     if (element is ConstructorMember) {
       declaration = element._declaration as ConstructorElement;
       var map = <TypeParameterElement2, DartType>{};
-      var elementMap = element._substitution.map2;
+      var elementMap = element._substitution.map;
       for (var typeParameter in elementMap.keys) {
         var type = elementMap[typeParameter]!;
         map[typeParameter] = _substitution.substituteType(type);
@@ -423,9 +423,9 @@ abstract class ExecutableMember extends Member
       augmentationSubstitution = member.augmentationSubstitution;
 
       var map = <TypeParameterElement2, DartType>{
-        for (var MapEntry(:key, :value) in member._substitution.map2.entries)
+        for (var MapEntry(:key, :value) in member._substitution.map.entries)
           key: substitution.substituteType(value),
-        ...substitution.map2,
+        ...substitution.map,
       };
       combined = Substitution.fromMap2(map);
     }
@@ -1372,9 +1372,9 @@ class ParameterMember extends VariableMember
       element = member.declaration;
 
       var map = <TypeParameterElement2, DartType>{
-        for (var MapEntry(:key, :value) in member._substitution.map2.entries)
+        for (var MapEntry(:key, :value) in member._substitution.map.entries)
           key: substitution.substituteType(value),
-        ...substitution.map2,
+        ...substitution.map,
       };
       combined = Substitution.fromMap2(map);
     }
@@ -1826,8 +1826,8 @@ class _SubstitutedTypeParameters {
     return _SubstitutedTypeParameters._(
       newElements,
       Substitution.fromMap2({
-        ...substitution.map2,
-        ...substitution2.map2,
+        ...substitution.map,
+        ...substitution2.map,
       }),
     );
   }

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

@@ -128,9 +128,9 @@ class FreshTypeParameters {
   FreshTypeParameters(this.freshTypeParameters, this.substitution);
 
   FunctionTypeImpl applyToFunctionType(FunctionType type) {
-    return FunctionTypeImpl(
-      typeFormals: freshTypeParameters.map((e) => e.firstFragment).toList(),
-      parameters: type.parameters.map((parameter) {
+    return FunctionTypeImpl.v2(
+      typeParameters: freshTypeParameters,
+      formalParameters: type.formalParameters.map((parameter) {
         var type = substitute(parameter.type);
         return parameter.copyWith(type: type);
       }).toFixedList(),
@@ -146,21 +146,15 @@ class FreshTypeParameters {
 abstract class MapSubstitution extends Substitution {
   const MapSubstitution();
 
-  Map<TypeParameterElement, DartType> get map;
-
-  Map<TypeParameterElement2, DartType> get map2 {
-    return map.map((key, value) {
-      return MapEntry(key.asElement2, value);
-    });
-  }
+  Map<TypeParameterElement2, DartType> get map;
 }
 
 abstract class Substitution {
   static const MapSubstitution empty = _NullSubstitution.instance;
 
   const Substitution();
 
-  DartType? getSubstitute(TypeParameterElement parameter, bool upperBound);
+  DartType? getSubstitute(TypeParameterElement2 parameter, bool upperBound);
 
   InterfaceTypeImpl mapInterfaceType(InterfaceType type) {
     return substituteType(type) as InterfaceTypeImpl;
@@ -203,9 +197,7 @@ abstract class Substitution {
     if (map.isEmpty) {
       return _NullSubstitution.instance;
     }
-    return _MapSubstitution(
-      map.map((key, value) => MapEntry(key.asElement, value)),
-    );
+    return _MapSubstitution(map.map((key, value) => MapEntry(key, value)));
   }
 
   /// Substitutes the Nth parameter in [parameters] with the Nth type in
@@ -214,7 +206,7 @@ abstract class Substitution {
     List<TypeParameterElement> parameters,
     List<DartType> types,
   ) {
-    return fromPairs2(parameters.map((p) => p.asElement2).toList(), types);
+    return fromPairs2(parameters.map((p) => p.asElement2).toFixedList(), types);
   }
 
   /// Substitutes the Nth parameter in [parameters] with the Nth type in
@@ -243,65 +235,65 @@ class _CombinedSubstitution extends Substitution {
   _CombinedSubstitution(this.first, this.second);
 
   @override
-  DartType? getSubstitute(TypeParameterElement parameter, bool upperBound) {
+  DartType? getSubstitute(TypeParameterElement2 parameter, bool upperBound) {
     return first.getSubstitute(parameter, upperBound) ??
         second.getSubstitute(parameter, upperBound);
   }
 }
 
 class _FreshTypeParametersSubstitutor extends _TypeSubstitutor {
-  final Map<TypeParameterElement, DartType> substitution = {};
+  final Map<TypeParameterElement2, DartType> substitution = {};
 
   _FreshTypeParametersSubstitutor(_TypeSubstitutor super.outer);
 
   @override
-  List<TypeParameterElement> freshTypeParameters(
-      List<TypeParameterElement> elements) {
+  List<TypeParameterElement2> freshTypeParameters(
+      List<TypeParameterElement2> elements) {
     if (elements.isEmpty) {
-      return const <TypeParameterElement>[];
+      return const <TypeParameterElement2>[];
     }
 
     var freshElements = List.generate(elements.length, (index) {
       // TODO(kallentu): : Clean up TypeParameterElementImpl casting once
       // variance is added to the interface.
-      var element = elements[index] as TypeParameterElementImpl;
-      var freshElement = TypeParameterElementImpl(element.name, -1);
+      var element = elements[index] as TypeParameterElementImpl2;
+      var freshElement = TypeParameterElementImpl(element.name3!, -1);
       var freshType = freshElement.instantiate(
         nullabilitySuffix: NullabilitySuffix.none,
       );
       substitution[element] = freshType;
       if (!element.isLegacyCovariant) {
         freshElement.variance = element.variance;
       }
-      return freshElement;
+      return freshElement.asElement2;
     }, growable: false);
 
     for (var i = 0; i < freshElements.length; i++) {
       var element = elements[i];
       var bound = element.bound;
       if (bound != null) {
         var freshElement = freshElements[i];
-        freshElement.bound = bound.accept(this);
+        freshElement.bound = bound.accept(this) as TypeImpl?;
       }
     }
 
     return freshElements;
   }
 
   @override
-  DartType? lookup(TypeParameterElement parameter, bool upperBound) {
+  DartType? lookup(TypeParameterElement2 parameter, bool upperBound) {
     return substitution[parameter];
   }
 }
 
 class _MapSubstitution extends MapSubstitution {
   @override
-  final Map<TypeParameterElement, DartType> map;
+  final Map<TypeParameterElement2, DartType> map;
 
   _MapSubstitution(this.map);
 
   @override
-  DartType? getSubstitute(TypeParameterElement parameter, bool upperBound) {
+  DartType? getSubstitute(TypeParameterElement2 parameter, bool upperBound) {
     return map[parameter];
   }
 
@@ -315,11 +307,11 @@ class _NullSubstitution extends MapSubstitution {
   const _NullSubstitution();
 
   @override
-  Map<TypeParameterElement, DartType> get map => const {};
+  Map<TypeParameterElement2, DartType> get map => const {};
 
   @override
-  DartType getSubstitute(TypeParameterElement parameter, bool upperBound) {
-    return TypeParameterTypeImpl(
+  DartType getSubstitute(TypeParameterElement2 parameter, bool upperBound) {
+    return TypeParameterTypeImpl.v2(
       element: parameter,
       nullabilitySuffix: NullabilitySuffix.none,
     );
@@ -343,13 +335,13 @@ class _TopSubstitutor extends _TypeSubstitutor {
   }
 
   @override
-  List<TypeParameterElement> freshTypeParameters(
-      List<TypeParameterElement> parameters) {
+  List<TypeParameterElement2> freshTypeParameters(
+      List<TypeParameterElement2> parameters) {
     throw 'Create a fresh environment first';
   }
 
   @override
-  DartType? lookup(TypeParameterElement parameter, bool upperBound) {
+  DartType? lookup(TypeParameterElement2 parameter, bool upperBound) {
     return substitution.getSubstitute(parameter, upperBound);
   }
 }
@@ -383,10 +375,10 @@ abstract class _TypeSubstitutor
     target.useCounter++;
   }
 
-  List<TypeParameterElement> freshTypeParameters(
-      List<TypeParameterElement> elements);
+  List<TypeParameterElement2> freshTypeParameters(
+      List<TypeParameterElement2> elements);
 
-  DartType? getSubstitute(TypeParameterElement parameter) {
+  DartType? getSubstitute(TypeParameterElement2 parameter) {
     _TypeSubstitutor? environment = this;
     while (environment != null) {
       var replacement = environment.lookup(parameter, covariantContext);
@@ -403,7 +395,7 @@ abstract class _TypeSubstitutor
     covariantContext = !covariantContext;
   }
 
-  DartType? lookup(TypeParameterElement parameter, bool upperBound);
+  DartType? lookup(TypeParameterElement2 parameter, bool upperBound);
 
   _FreshTypeParametersSubstitutor newInnerEnvironment() {
     return _FreshTypeParametersSubstitutor(this);
@@ -428,7 +420,7 @@ abstract class _TypeSubstitutor
     int before = useCounter;
 
     var inner = this;
-    var typeFormals = type.typeFormals;
+    var typeFormals = type.typeParameters;
     if (typeFormals.isNotEmpty) {
       inner = newInnerEnvironment();
       typeFormals = inner.freshTypeParameters(typeFormals);
@@ -437,7 +429,7 @@ abstract class _TypeSubstitutor
     // Invert the variance when translating parameters.
     inner.invertVariance();
 
-    var parameters = type.parameters.map((parameter) {
+    var parameters = type.formalParameters.map((parameter) {
       var type = parameter.type.accept(inner);
       return parameter.copyWith(type: type);
     }).toFixedList();
@@ -449,9 +441,9 @@ abstract class _TypeSubstitutor
 
     if (useCounter == before) return type;
 
-    return FunctionTypeImpl(
-      typeFormals: typeFormals,
-      parameters: parameters,
+    return FunctionTypeImpl.v2(
+      typeParameters: typeFormals,
+      formalParameters: parameters,
       returnType: returnType,
       nullabilitySuffix: type.nullabilitySuffix,
       alias: alias,
@@ -478,9 +470,9 @@ abstract class _TypeSubstitutor
     if (typeParameters.isNotEmpty) {
       inner = newInnerEnvironment();
       typeParameters = inner
-          .freshTypeParameters(typeParameters.map((e) => e.asElement).toList())
-          .map((e) => e.asElement2 as TypeParameterElementImpl2)
-          .toList();
+          .freshTypeParameters(typeParameters)
+          .cast<TypeParameterElementImpl2>()
+          .toFixedList();
     }
 
     // Invert the variance when translating parameters.
@@ -489,7 +481,7 @@ abstract class _TypeSubstitutor
     var formalParameters = type.formalParameters.map((formalParameter) {
       var type = formalParameter.type.accept(inner);
       return formalParameter.copyWith(type: type);
-    }).toList();
+    }).toFixedList();
 
     inner.invertVariance();
 
@@ -593,7 +585,7 @@ abstract class _TypeSubstitutor
 
   @override
   DartType visitTypeParameterType(TypeParameterType type) {
-    var argument = getSubstitute(type.element);
+    var argument = getSubstitute(type.element3);
     if (argument == null) {
       return type;
     }
@@ -616,8 +608,8 @@ abstract class _TypeSubstitutor
     if (alias == null) {
       return null;
     }
-    return InstantiatedTypeAliasElementImpl(
-      element: alias.element,
+    return InstantiatedTypeAliasElementImpl.v2(
+      element: alias.element2,
       typeArguments: _mapList(alias.typeArguments),
     );
   }

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

@@ -2277,7 +2277,7 @@ class _TypeVariableEliminator extends Substitution {
   );
 
   @override
-  DartType getSubstitute(TypeParameterElement parameter, bool upperBound) {
+  DartType getSubstitute(TypeParameterElement2 parameter, bool upperBound) {
     return upperBound ? _bottomType : _topType;
   }
 }

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

@@ -1047,7 +1047,7 @@ class ResolutionSink extends _SummaryDataWriter {
 
   static List<DartType> _enclosingClassTypeArguments(
     Element declaration,
-    Map<TypeParameterElement, DartType> substitution,
+    Map<TypeParameterElement2, DartType> substitution,
   ) {
     // TODO(scheglov): Just keep it null in class Member?
     if (substitution.isEmpty) {
@@ -1056,7 +1056,8 @@ class ResolutionSink extends _SummaryDataWriter {
 
     var enclosing = declaration.enclosingElement3;
     if (enclosing is InstanceElement) {
-      var typeParameters = enclosing.typeParameters;
+      var typeParameters =
+          (enclosing.asElement2! as InstanceElement2).typeParameters2;
       if (typeParameters.isEmpty) {
         return const <DartType>[];
       }

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

@@ -311,7 +311,7 @@ mixin ResolutionTest implements ResourceProviderMixin {
     Map<String, String> expected,
   ) {
     var actualMapString = Map.fromEntries(
-      substitution.map2.entries.where((entry) {
+      substitution.map.entries.where((entry) {
         return entry.key.enclosingElement2 is! ExecutableElement2;
       }).map((entry) {
         return MapEntry(

pkg/analyzer/test/util/element_printer.dart

@@ -363,9 +363,9 @@ class ElementPrinter {
     return '${source.uri}';
   }
 
-  String _substitutionMapStr(Map<TypeParameterElement, DartType> map) {
+  String _substitutionMapStr(Map<TypeParameterElement2, DartType> map) {
     var entriesStr = map.entries.map((entry) {
-      return '${entry.key.name}: ${_typeStr(entry.value)}';
+      return '${entry.key.name3}: ${_typeStr(entry.value)}';
     }).join(', ');
     return '{$entriesStr}';
   }