Elements. Migrate TypeParameterTypeImpl.

Change-Id: Ib2130458b45a7bd49d2521190894790a7afad294
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/415681
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>

Author: scheglov

pkg/analyzer/api.txt

@@ -4397,7 +4397,7 @@ package:analyzer/dart/element/type.dart:
   TypeParameterType (class extends Object implements DartType):
     new (constructor: TypeParameterType Function())
     bound (getter: DartType)
-    definition (getter: ElementLocation)
+    definition (getter: ElementLocation, deprecated)
     element (getter: TypeParameterElement, deprecated)
     element3 (getter: TypeParameterElement2, experimental)
   VoidType (class extends Object implements DartType):

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

@@ -685,6 +685,7 @@ abstract class TypeParameterType implements DartType {
   /// Depending on the use, [bound] may also need to be taken into account.
   /// A given type parameter, it may have different bounds in different scopes.
   /// Always consult the bound if that could be relevant.
+  @Deprecated('Elements are equal when they are identical')
   ElementLocation get definition;
 
   @Deprecated('Use element3 instead')

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

@@ -392,14 +392,14 @@ class ElementDisplayStringBuilder {
       if (hasSuffix) {
         _write('(');
       }
-      _write(type.element.displayName);
+      _write(type.element3.displayName);
       _write(' & ');
       _writeType(promotedBound);
       if (hasSuffix) {
         _write(')');
       }
     } else {
-      _write(type.element.displayName);
+      _write(type.element3.displayName);
     }
     _writeNullability(type.nullabilitySuffix);
   }

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

