Deprecated getGetter2, getMethod2, getSetter2, lookUpConstructor2, lookUpGetter3, lookUpMethod3, and lookUpSetter3

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

Author: fshcheglov

pkg/analyzer/CHANGELOG.md

@@ -52,6 +52,13 @@
 * Deprecate `ExtensionTypeElement.representation2`, use `representation` instead.
 * Deprecate `ExtensionTypeFragment.primaryConstructor2`, use `primaryConstructor` instead.
 * Deprecate `ExtensionTypeFragment.representation2`, use `representation` instead.
+* Deprecate `InterfaceType.getGetter2`, use `getGetter` instead.
+* Deprecate `InterfaceType.getMethod2`, use `getMethod` instead.
+* Deprecate `InterfaceType.getSetter2`, use `getSetter` instead.
+* Deprecate `InterfaceType.lookUpConstructor2`, use `lookUpConstructor` instead.
+* Deprecate `InterfaceType.lookUpGetter3`, use `lookUpGetter` instead.
+* Deprecate `InterfaceType.lookUpMethod3`, use `lookUpMethod` instead.
+* Deprecate `InterfaceType.lookUpSetter3`, use `lookUpSetter` instead.
 
 ## 7.4.1
 * Restore `InstanceElement.augmented` getter.

pkg/analyzer/api.txt

@@ -4396,13 +4396,20 @@ package:analyzer/dart/element/type.dart:
     setters (getter: List<SetterElement>, experimental)
     superclass (getter: InterfaceType?)
     superclassConstraints (getter: List<InterfaceType>)
-    getGetter2 (method: GetterElement? Function(String))
-    getMethod2 (method: MethodElement? Function(String))
-    getSetter2 (method: SetterElement? Function(String))
-    lookUpConstructor2 (method: ConstructorElement? Function(String?, LibraryElement))
-    lookUpGetter3 (method: GetterElement? Function(String, LibraryElement, {bool concrete, bool inherited, bool recoveryStatic}))
-    lookUpMethod3 (method: MethodElement? Function(String, LibraryElement, {bool concrete, bool inherited, bool recoveryStatic}))
-    lookUpSetter3 (method: SetterElement? Function(String, LibraryElement, {bool concrete, bool inherited, bool recoveryStatic}))
+    getGetter (method: GetterElement? Function(String))
+    getGetter2 (method: GetterElement? Function(String), deprecated)
+    getMethod (method: MethodElement? Function(String))
+    getMethod2 (method: MethodElement? Function(String), deprecated)
+    getSetter (method: SetterElement? Function(String))
+    getSetter2 (method: SetterElement? Function(String), deprecated)
+    lookUpConstructor (method: ConstructorElement? Function(String?, LibraryElement))
+    lookUpConstructor2 (method: ConstructorElement? Function(String?, LibraryElement), deprecated)
+    lookUpGetter (method: GetterElement? Function(String, LibraryElement, {bool concrete, bool inherited, bool recoveryStatic}))
+    lookUpGetter3 (method: GetterElement? Function(String, LibraryElement, {bool concrete, bool inherited, bool recoveryStatic}), deprecated)
+    lookUpMethod (method: MethodElement? Function(String, LibraryElement, {bool concrete, bool inherited, bool recoveryStatic}))
+    lookUpMethod3 (method: MethodElement? Function(String, LibraryElement, {bool concrete, bool inherited, bool recoveryStatic}), deprecated)
+    lookUpSetter (method: SetterElement? Function(String, LibraryElement, {bool concrete, bool inherited, bool recoveryStatic}))
+    lookUpSetter3 (method: SetterElement? Function(String, LibraryElement, {bool concrete, bool inherited, bool recoveryStatic}), deprecated)
   InvalidType (class extends Object implements DartType):
     new (constructor: InvalidType Function())
   NeverType (class extends Object implements DartType):

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

