Elements. Remove V1 getters from InterfaceType.

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

Author: scheglov

pkg/analyzer/api.txt

@@ -4169,30 +4169,22 @@ package:analyzer/dart/element/type.dart:
     typeArguments (getter: List<DartType>)
   InterfaceType (class extends Object implements ParameterizedType):
     new (constructor: InterfaceType Function())
-    accessors (getter: List<PropertyAccessorElement>, deprecated)
     allSupertypes (getter: List<InterfaceType>)
     constructors2 (getter: List<ConstructorElement2>, experimental)
     element3 (getter: InterfaceElement2, experimental)
     getters (getter: List<GetterElement>, experimental)
     interfaces (getter: List<InterfaceType>)
-    methods (getter: List<MethodElement>, deprecated)
     methods2 (getter: List<MethodElement2>, experimental)
     mixins (getter: List<InterfaceType>)
     setters (getter: List<SetterElement>, experimental)
     superclass (getter: InterfaceType?)
     superclassConstraints (getter: List<InterfaceType>)
-    getGetter (method: PropertyAccessorElement? Function(String), deprecated)
     getGetter2 (method: GetterElement? Function(String))
-    getMethod (method: MethodElement? Function(String), deprecated)
     getMethod2 (method: MethodElement2? Function(String))
-    getSetter (method: PropertyAccessorElement? Function(String), deprecated)
     getSetter2 (method: SetterElement? Function(String))
     lookUpConstructor2 (method: ConstructorElement2? Function(String?, LibraryElement2))
-    lookUpGetter2 (method: PropertyAccessorElement? Function(String, LibraryElement, {bool concrete, bool inherited, bool recoveryStatic}), deprecated)
     lookUpGetter3 (method: GetterElement? Function(String, LibraryElement2, {bool concrete, bool inherited, bool recoveryStatic}))
-    lookUpMethod2 (method: MethodElement? Function(String, LibraryElement, {bool concrete, bool inherited, bool recoveryStatic}), deprecated)
     lookUpMethod3 (method: MethodElement2? Function(String, LibraryElement2, {bool concrete, bool inherited, bool recoveryStatic}))
-    lookUpSetter2 (method: PropertyAccessorElement? Function(String, LibraryElement, {bool concrete, bool inherited, bool recoveryStatic}), deprecated)
     lookUpSetter3 (method: SetterElement? Function(String, LibraryElement2, {bool concrete, bool inherited, bool recoveryStatic}))
   InvalidType (class extends Object implements DartType):
     new (constructor: InvalidType Function())

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

