Deprecate InterfaceType.methods2, use methods instead.

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

Author: fshcheglov

pkg/analyzer/CHANGELOG.md

@@ -109,6 +109,7 @@
 * Deprecated `PatternField.element2, use `element` instead.
 * Deprecated `RelationalPattern.element2, use `element` instead.
 * Deprecated `VariableDeclaration.declaredElement2, use `declaredElement` instead.
+* Deprecate `InterfaceType.methods2`, use `methods` instead.
 
 ## 7.4.1
 * Restore `InstanceElement.augmented` getter.

pkg/analyzer/api.txt

@@ -4420,7 +4420,8 @@ package:analyzer/dart/element/type.dart:
     element3 (getter: InterfaceElement, deprecated, experimental)
     getters (getter: List<GetterElement>, experimental)
     interfaces (getter: List<InterfaceType>)
-    methods2 (getter: List<MethodElement>, experimental)
+    methods (getter: List<MethodElement>, experimental)
+    methods2 (getter: List<MethodElement>, deprecated, experimental)
     mixins (getter: List<InterfaceType>)
     setters (getter: List<SetterElement>, experimental)
     superclass (getter: InterfaceType?)

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

@@ -310,6 +310,11 @@ abstract class InterfaceType implements ParameterizedType {
 
   /// Return a list containing all of the methods declared in this type.
   @experimental
+  List<MethodElement> get methods;
+
+  /// Return a list containing all of the methods declared in this type.
+  @Deprecated('Use methods instead')
+  @experimental
   List<MethodElement> get methods2;
 
   /// Return a list containing all of the mixins that are applied to the class

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

@@ -762,13 +762,17 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
   }
 
   @override
-  List<MethodElement2OrMember> get methods2 {
+  List<MethodElement2OrMember> get methods {
     return _methods ??=
         element.methods.map((e) {
           return MethodMember.forTargetType(e, this);
         }).toFixedList();
   }
 
+  @Deprecated('Use methods instead')
+  @override
+  List<MethodElement2OrMember> get methods2 => methods;
+
   @override
   List<InterfaceTypeImpl> get mixins {
     return _instantiateSuperTypes(element.mixins);

pkg/analyzer/lib/src/error/inheritance_override.dart

@@ -430,7 +430,7 @@ class _ClassVerifier {
     required int mixinIndex,
   }) {
     var libraryUri = type.element.library.uri;
-    for (var method in type.methods2) {
+    for (var method in type.methods) {
       _checkDeclaredMember(node, libraryUri, method, mixinIndex: mixinIndex);
     }
     for (var getter in type.getters) {
@@ -976,7 +976,7 @@ class _ClassVerifier {
       // we could store a bit on ClassElement (included in summaries) which
       // denotes whether any declared element has been so annotated. Then the
       // expensive looping is deferred until we have such a class.
-      for (var method in supertype.methods2) {
+      for (var method in supertype.methods) {
         if (method.isPrivate && method.library != classElement.library) {
           continue;
         }

pkg/analyzer/lib/src/generated/error_verifier.dart

@@ -4534,7 +4534,7 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
               return;
             }
           }
-          for (var method in type.methods2) {
+          for (var method in type.methods) {
             if (method.isStatic) {
               continue;
             }

pkg/analyzer/lib/src/generated/exhaustiveness.dart

@@ -418,7 +418,7 @@ class AnalyzerTypeOperations implements TypeOperations<TypeImpl> {
           fieldTypes[NameKey(name)] = getter.type.returnType;
         }
       }
-      for (var method in type.methods2) {
+      for (var method in type.methods) {
         if (method.isPrivate && method.library != _enclosingLibrary) {
           continue;
         }

pkg/analyzer/test/src/dart/constant/value_test.dart

@@ -1152,7 +1152,7 @@ class DartObjectImplTest {
 
   void test_identical_Type_functionType() {
     var toStringType =
-        _typeProvider.intType.methods2
+        _typeProvider.intType.methods
             .firstWhere((e) => e.name3 == 'toString')
             .type;
 

pkg/analyzer_plugin/lib/utilities/completion/inherited_reference_contributor.dart

@@ -91,7 +91,7 @@ class InheritedReferenceContributor
         }
       }
     }
-    for (var elem in type.methods2) {
+    for (var elem in type.methods) {
       if (elem.returnType is! VoidType) {
         if (optype.includeReturnValueSuggestions) {
           addSuggestion(elem);

pkg/analyzer_plugin/lib/utilities/completion/type_member_contributor.dart

@@ -307,7 +307,7 @@ class _SuggestionBuilder {
     // exceptions to handle getter/setter pairs).
     var types = _getTypeOrdering(type);
     for (var targetType in types) {
-      for (var method in targetType.methods2) {
+      for (var method in targetType.methods) {
         // Exclude static methods when completion on an instance
         if (!method.isStatic) {
           // Boost the relevance of a super expression