Deprecate InterfaceType.constructors2, use constructors instead.

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

Author: fshcheglov

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

@@ -182,7 +182,7 @@ class DeclarationHelper {
     required InterfaceType type,
     String? exclude,
   }) {
-    for (var constructor in type.constructors2) {
+    for (var constructor in type.constructors) {
       var name = constructor.name3;
       if (name != 'new' &&
           name != exclude &&

pkg/analysis_server/lib/src/services/correction/dart/add_key_to_constructors.dart

@@ -80,7 +80,7 @@ class AddKeyToConstructors extends ResolvedCorrectionProducer {
       return;
     }
     var className = node.name.lexeme;
-    var constructors = node.declaredFragment!.element.supertype?.constructors2;
+    var constructors = node.declaredFragment!.element.supertype?.constructors;
     if (constructors == null) {
       return;
     }

pkg/analysis_server/lib/src/services/correction/dart/add_super_constructor_invocation.dart

@@ -43,7 +43,7 @@ class AddSuperConstructorInvocation extends MultiCorrectionProducer {
       prefix = ', ';
     }
     var producers = <ResolvedCorrectionProducer>[];
-    for (var constructor in superType.constructors2) {
+    for (var constructor in superType.constructors) {
       // Only propose public constructors.
       var name = constructor.name3;
       if (name != null && !Identifier.isPrivateName(name)) {

pkg/analysis_server/lib/src/services/correction/dart/change_to.dart

@@ -326,7 +326,7 @@ class ChangeTo extends ResolvedCorrectionProducer {
       var superType = targetClassElement.supertype;
       if (superType == null) return;
 
-      for (var constructor in superType.constructors2) {
+      for (var constructor in superType.constructors) {
         if (constructor.name3 == 'new') {
           var list = _formalParameterSuggestions(constructor, formalParameters);
           finder._updateList(list);

pkg/analysis_server/lib/src/services/correction/dart/create_constructor_for_final_fields.dart

@@ -420,7 +420,7 @@ class _FixContext {
   });
 
   List<FormalParameterElement>? get superNamed {
-    var superConstructor = superType.constructors2.singleOrNull;
+    var superConstructor = superType.constructors.singleOrNull;
     if (superConstructor != null) {
       var superAll = superConstructor.formalParameters;
       var superNamed = superAll.where((e) => e.isNamed).toList();

pkg/analysis_server/lib/src/services/correction/dart/create_constructor_super.dart

@@ -28,7 +28,7 @@ class CreateConstructorSuper extends MultiCorrectionProducer {
 
     var producers = <ResolvedCorrectionProducer>[];
     // add proposals for all super constructors
-    for (var constructor in superType.constructors2) {
+    for (var constructor in superType.constructors) {
       // Only propose public constructors.
       var name = constructor.name3;
       if (name != null && !Identifier.isPrivateName(name)) {

pkg/analyzer/CHANGELOG.md

@@ -71,6 +71,7 @@
 * Deprecate `ExtensionTypeFragment.representation2`, use `representation` instead.
 * Deprecate `DartType.element3`, use `element` instead.
 * Deprecate `LibraryElement.loadLibraryFunction2`, use `loadLibraryFunction` instead.
+* Deprecate `InterfaceType.constructors2`, use `constructors` instead.
 
 ## 7.4.1
 * Restore `InstanceElement.augmented` getter.

pkg/analyzer/api.txt

@@ -4394,7 +4394,8 @@ package:analyzer/dart/element/type.dart:
   InterfaceType (class extends Object implements ParameterizedType):
     new (constructor: InterfaceType Function())
     allSupertypes (getter: List<InterfaceType>)
-    constructors2 (getter: List<ConstructorElement>, experimental)
+    constructors (getter: List<ConstructorElement>, experimental)
+    constructors2 (getter: List<ConstructorElement>, deprecated, experimental)
     element (getter: InterfaceElement, experimental)
     element3 (getter: InterfaceElement, deprecated, experimental)
     getters (getter: List<GetterElement>, experimental)

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

@@ -279,6 +279,10 @@ abstract class InterfaceType implements ParameterizedType {
 
   /// Return a list containing all of the constructors declared in this type.
   @experimental
+  List<ConstructorElement> get constructors;
+
+  @Deprecated('Use constructors instead')
+  @experimental
   List<ConstructorElement> get constructors2;
 
   @experimental

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

@@ -440,7 +440,7 @@ class ClassElementImpl extends InterfaceElementImpl implements ClassElement {
     // Assign to break a possible infinite recursion during computing.
     _constructors = const <ConstructorElementImpl>[];
 
-    var superConstructors = superType.constructors2
+    var superConstructors = superType.constructors
         .where((constructor) => constructor.isAccessibleIn2(library))
         .where((constructor) => constructor.isGenerative)
         .toList(growable: false);

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

@@ -665,13 +665,17 @@ class InterfaceTypeImpl extends TypeImpl implements InterfaceType {
   }
 
   @override
-  List<ConstructorElementMixin2> get constructors2 {
+  List<ConstructorElementMixin2> get constructors {
     return _constructors ??=
         element.constructors.map((constructor) {
           return ConstructorMember.from2(constructor, this);
         }).toFixedList();
   }
 
+  @Deprecated('Use constructors instead')
+  @override
+  List<ConstructorElementMixin2> get constructors2 => constructors;
+
   @Deprecated('Use element instead')
   @override
   InterfaceElementImpl get element3 => element;

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

@@ -164,7 +164,7 @@ class GatherUsedLocalElementsVisitor extends RecursiveAstVisitor<void> {
     if (!Identifier.isPrivateName(node.name.lexeme)) {
       var type = node.type.type;
       if (type is InterfaceTypeImpl) {
-        for (var constructor in type.constructors2) {
+        for (var constructor in type.constructors) {
           if (!Identifier.isPrivateName(constructor.name3!)) {
             usedElements.addElement(constructor);
           }

pkg/analyzer/lib/src/summary2/super_constructor_resolver.dart

@@ -48,7 +48,7 @@ class SuperConstructorResolver {
             invokesDefaultSuperConstructor = false;
             var name = initializer.constructorName?.name ?? 'new';
             element.superConstructor2 =
-                classElement.supertype?.constructors2
+                classElement.supertype?.constructors
                     .where((element) => element.name3 == name)
                     .firstOrNull;
           }
@@ -58,7 +58,7 @@ class SuperConstructorResolver {
 
     if (invokesDefaultSuperConstructor) {
       element.superConstructor2 =
-          classElement.supertype?.constructors2
+          classElement.supertype?.constructors
               .where((element) => element.name3 == 'new')
               .firstOrNull;
     }

pkg/linter/lib/src/rules/prefer_const_constructors_in_immutables.dart

@@ -105,7 +105,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     }
 
     // Constructor with implicit `super()` call.
-    var unnamedSuperConstructor = clazz.supertype?.constructors2
+    var unnamedSuperConstructor = clazz.supertype?.constructors
         .firstWhereOrNull((e) => e.name3 == 'new');
     return unnamedSuperConstructor != null && unnamedSuperConstructor.isConst;
   }

pkg/linter/lib/src/rules/unreachable_from_main.dart

@@ -404,7 +404,7 @@ class _ReferenceVisitor extends RecursiveAstVisitor<void> {
     var classElement = class_.declaredFragment?.element;
     var supertype = classElement?.supertype;
     if (supertype != null) {
-      var unnamedConstructor = supertype.constructors2.firstWhereOrNull(
+      var unnamedConstructor = supertype.constructors.firstWhereOrNull(
         (e) => e.name3 == 'new',
       );
       if (unnamedConstructor != null) {