Elements. Deprecate InterfaceElement.constructors2, use constructors.

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

Author: scheglov

pkg/analysis_server/lib/src/cider/local_library_contributor.dart

@@ -193,7 +193,7 @@ class LibraryElementSuggestionBuilder
       return;
     }
 
-    for (var constructor in element.constructors2) {
+    for (var constructor in element.constructors) {
       if (constructor.isPrivate) {
         continue;
       }

pkg/analysis_server/lib/src/services/completion/dart/declaration_helper.dart

@@ -162,7 +162,7 @@ class DeclarationHelper {
 
   /// Add suggestions for all constructors of [element].
   void addConstructorNamesForElement({required InterfaceElement element}) {
-    var constructors = element.constructors2;
+    var constructors = element.constructors;
     for (var constructor in constructors) {
       _suggestConstructor(
         constructor,
@@ -610,7 +610,7 @@ class DeclarationHelper {
     var typeSystem = library.typeSystem;
     for (var classElement in library.classes) {
       if (typeSystem.isSubtypeOf(classElement.thisType, classType)) {
-        for (var constructor in classElement.constructors2) {
+        for (var constructor in classElement.constructors) {
           if (constructor != redirectingConstructor &&
               constructor.isAccessibleIn2(library)) {
             _suggestConstructor(
@@ -638,7 +638,7 @@ class DeclarationHelper {
         _addStaticMembers(
           getters: element.getters,
           setters: element.setters,
-          constructors: element.constructors2,
+          constructors: element.constructors,
           containingElement: element,
           fields: element.fields,
           methods: element.methods,
@@ -656,7 +656,7 @@ class DeclarationHelper {
         _addStaticMembers(
           getters: element.getters,
           setters: element.setters,
-          constructors: element.constructors2,
+          constructors: element.constructors,
           containingElement: element,
           fields: element.fields,
           methods: element.methods,
@@ -669,16 +669,16 @@ class DeclarationHelper {
   void _addConstructors(LibraryElement library, ImportData importData) {
     for (var element in library.classes) {
       _suggestConstructors(
-        element.constructors2,
+        element.constructors,
         importData,
         allowNonFactory: !element.isAbstract,
       );
     }
     for (var element in library.enums) {
-      _suggestConstructors(element.constructors2, importData);
+      _suggestConstructors(element.constructors, importData);
     }
     for (var element in library.extensionTypes) {
-      _suggestConstructors(element.constructors2, importData);
+      _suggestConstructors(element.constructors, importData);
     }
     for (var element in library.typeAliases) {
       _addConstructorsForAliasedElement(element, importData);
@@ -694,14 +694,14 @@ class DeclarationHelper {
     var aliasedElement = alias.aliasedElement2;
     if (aliasedElement is ClassElement) {
       _suggestConstructors(
-        aliasedElement.constructors2,
+        aliasedElement.constructors,
         importData,
         allowNonFactory: !aliasedElement.isAbstract,
       );
     } else if (aliasedElement is ExtensionTypeElement) {
-      _suggestConstructors(aliasedElement.constructors2, importData);
+      _suggestConstructors(aliasedElement.constructors, importData);
     } else if (aliasedElement is MixinElement) {
-      _suggestConstructors(aliasedElement.constructors2, importData);
+      _suggestConstructors(aliasedElement.constructors, importData);
     }
   }
 
@@ -721,12 +721,12 @@ class DeclarationHelper {
       switch (element) {
         case ClassElement():
           _suggestConstructors(
-            element.constructors2,
+            element.constructors,
             importData,
             allowNonFactory: !element.isAbstract,
           );
         case ExtensionTypeElement():
-          _suggestConstructors(element.constructors2, importData);
+          _suggestConstructors(element.constructors, importData);
         case TypeAliasElement():
           _addConstructorsForAliasedElement(element, importData);
       }
@@ -1694,7 +1694,7 @@ class DeclarationHelper {
       if (!mustBeType) {
         _suggestStaticFields(element.fields, importData);
         _suggestConstructors(
-          element.constructors2,
+          element.constructors,
           importData,
           allowNonFactory: !element.isAbstract,
         );
@@ -1799,7 +1799,7 @@ class DeclarationHelper {
       if (!mustBeType) {
         _suggestStaticFields(element.fields, importData);
         _suggestConstructors(
-          element.constructors2,
+          element.constructors,
           importData,
           allowNonFactory: false,
         );
@@ -1852,7 +1852,7 @@ class DeclarationHelper {
       }
       if (!mustBeType) {
         _suggestStaticFields(element.fields, importData);
-        _suggestConstructors(element.constructors2, importData);
+        _suggestConstructors(element.constructors, importData);
       }
     }
   }

pkg/analysis_server/lib/src/services/flutter/property.dart

@@ -486,7 +486,7 @@ class _EdgeInsetsProperty {
       }
     }
 
-    onlyConstructor = classEdgeInsets.constructors2.firstWhereOrNull(
+    onlyConstructor = classEdgeInsets.constructors.firstWhereOrNull(
       (e) => e.name3 == 'only',
     );
 

pkg/analysis_server/lib/src/services/refactoring/legacy/rename_class_member.dart

@@ -106,7 +106,7 @@ class RenameClassMemberRefactoringImpl extends RenameRefactoringImpl {
         if (!newName.startsWith('_')) {
           var interfaceElement = renameElement.enclosingElement;
           if (interfaceElement is InterfaceElement) {
-            for (var constructor in interfaceElement.constructors2) {
+            for (var constructor in interfaceElement.constructors) {
               for (var parameter in constructor.formalParameters) {
                 if (parameter is FieldFormalParameterElement &&
                     parameter.field2 == renameElement) {

pkg/analysis_server/lib/src/services/search/hierarchy.dart

@@ -171,7 +171,7 @@ getHierarchyMembersAndParameters(
       }
 
       if (includeParametersForFields && member2 is FieldElement) {
-        for (var constructor in subClass.constructors2) {
+        for (var constructor in subClass.constructors) {
           for (var parameter in constructor.formalParameters) {
             if (parameter is FieldFormalParameterElement &&
                 parameter.field2 == member2) {

pkg/analysis_server/test/services/search/hierarchy_test.dart

@@ -38,8 +38,8 @@ class B extends A {
 ''');
     var classA = findElement2.class_('A');
     var classB = findElement2.class_('B');
-    var memberA = classA.constructors2[0];
-    var memberB = classB.constructors2[0];
+    var memberA = classA.constructors[0];
+    var memberB = classB.constructors[0];
     var futureA = getHierarchyMembers(searchEngine, memberA).then((members) {
       expect(members, unorderedEquals([memberA]));
     });

pkg/analyzer/CHANGELOG.md

@@ -29,6 +29,8 @@
 * Deprecate `InstanceElement.getMethod2`, use `getMethod` instead.
 * Deprecate `InstanceFragment.fields2`, use `fields` instead.
 * Deprecate `InstanceFragment.methods2`, use `methods` instead.
+* Deprecate `InterfaceElement.constructors2`, use `constructors` instead.
+* Deprecate `InterfaceFragment.constructors2`, use `constructors` instead.
 
 ## 7.4.1
 * Restore `InstanceElement.augmented` getter.

pkg/analyzer/api.txt

@@ -3405,7 +3405,8 @@ package:analyzer/dart/element/element.dart:
   InterfaceElement (class extends Object implements InstanceElement):
     new (constructor: InterfaceElement Function())
     allSupertypes (getter: List<InterfaceType>)
-    constructors2 (getter: List<ConstructorElement>)
+    constructors (getter: List<ConstructorElement>)
+    constructors2 (getter: List<ConstructorElement>, deprecated)
     firstFragment (getter: InterfaceFragment)
     fragments (getter: List<InterfaceFragment>)
     inheritedConcreteMembers (getter: Map<Name, ExecutableElement>)
@@ -3426,7 +3427,8 @@ package:analyzer/dart/element/element.dart:
     lookUpInheritedMethod2 (method: MethodElement? Function({required LibraryElement library, required String methodName}))
   InterfaceFragment (class extends Object implements InstanceFragment):
     new (constructor: InterfaceFragment Function())
-    constructors2 (getter: List<ConstructorFragment>)
+    constructors (getter: List<ConstructorFragment>)
+    constructors2 (getter: List<ConstructorFragment>, deprecated)
     element (getter: InterfaceElement)
     interfaces (getter: List<InterfaceType>)
     mixins (getter: List<InterfaceType>)

pkg/analyzer/doc/tutorial/element.md

@@ -73,7 +73,7 @@ it might look something like this:
 void printMembers(LibraryElement libraryElement) {
   for (ClassElement classElement in libraryElement.classes) {
     print(classElement.name3);
-    for (ConstructorElement constructorElement in classElement.constructors2) {
+    for (ConstructorElement constructorElement in classElement.constructors) {
       if (!constructorElement.isSynthetic) {
         print('  ${constructorElement.displayName}');
       }

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

@@ -1986,6 +1986,12 @@ abstract class InterfaceElement implements InstanceElement {
   /// The constructors defined for this element.
   ///
   /// The list is empty for [MixinElement].
+  List<ConstructorElement> get constructors;
+
+  /// The constructors defined for this element.
+  ///
+  /// The list is empty for [MixinElement].
+  @Deprecated('Use constructors instead')
   List<ConstructorElement> get constructors2;
 
   @override
@@ -2123,7 +2129,7 @@ abstract class InterfaceElement implements InstanceElement {
   /// since it does not need to consider all possible interface names.
   ExecutableElement? getInterfaceMember(Name name);
 
-  /// Returns the constructor from [constructors2] that has the given [name].
+  /// Returns the constructor from [constructors] that has the given [name].
   ConstructorElement? getNamedConstructor2(String name);
 
   /// Returns all members of mixins, superclasses, and interfaces that a member
@@ -2202,6 +2208,12 @@ abstract class InterfaceFragment implements InstanceFragment {
   /// The constructors declared in this fragment.
   ///
   /// The list is empty for [MixinFragment].
+  List<ConstructorFragment> get constructors;
+
+  /// The constructors declared in this fragment.
+  ///
+  /// The list is empty for [MixinFragment].
+  @Deprecated('Use constructors instead')
   List<ConstructorFragment> get constructors2;
 
   @override