Elements. Remove V1 DartType.element

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

Author: scheglov

pkg/analyzer/api.txt

@@ -4192,7 +4192,6 @@ package:analyzer/dart/element/type.dart:
   DartType (class extends Object):
     new (constructor: DartType Function())
     alias (getter: InstantiatedTypeAliasElement?)
-    element (getter: Element?, deprecated)
     element3 (getter: Element2?, experimental)
     extensionTypeErasure (getter: DartType)
     isBottom (getter: bool)
@@ -4227,7 +4226,7 @@ package:analyzer/dart/element/type.dart:
     new (constructor: DynamicType Function())
   FunctionType (class extends Object implements DartType):
     new (constructor: FunctionType Function())
-    element (getter: Null)
+    element3 (getter: Null)
     formalParameters (getter: List<FormalParameterElement>, experimental)
     namedParameterTypes (getter: Map<String, DartType>)
     normalParameterTypes (getter: List<DartType>)
@@ -4250,7 +4249,6 @@ package:analyzer/dart/element/type.dart:
     accessors (getter: List<PropertyAccessorElement>, deprecated)
     allSupertypes (getter: List<InterfaceType>)
     constructors2 (getter: List<ConstructorElement2>, experimental)
-    element (getter: InterfaceElement, deprecated)
     element3 (getter: InterfaceElement2, experimental)
     getters (getter: List<GetterElement>, experimental)
     interfaces (getter: List<InterfaceType>)
@@ -4282,7 +4280,7 @@ package:analyzer/dart/element/type.dart:
     typeArguments (getter: List<DartType>)
   RecordType (class extends Object implements DartType):
     new (constructor: RecordType Function({required Map<String, DartType> named, required NullabilitySuffix nullabilitySuffix, required List<DartType> positional}))
-    element (getter: Null)
+    element3 (getter: Null)
     namedFields (getter: List<RecordTypeNamedField>)
     positionalFields (getter: List<RecordTypePositionalField>)
     positionalTypes (getter: List<DartType>, deprecated)
@@ -4298,12 +4296,10 @@ package:analyzer/dart/element/type.dart:
   TypeParameterType (class extends Object implements DartType):
     new (constructor: TypeParameterType Function())
     bound (getter: DartType)
-    definition (getter: ElementLocation, deprecated)
-    element (getter: TypeParameterElement, deprecated)
     element3 (getter: TypeParameterElement2, experimental)
   VoidType (class extends Object implements DartType):
     new (constructor: VoidType Function())
-    element (getter: Null)
+    element3 (getter: Null)
 package:analyzer/dart/element/type_provider.dart:
   TypeProvider (class extends Object):
     new (constructor: TypeProvider Function())

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

@@ -37,11 +37,6 @@ abstract class DartType {
   /// Otherwise return `null`.
   InstantiatedTypeAliasElement? get alias;
 
-  /// Return the element representing the declaration of this type, or `null`
-  /// if the type is not associated with an element.
-  @Deprecated('Use element3 instead')
-  Element? get element;
-
   /// Return the element representing the declaration of this type, or `null`
   /// if the type is not associated with an element.
   @experimental
@@ -238,7 +233,7 @@ abstract class DynamicType implements DartType {}
 /// Clients may not extend, implement or mix-in this class.
 abstract class FunctionType implements DartType {
   @override
-  Null get element;
+  Null get element3;
 
   /// The formal parameters.
   @experimental
@@ -356,10 +351,6 @@ abstract class InterfaceType implements ParameterizedType {
   @experimental
   List<ConstructorElement2> get constructors2;
 
-  @Deprecated('Use element3 instead')
-  @override
-  InterfaceElement get element;
-
   @experimental
   @override
   InterfaceElement2 get element3;
@@ -607,7 +598,7 @@ abstract class RecordType implements DartType {
   }) = RecordTypeImpl.fromApi;
 
   @override
-  Null get element;
+  Null get element3;
 
   /// The named fields (might be empty).
   List<RecordTypeNamedField> get namedFields;
@@ -663,18 +654,6 @@ abstract class TypeParameterType implements DartType {
   /// or `dynamic` if there was no explicit bound.
   DartType get bound;
 
-  /// An object that can be used to identify this type parameter with `==`.
-  ///
-  /// 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')
-  @override
-  TypeParameterElement get element;
-
   @experimental
   @override
   TypeParameterElement2 get element3;
@@ -684,5 +663,5 @@ abstract class TypeParameterType implements DartType {
 /// expression is meaningless, and intended to be discarded.
 abstract class VoidType implements DartType {
   @override
-  Null get element;
+  Null get element3;
 }

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

@@ -40,10 +40,6 @@ class DynamicTypeImpl extends TypeImpl
   /// Prevent the creation of instances of this class.
   DynamicTypeImpl._();
 
-  @Deprecated('Use element2 instead')
-  @override
-  DynamicElementImpl get element => DynamicElementImpl.instance;
-
   @override
   DynamicElementImpl2 get element3 => DynamicElementImpl2.instance;
 
@@ -194,10 +190,6 @@ class FunctionTypeImpl extends TypeImpl
     super.alias,
   });
 
-  @Deprecated('Use element2 instead')
-  @override
-  Null get element => null;
-
   @override
   Null get element3 => null;
 
@@ -666,10 +658,6 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
     }).toFixedList();
   }
 