@@ -11369,7 +11369,7 @@ class TypeAliasElementImpl2 extends TypeDefiningElementImpl2
       );
     } else if (type is TypeParameterTypeImpl) {
       return TypeParameterTypeImpl(
-        element: type.element,
+        element3: type.element3,
         nullabilitySuffix: resultNullability,
         alias: InstantiatedTypeAliasElementImpl(
           element2: this,
@@ -11531,7 +11531,7 @@ class TypeParameterElementImpl extends ElementImpl
   /// Computes the variance of the type parameters in the [type].
   shared.Variance computeVarianceInType(DartType type) {
     if (type is TypeParameterTypeImpl) {
-      if (type.element == this) {
+      if (type.element3 == element) {
         return shared.Variance.covariant;
       } else {
         return shared.Variance.unrelated;
@@ -11577,8 +11577,7 @@ class TypeParameterElementImpl extends ElementImpl
   TypeParameterTypeImpl instantiate({
     required NullabilitySuffix nullabilitySuffix,
   }) {
-    return TypeParameterTypeImpl(
-      element: this,
+    return element.instantiate(
       nullabilitySuffix: nullabilitySuffix,
     );
   }
@@ -11666,8 +11665,8 @@ class TypeParameterElementImpl2 extends TypeDefiningElementImpl2
   TypeParameterTypeImpl instantiate({
     required NullabilitySuffix nullabilitySuffix,
   }) {
-    return TypeParameterTypeImpl.v2(
-      element: this,
+    return TypeParameterTypeImpl(
+      element3: this,
       nullabilitySuffix: nullabilitySuffix,
     );
   }

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

@@ -274,8 +274,8 @@ class NormalizeHelper {
     }
 
     // * else X & S
-    return TypeParameterTypeImpl.v2(
-      element: X,
+    return TypeParameterTypeImpl(
+      element3: X,
       nullabilitySuffix: NullabilitySuffix.none,
       promotedBound: S,
     );

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

@@ -133,8 +133,8 @@ class ReplacementVisitor
     }
 
     var promotedBound = (type as TypeParameterTypeImpl).promotedBound;
-    return TypeParameterTypeImpl.v2(
-      element: type.element3,
+    return TypeParameterTypeImpl(
+      element3: type.element3,
       nullabilitySuffix: newNullability ?? type.nullabilitySuffix,
       promotedBound: newPromotedBound ?? promotedBound,
       alias: type.alias,
@@ -149,8 +149,8 @@ class ReplacementVisitor
       return null;
     }
 
-    return TypeParameterTypeImpl.v2(
-      element: type.element3,
+    return TypeParameterTypeImpl(
+      element3: type.element3,
       nullabilitySuffix: newNullability,
       alias: type.alias,
     );

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

@@ -182,8 +182,8 @@ class SubtypeHelper {
     if (T1 is TypeParameterTypeImpl) {
       var T1_promotedBound = T1.promotedBound;
       if (T1_promotedBound != null) {
-        var X1 = TypeParameterTypeImpl.v2(
-          element: T1.element3,
+        var X1 = TypeParameterTypeImpl(
+          element3: T1.element3,
           nullabilitySuffix: T1.nullabilitySuffix,
         );
         return isSubtypeOf(T0, X1) && isSubtypeOf(T0, T1_promotedBound);

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

@@ -316,6 +316,7 @@ class FunctionTypeImpl extends TypeImpl
     );
   }
 
+  @Deprecated('Use referencesAny2() instead')
   @override
   bool referencesAny(Set<TypeParameterElementImpl> parameters) {
     if (typeFormals.any((element) {
@@ -396,8 +397,9 @@ class FunctionTypeImpl extends TypeImpl
       return instantiate([
         for (var i = 0; i < typeFormals.length; i++)
           TypeParameterTypeImpl(
-              element: TypeParameterElementImpl.synthetic('T$i'),
-              nullabilitySuffix: NullabilitySuffix.none)
+            element3: TypeParameterElementImpl.synthetic('T$i').element,
+            nullabilitySuffix: NullabilitySuffix.none,
+          )
       ]).hashCode;
     }
 
@@ -1138,6 +1140,7 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
     return null;
   }
 
+  @Deprecated('Use referencesAny2() instead')
   @override
   bool referencesAny(Set<TypeParameterElementImpl> parameters) {
     return typeArguments.any((argument) => argument.referencesAny(parameters));
@@ -1629,6 +1632,7 @@ abstract class TypeImpl implements DartType, SharedType {
   bool isStructurallyEqualTo(Object other) => this == other;
 
   /// Returns true if this type references any of the [parameters].
+  @Deprecated('Use referencesAny2() instead')
   bool referencesAny(Set<TypeParameterElementImpl> parameters) {
     return false;
   }
@@ -1672,60 +1676,42 @@ abstract class TypeImpl implements DartType, SharedType {
 /// A concrete implementation of a [TypeParameterType].
 class TypeParameterTypeImpl extends TypeImpl implements TypeParameterType {
   @override
-  final TypeParameterElementImpl element;
+  final TypeParameterElementImpl2 element3;
 
   @override
   final NullabilitySuffix nullabilitySuffix;
 
   /// An optional promoted bound on the type parameter.
   ///
   /// 'null' indicates that the type parameter's bound has not been promoted and
-  /// is therefore the same as the bound of [element].
+  /// is therefore the same as the bound of [element3].
   final TypeImpl? promotedBound;
 
   /// Initialize a newly created type parameter type to be declared by the given
-  /// [element] and to have the given name.
+  /// [element3] and to have the given name.
   TypeParameterTypeImpl({
-    required TypeParameterElement element,
+    required this.element3,
     required this.nullabilitySuffix,
     DartType? promotedBound,
     super.alias,
-  })  :
-        // TODO(paulberry): change the type of the parameter `element` so
-        // that this cast isn't needed.
-        element = element as TypeParameterElementImpl,
-        // TODO(paulberry): change the type of the parameter `promotedBound` so
+  }) : // TODO(paulberry): change the type of the parameter `promotedBound` so
         // that this cast isn't needed.
         promotedBound = promotedBound as TypeImpl?;
 
-  /// Initialize a newly created type parameter type to be declared by the given
-  /// [element] and to have the given name.
-  factory TypeParameterTypeImpl.v2({
-    required TypeParameterElement2 element,
-    required NullabilitySuffix nullabilitySuffix,
-    DartType? promotedBound,
-    InstantiatedTypeAliasElementImpl? alias,
-  }) {
-    return TypeParameterTypeImpl(
-      element: element.asElement,
-      nullabilitySuffix: nullabilitySuffix,
-      promotedBound: promotedBound,
-      alias: alias,
-    );
-  }
-
   @override
   TypeImpl get bound =>
-      promotedBound ?? element.bound ?? DynamicTypeImpl.instance;
+      promotedBound ?? element3.bound ?? DynamicTypeImpl.instance;
 
+  @Deprecated('Elements are equal when they are identical')
   @override
   ElementLocation get definition => element.location;
 
+  @Deprecated('Use element3 instead')
   @override
-  TypeParameterElementImpl2 get element3 => element.element;
+  TypeParameterElementImpl get element => element3.asElement;
 
   @override
-  int get hashCode => element.hashCode;
+  int get hashCode => element3.hashCode;
 
   @override
   bool get isBottom {
@@ -1755,7 +1741,7 @@ class TypeParameterTypeImpl extends TypeImpl implements TypeParameterType {
 
   TypeParameterTypeImpl get withoutPromotedBound {
     return TypeParameterTypeImpl(
-      element: element,
+      element3: element3,
       nullabilitySuffix: nullabilitySuffix,
     );
   }
@@ -1766,7 +1752,7 @@ class TypeParameterTypeImpl extends TypeImpl implements TypeParameterType {
       return true;
     }
 
-    if (other is TypeParameterTypeImpl && other.element == element) {
+    if (other is TypeParameterTypeImpl && other.element3 == element3) {
       if (other.nullabilitySuffix != nullabilitySuffix) {
         return false;
       }
@@ -1804,6 +1790,7 @@ class TypeParameterTypeImpl extends TypeImpl implements TypeParameterType {
     return bound.asInstanceOf2(targetElement);
   }
 
+  @Deprecated('Use referencesAny2() instead')
   @override
   bool referencesAny(Set<TypeParameterElement> parameters) {
     return parameters.contains(element);
@@ -1818,7 +1805,7 @@ class TypeParameterTypeImpl extends TypeImpl implements TypeParameterType {
   TypeImpl withNullability(NullabilitySuffix nullabilitySuffix) {
     if (this.nullabilitySuffix == nullabilitySuffix) return this;
     return TypeParameterTypeImpl(
-      element: element,
+      element3: element3,
       nullabilitySuffix: nullabilitySuffix,
       promotedBound: promotedBound,
     );

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

@@ -32,8 +32,8 @@ FreshTypeParameters getFreshTypeParameters2(
 
   var map = <TypeParameterElement2, DartType>{};
   for (int i = 0; i < typeParameters.length; ++i) {
-    map[typeParameters[i]] = TypeParameterTypeImpl.v2(
-      element: freshParameters[i],
+    map[typeParameters[i]] = TypeParameterTypeImpl(
+      element3: freshParameters[i],
       nullabilitySuffix: NullabilitySuffix.none,
     );
   }
@@ -307,8 +307,8 @@ class _NullSubstitution extends MapSubstitution {
 
   @override
   DartType getSubstitute(TypeParameterElement2 parameter, bool upperBound) {
-    return TypeParameterTypeImpl.v2(
-      element: parameter,
+    return TypeParameterTypeImpl(
+      element3: parameter as TypeParameterElementImpl2,
       nullabilitySuffix: NullabilitySuffix.none,
     );
   }

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

@@ -20,8 +20,8 @@ class DemotionVisitor extends ReplacementVisitor {
       return null;
     }
 
-    return TypeParameterTypeImpl.v2(
-      element: type.element3,
+    return TypeParameterTypeImpl(
+      element3: type.element3,
       nullabilitySuffix: type.nullabilitySuffix,
       alias: type.alias,
     );