@@ -316,11 +316,6 @@ abstract class InstantiatedTypeAliasElement {
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class InterfaceType implements ParameterizedType {
-  /// Return a list containing all of the accessors (getters and setters)
-  /// declared in this type.
-  @Deprecated('Use getters or setters instead')
-  List<PropertyAccessorElement> get accessors;
-
   /// Return all the super-interfaces implemented by this interface. This
   /// includes superclasses, mixins, interfaces, and superclass constraints.
   List<InterfaceType> get allSupertypes;
@@ -343,10 +338,6 @@ abstract class InterfaceType implements ParameterizedType {
   /// by this method will have had their type parameters replaced.
   List<InterfaceType> get interfaces;
 
-  /// Return a list containing all of the methods declared in this type.
-  @Deprecated('Use methods2 instead')
-  List<MethodElement> get methods;
-
   /// Return a list containing all of the methods declared in this type.
   @experimental
   List<MethodElement2> get methods2;
@@ -374,34 +365,16 @@ abstract class InterfaceType implements ParameterizedType {
   /// represent a mixin declaration.
   List<InterfaceType> get superclassConstraints;
 
-  /// Return the element representing the getter with the given [name] that is
-  /// declared in this class, or `null` if this class does not declare a getter
-  /// with the given name.
-  @Deprecated('Use getGetter2() instead')
-  PropertyAccessorElement? getGetter(String name);
-
   /// Return the element representing the getter with the given [name] that is
   /// declared in this class, or `null` if this class does not declare a getter
   /// with the given name.
   GetterElement? getGetter2(String name);
 
-  /// Return the element representing the method with the given [name] that is
-  /// declared in this class, or `null` if this class does not declare a method
-  /// with the given name.
-  @Deprecated('Use getMethod2() instead')
-  MethodElement? getMethod(String name);
-
   /// Return the element representing the method with the given [name] that is
   /// declared in this class, or `null` if this class does not declare a method
   /// with the given name.
   MethodElement2? getMethod2(String name);
 
-  /// Return the element representing the setter with the given [name] that is
-  /// declared in this class, or `null` if this class does not declare a setter
-  /// with the given name.
-  @Deprecated('Use getSetter2() instead')
-  PropertyAccessorElement? getSetter(String name);
-
   /// Return the element representing the setter with the given [name] that is
   /// declared in this class, or `null` if this class does not declare a setter
   /// with the given name.
@@ -420,25 +393,6 @@ abstract class InterfaceType implements ParameterizedType {
   ConstructorElement2? lookUpConstructor2(
       String? name, LibraryElement2 library);
 
-  /// Return the getter with the given [name].
-  ///
-  /// If [concrete] is `true`, then the concrete implementation is returned,
-  /// from this type, or its superclass.
-  ///
-  /// If [inherited] is `true`, then only getters from the superclass are
-  /// considered.
-  ///
-  /// If [recoveryStatic] is `true`, then static getters of the class,
-  /// and its superclasses are considered. Clients should not use it.
-  @Deprecated('Use lookUpGetter3() instead')
-  PropertyAccessorElement? lookUpGetter2(
-    String name,
-    LibraryElement library, {
-    bool concrete = false,
-    bool inherited = false,
-    bool recoveryStatic = false,
-  });
-
   /// Return the getter with the given [name].
   ///
   /// If [concrete] is `true`, then the concrete implementation is returned,
@@ -457,25 +411,6 @@ abstract class InterfaceType implements ParameterizedType {
     bool recoveryStatic = false,
   });
 
-  /// Return the method with the given [name].
-  ///
-  /// If [concrete] is `true`, then the concrete implementation is returned,
-  /// from this type, or its superclass.
-  ///
-  /// If [inherited] is `true`, then only methods from the superclass are
-  /// considered.
-  ///
-  /// If [recoveryStatic] is `true`, then static methods of the class,
-  /// and its superclasses are considered. Clients should not use it.
-  @Deprecated('Use lookUpMethod3() instead')
-  MethodElement? lookUpMethod2(
-    String name,
-    LibraryElement library, {
-    bool concrete = false,
-    bool inherited = false,
-    bool recoveryStatic = false,
-  });
-
   /// Return the method with the given [name].
   ///
   /// If [concrete] is `true`, then the concrete implementation is returned,
@@ -494,25 +429,6 @@ abstract class InterfaceType implements ParameterizedType {
     bool recoveryStatic = false,
   });
 
-  /// Return the setter with the given [name].
-  ///
-  /// If [concrete] is `true`, then the concrete implementation is returned,
-  /// from this type, or its superclass.
-  ///
-  /// If [inherited] is `true`, then only setters from the superclass are
-  /// considered.
-  ///
-  /// If [recoveryStatic] is `true`, then static setters of the class,
-  /// and its superclasses are considered. Clients should not use it.
-  @Deprecated('Use lookUpSetter3() instead')
-  PropertyAccessorElement? lookUpSetter2(
-    String name,
-    LibraryElement library, {
-    bool concrete = false,
-    bool inherited = false,
-    bool recoveryStatic = false,
-  });
-
   /// Return the setter with the given [name].
   ///
   /// If [concrete] is `true`, then the concrete implementation is returned,

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

@@ -4,7 +4,6 @@
 
 import 'package:_fe_analyzer_shared/src/types/shared_type.dart';
 import 'package:analyzer/dart/ast/token.dart';
-import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type.dart';
@@ -17,7 +16,6 @@ import 'package:analyzer/src/dart/element/type_algebra.dart';
 import 'package:analyzer/src/dart/element/type_system.dart';
 import 'package:analyzer/src/utilities/extensions/collection.dart';
 import 'package:analyzer/src/utilities/extensions/element.dart';
-import 'package:analyzer/src/utilities/extensions/object.dart';
 import 'package:collection/collection.dart';
 
 /// Returns a [List] of fixed length with given types.
@@ -621,12 +619,6 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
     assert(this is NullTypeImpl);
   }
 
-  @Deprecated('Use getters / setters instead')
-  @override
-  List<PropertyAccessorElementOrMember> get accessors {
-    return [...getters, ...setters].map((e) => e.asElement).toList();
-  }
-
   @override
   List<InterfaceTypeImpl> get allSupertypes {
     var substitution = Substitution.fromInterfaceType(this);
@@ -747,12 +739,6 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
     return element3.name3 == "Type" && element3.library2.isDartCore;
   }
 
-  @Deprecated('Use methods2 instead')
-  @override
-  List<MethodElementOrMember> get methods {
-    return methods2.map((e) => e.asElement).toList();
-  }
-
   @override
   List<MethodElement2OrMember> get methods2 {
     return _methods ??= element3.methods2.map((e) {
@@ -863,36 +849,18 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
     return null;
   }
 
-  @Deprecated('Use getGetter2() instead')
-  @override
-  PropertyAccessorElementOrMember? getGetter(String getterName) {
-    return getGetter2(getterName)?.asElement;
-  }
-
   @override
   GetterElement2OrMember? getGetter2(String getterName) {
     var element = element3.getGetter2(getterName);
     return element != null ? GetterMember.from(element, this) : null;
   }
 
-  @Deprecated('Use getMethod2() instead')
-  @override
-  MethodElementOrMember? getMethod(String methodName) {
-    return getMethod2(methodName)?.asElement;
-  }
-
   @override
   MethodElement2OrMember? getMethod2(String methodName) {
     var element = element3.getMethod2(methodName);
     return element != null ? MethodMember.from2(element, this) : null;
   }
 
-  @Deprecated('Use getSetter2() instead')
-  @override
-  PropertyAccessorElement? getSetter(String setterName) {
-    return getSetter2(setterName)?.asElement;
-  }
-
   @override
   SetterElement2OrMember? getSetter2(String setterName) {
     var element = element3.getSetter2(setterName);
@@ -918,24 +886,6 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
     return ConstructorMember.from2(constructorElement, this);
   }
 
-  @Deprecated('Use lookUpGetter3() instead')
-  @override
-  PropertyAccessorElement? lookUpGetter2(
-    String name,
-    covariant LibraryElementImpl library, {
-    bool concrete = false,
-    bool inherited = false,
-    bool recoveryStatic = false,
-  }) {
-    return lookUpGetter3(
-      name,
-      library,
-      concrete: concrete,
-      inherited: inherited,
-      recoveryStatic: recoveryStatic,
-    )?.asElement;
-  }
-
   @override
   GetterElement2OrMember? lookUpGetter3(
     String name,
@@ -974,24 +924,6 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
     return null;
   }
 
-  @Deprecated('Use lookUpMethod3() instead')
-  @override
-  MethodElementOrMember? lookUpMethod2(
-    String name,
-    covariant LibraryElementImpl library, {
-    bool concrete = false,
-    bool inherited = false,
-    bool recoveryStatic = false,
-  }) {
-    return lookUpMethod3(
-      name,
-      library,
-      concrete: concrete,
-      inherited: inherited,
-      recoveryStatic: recoveryStatic,
-    )?.asElement;
-  }
-
   @override
   MethodElement2OrMember? lookUpMethod3(
     String name,
@@ -1030,24 +962,6 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
     return null;
   }
 
-  @Deprecated('Use lookUpSetter3() instead')
-  @override
-  PropertyAccessorElement? lookUpSetter2(
-    String name,
-    covariant LibraryElementImpl library, {
-    bool concrete = false,
-    bool inherited = false,
-    bool recoveryStatic = false,
-  }) {
-    return lookUpSetter3(
-      name,
-      library,
-      concrete: concrete,
-      inherited: inherited,
-      recoveryStatic: recoveryStatic,
-    )?.asElement.ifTypeOrNull();
-  }
-
   @override
   SetterElement2OrMember? lookUpSetter3(
     String name,