-  @Deprecated('Use element3 instead')
-  @override
-  InterfaceElementImpl get element => element3.asElement;
-
   @override
   List<GetterElement2OrMember> get getters {
     return _getters ??= element3.getters2.map((e) {
@@ -793,7 +781,7 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
 
   @Deprecated('Check element, or use getDisplayString()')
   @override
-  String get name => element.name;
+  String get name => element3.name3!;
 
   /// The instantiated representation type, if [element3] is an extension type.
   TypeImpl? get representationType {
@@ -873,23 +861,6 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
     builder.writeInterfaceType(this);
   }
 
-  @Deprecated('Use asInstanceOf2() instead')
-  @override
-  InterfaceTypeImpl? asInstanceOf(InterfaceElement targetElement) {
-    if (element == targetElement) {
-      return this;
-    }
-
-    for (var rawInterface in element.allSupertypes) {
-      if (rawInterface.element == targetElement) {
-        var substitution = Substitution.fromInterfaceType(this);
-        return substitution.mapInterfaceType(rawInterface);
-      }
-    }
-
-    return null;
-  }
-
   @override
   InterfaceTypeImpl? asInstanceOf2(InterfaceElement2 targetElement) {
     if (element3 == targetElement) {
@@ -1182,10 +1153,6 @@ class InvalidTypeImpl extends TypeImpl
   /// Prevent the creation of instances of this class.
   InvalidTypeImpl._();
 
-  @Deprecated('Use element2 instead')
-  @override
-  Null get element => null;
-
   @override
   Null get element3 => null;
 
@@ -1235,9 +1202,6 @@ class NeverTypeImpl extends TypeImpl implements NeverType {
   /// The unique instance of this class, non-nullable.
   static final NeverTypeImpl instance = NeverTypeImpl._(NullabilitySuffix.none);
 
-  @override
-  final NeverElementImpl element = NeverElementImpl.instance;
-
   @override
   final NeverElementImpl2 element3 = NeverElementImpl2.instance;
 
@@ -1364,10 +1328,6 @@ class RecordTypeImpl extends TypeImpl implements RecordType, SharedRecordType {
     );
   }
 
-  @Deprecated('Use element2 instead')
-  @override
-  Null get element => null;
-
   @override
   Null get element3 => null;
 
@@ -1524,10 +1484,6 @@ abstract class TypeImpl implements DartType, SharedType {
   /// Initialize a newly created type.
   const TypeImpl({this.alias});
 
-  @Deprecated('Use element3 instead')
-  @override
-  Element? get element => element3?.asElement;
-
   @override
   TypeImpl get extensionTypeErasure {
     return const ExtensionTypeErasure().perform(this);
@@ -1702,14 +1658,6 @@ class TypeParameterTypeImpl extends TypeImpl implements TypeParameterType {
   TypeImpl get bound =>
       promotedBound ?? element3.bound ?? DynamicTypeImpl.instance;
 
-  @Deprecated('Elements are equal when they are identical')
-  @override
-  ElementLocation get definition => element.location;
-
-  @Deprecated('Use element3 instead')
-  @override
-  TypeParameterElementImpl get element => element3.asElement;
-
   @override
   int get hashCode => element3.hashCode;
 
@@ -1737,7 +1685,7 @@ class TypeParameterTypeImpl extends TypeImpl implements TypeParameterType {
 
   @Deprecated('Check element, or use getDisplayString()')
   @override
-  String get name => element.name;
+  String get name => element3.name3!;
 
   TypeParameterTypeImpl get withoutPromotedBound {
     return TypeParameterTypeImpl(
@@ -1791,12 +1739,6 @@ class TypeParameterTypeImpl extends TypeImpl implements TypeParameterType {
     return bound.asInstanceOf2(targetElement);
   }
 
-  @Deprecated('Use referencesAny2() instead')
-  @override
-  bool referencesAny(Set<TypeParameterElement> parameters) {
-    return parameters.contains(element);
-  }
-
   @override
   bool referencesAny2(Set<TypeParameterElementImpl2> parameters) {
     return parameters.contains(element3);
@@ -1821,10 +1763,6 @@ class VoidTypeImpl extends TypeImpl implements VoidType, SharedVoidType {
   /// Prevent the creation of instances of this class.
   VoidTypeImpl._();
 
-  @Deprecated('Use element2 instead')
-  @override
-  Null get element => null;
-
   @override
   Null get element3 => null;