@@ -315,16 +315,34 @@ abstract class InterfaceType implements ParameterizedType {
   /// 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? 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.
+  @Deprecated('Use getGetter instead')
   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.
+  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.
+  @Deprecated('Use getMethod instead')
   MethodElement? 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.
+  SetterElement? 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.
+  @Deprecated('Use getSetter instead')
   SetterElement? getSetter2(String name);
 
   /// Return the element representing the constructor that results from looking
@@ -337,6 +355,19 @@ abstract class InterfaceType implements ParameterizedType {
   /// <i>T<i>. Otherwise, if <i>q</i> is not defined or not accessible, a
   /// NoSuchMethodException is thrown.
   /// </blockquote>
+  ConstructorElement? lookUpConstructor(String? name, LibraryElement library);
+
+  /// Return the element representing the constructor that results from looking
+  /// up the constructor with the given [name] in this class with respect to the
+  /// given [library], or `null` if the look up fails. The behavior of this
+  /// method is defined by the Dart Language Specification in section 12.11.1:
+  /// <blockquote>
+  /// If <i>e</i> is of the form <b>new</b> <i>T.id()</i> then let <i>q<i> be
+  /// the constructor <i>T.id</i>, otherwise let <i>q<i> be the constructor
+  /// <i>T<i>. Otherwise, if <i>q</i> is not defined or not accessible, a
+  /// NoSuchMethodException is thrown.
+  /// </blockquote>
+  @Deprecated('Use lookUpConstructor instead')
   ConstructorElement? lookUpConstructor2(String? name, LibraryElement library);
 
   /// Return the getter with the given [name].
@@ -349,6 +380,25 @@ abstract class InterfaceType implements ParameterizedType {
   ///
   /// If [recoveryStatic] is `true`, then static getters of the class,
   /// and its superclasses are considered. Clients should not use it.
+  GetterElement? lookUpGetter(
+    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,
+  /// 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 lookUpGetter instead')
   GetterElement? lookUpGetter3(
     String name,
     LibraryElement library, {
@@ -367,6 +417,25 @@ abstract class InterfaceType implements ParameterizedType {
   ///
   /// If [recoveryStatic] is `true`, then static methods of the class,
   /// and its superclasses are considered. Clients should not use it.
+  MethodElement? lookUpMethod(
+    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,
+  /// 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 lookUpMethod instead')
   MethodElement? lookUpMethod3(
     String name,
     LibraryElement library, {
@@ -385,6 +454,25 @@ abstract class InterfaceType implements ParameterizedType {
   ///
   /// If [recoveryStatic] is `true`, then static setters of the class,
   /// and its superclasses are considered. Clients should not use it.
+  SetterElement? lookUpSetter(
+    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,
+  /// 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 lookUpSetter instead')
   SetterElement? lookUpSetter3(
     String name,
     LibraryElement library, {

pkg/analyzer/lib/src/dart/constant/evaluation.dart

@@ -3148,7 +3148,7 @@ class _InstanceCreationEvaluator {
               );
             }
             _fieldMap[fieldName] = evaluationResult;
-            var getter = definingType.getGetter2(fieldName);
+            var getter = definingType.getGetter(fieldName);
             if (getter != null) {
               var field = getter.variable3;
               if (field == null) {
@@ -3441,7 +3441,7 @@ class _InstanceCreationEvaluator {
     if (superclass != null && !superclass.isDartCoreObject) {
       var superConstructor =
           superclass
-              .lookUpConstructor2(superName, _constructor.library2)
+              .lookUpConstructor(superName, _constructor.library2)
               ?.asElement;
       if (superConstructor == null) {
         return null;

pkg/analyzer/lib/src/dart/constant/value.dart

@@ -1583,13 +1583,13 @@ class GenericState extends InstanceState {
       var element = type.element3;
       var library = element.library2;
 
-      var eqEq = type.lookUpMethod3('==', library, concrete: true);
+      var eqEq = type.lookUpMethod('==', library, concrete: true);
       if (!isFromDartCoreObject(eqEq)) {
         return false;
       }
 
       if (featureSet.isEnabled(Feature.patterns)) {
-        var hash = type.lookUpGetter3('hashCode', library, concrete: true);
+        var hash = type.lookUpGetter('hashCode', library, concrete: true);
         if (!isFromDartCoreObject(hash)) {
           return false;
         }

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

@@ -881,25 +881,43 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
   }
 
   @override
-  GetterElement2OrMember? getGetter2(String getterName) {
+  GetterElement2OrMember? getGetter(String getterName) {
     var element = element3.getGetter(getterName);
     return element != null ? GetterMember.forTargetType(element, this) : null;
   }
 
+  @Deprecated('Use getGetter instead')
   @override
-  MethodElement2OrMember? getMethod2(String methodName) {
+  GetterElement2OrMember? getGetter2(String getterName) {
+    return getGetter(getterName);
+  }
+
+  @override
+  MethodElement2OrMember? getMethod(String methodName) {
     var element = element3.getMethod(methodName);
     return element != null ? MethodMember.forTargetType(element, this) : null;
   }
 
+  @Deprecated('Use getMethod instead')
   @override
-  SetterElement2OrMember? getSetter2(String setterName) {
+  MethodElement2OrMember? getMethod2(String methodName) {
+    return getMethod(methodName);
+  }
+
+  @override
+  SetterElement2OrMember? getSetter(String setterName) {
     var element = element3.getSetter(setterName);
     return element != null ? SetterMember.forTargetType(element, this) : null;
   }
 
+  @Deprecated('Use getSetter instead')
   @override
-  ConstructorElementMixin2? lookUpConstructor2(
+  SetterElement2OrMember? getSetter2(String setterName) {
+    return getSetter(setterName);
+  }
+
+  @override
+  ConstructorElementMixin2? lookUpConstructor(
     String? constructorName,
     LibraryElement library,
   ) {
@@ -919,8 +937,17 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
     return ConstructorMember.from2(constructorElement, this);
   }
 
+  @Deprecated('Use lookUpConstructor instead')
   @override
-  GetterElement2OrMember? lookUpGetter3(
+  ConstructorElementMixin2? lookUpConstructor2(
+    String? constructorName,
+    LibraryElement library,
+  ) {
+    return lookUpConstructor(constructorName, library);
+  }
+
+  @override
+  GetterElement2OrMember? lookUpGetter(
     String name,
     LibraryElement library, {
     bool concrete = false,
@@ -957,8 +984,26 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
     return null;
   }
 
+  @Deprecated('Use lookUpGetter instead')
   @override
-  MethodElement2OrMember? lookUpMethod3(
+  GetterElement2OrMember? lookUpGetter3(
+    String name,
+    LibraryElement library, {
+    bool concrete = false,
+    bool inherited = false,
+    bool recoveryStatic = false,
+  }) {
+    return lookUpGetter(
+      name,
+      library,
+      concrete: concrete,
+      inherited: inherited,
+      recoveryStatic: recoveryStatic,
+    );
+  }
+
+  @override
+  MethodElement2OrMember? lookUpMethod(
     String name,
     LibraryElement library, {
     bool concrete = false,
@@ -995,8 +1040,26 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
     return null;
   }
 
+  @Deprecated('Use lookUpMethod instead')
   @override
-  SetterElement2OrMember? lookUpSetter3(
+  MethodElement2OrMember? lookUpMethod3(
+    String name,
+    LibraryElement library, {
+    bool concrete = false,
+    bool inherited = false,
+    bool recoveryStatic = false,
+  }) {
+    return lookUpMethod(
+      name,
+      library,
+      concrete: concrete,
+      inherited: inherited,
+      recoveryStatic: recoveryStatic,
+    );
+  }
+
+  @override
+  SetterElement2OrMember? lookUpSetter(
     String name,
     LibraryElement library, {
     bool concrete = false,
@@ -1033,6 +1096,24 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
     return null;
   }
 
+  @Deprecated('Use lookUpSetter instead')
+  @override
+  SetterElement2OrMember? lookUpSetter3(
+    String name,
+    LibraryElement library, {
+    bool concrete = false,
+    bool inherited = false,
+    bool recoveryStatic = false,
+  }) {
+    return lookUpSetter(
+      name,
+      library,
+      concrete: concrete,
+      inherited: inherited,
+      recoveryStatic: recoveryStatic,
+    );
+  }
+
   @Deprecated('Use referencesAny2() instead')
   @override
   bool referencesAny(Set<TypeParameterFragmentImpl> parameters) {

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

@@ -539,7 +539,7 @@ class TypeSystemImpl implements TypeSystem {
   FunctionTypeImpl? getCallMethodType(DartType t) {
     if (t is InterfaceTypeImpl) {
       return t
-          .lookUpMethod3(MethodElement.CALL_METHOD_NAME, t.element3.library2)
+          .lookUpMethod(MethodElement.CALL_METHOD_NAME, t.element3.library2)
           ?.type;
     }
     return null;

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

@@ -414,7 +414,7 @@ class AnnotationResolver {
     List<WhyNotPromotedGetter> whyNotPromotedArguments, {
     required TypeConstraintGenerationDataForTesting? dataForTesting,
   }) {
-    var constructorElement = aliasedType.lookUpConstructor2(
+    var constructorElement = aliasedType.lookUpConstructor(
       constructorName?.name,
       _definingLibrary,
     );

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

@@ -175,7 +175,7 @@ class FunctionReferenceResolver {
     }
     // Otherwise, a 'call' method on the interface, or on an applicable
     // extension method applies.
-    return type.lookUpMethod3(
+    return type.lookUpMethod(
           MethodElement.CALL_METHOD_NAME,
           type.element3.library2,
         ) ??

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

@@ -109,7 +109,7 @@ class InvocationInferenceHelper {
       var aliasedType = typeElement.aliasedType;
       if (aliasedType is InterfaceTypeImpl) {
         var constructorIdentifier = constructorName;
-        rawElement = aliasedType.lookUpConstructor2(
+        rawElement = aliasedType.lookUpConstructor(
           constructorIdentifier?.name,
           definingLibrary,
         );