Elements. Remove V1 ConstructorElement.

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

Author: scheglov

pkg/analyzer/api.txt

@@ -2985,13 +2985,10 @@ package:analyzer/dart/element/element.dart:
     lookUpSetter (method: PropertyAccessorElement? Function({required LibraryElement library, required String name}))
   AugmentedInterfaceElement (class extends Object implements AugmentedInstanceElement, deprecated):
     new (constructor: AugmentedInterfaceElement Function())
-    constructors (getter: List<ConstructorElement>)
     firstFragment (getter: InterfaceElement)
     interfaces (getter: List<InterfaceType>)
     mixins (getter: List<InterfaceType>)
     thisType (getter: InterfaceType)
-    unnamedConstructor (getter: ConstructorElement?)
-    getNamedConstructor (method: ConstructorElement? Function(String))
   AugmentedMixinElement (class extends AugmentedInterfaceElement, deprecated):
     new (constructor: AugmentedMixinElement Function())
     superclassConstraints (getter: List<InterfaceType>)
@@ -3015,21 +3012,6 @@ package:analyzer/dart/element/element.dart:
     session (getter: AnalysisSession)
     topLevelVariables (getter: List<TopLevelVariableElement>)
     typeAliases (getter: List<TypeAliasElement>)
-  ConstructorElement (class extends Object implements ClassMemberElement, ExecutableElement, ConstantEvaluationTarget, deprecated):
-    new (constructor: ConstructorElement Function())
-    declaration (getter: ConstructorElement)
-    displayName (getter: String)
-    enclosingElement3 (getter: InterfaceElement)
-    isConst (getter: bool)
-    isDefaultConstructor (getter: bool)
-    isFactory (getter: bool)
-    isGenerative (getter: bool)
-    name (getter: String)
-    nameEnd (getter: int?)
-    periodOffset (getter: int?)
-    redirectedConstructor (getter: ConstructorElement?)
-    returnType (getter: InterfaceType)
-    superConstructor (getter: ConstructorElement?)
   DeferredImportElementPrefix (class extends Object implements ImportElementPrefix, deprecated):
     new (constructor: DeferredImportElementPrefix Function())
   DirectiveUri (class extends Object):
@@ -3253,17 +3235,14 @@ package:analyzer/dart/element/element.dart:
     new (constructor: InterfaceElement Function())
     allSupertypes (getter: List<InterfaceType>)
     augmented (getter: AugmentedInterfaceElement, deprecated)
-    constructors (getter: List<ConstructorElement>, deprecated)
     interfaces (getter: List<InterfaceType>)
     mixins (getter: List<InterfaceType>, deprecated)
     name (getter: String)
     supertype (getter: InterfaceType?, deprecated)
     thisType (getter: InterfaceType)
-    unnamedConstructor (getter: ConstructorElement?, deprecated)
     getField (method: FieldElement? Function(String))
     getGetter (method: PropertyAccessorElement? Function(String))
     getMethod (method: MethodElement? Function(String))
-    getNamedConstructor (method: ConstructorElement? Function(String), deprecated)
     getSetter (method: PropertyAccessorElement? Function(String))
     instantiate (method: InterfaceType Function({required NullabilitySuffix nullabilitySuffix, required List<DartType> typeArguments}))
     lookUpConcreteMethod (method: MethodElement? Function(String, LibraryElement))
@@ -4281,7 +4260,6 @@ package:analyzer/dart/element/type.dart:
     new (constructor: InterfaceType Function())
     accessors (getter: List<PropertyAccessorElement>, deprecated)
     allSupertypes (getter: List<InterfaceType>)
-    constructors (getter: List<ConstructorElement>, deprecated)
     constructors2 (getter: List<ConstructorElement2>, experimental)
     element (getter: InterfaceElement, deprecated)
     element3 (getter: InterfaceElement2, experimental)
@@ -4299,7 +4277,6 @@ package:analyzer/dart/element/type.dart:
     getMethod2 (method: MethodElement2? Function(String))
     getSetter (method: PropertyAccessorElement? Function(String), deprecated)
     getSetter2 (method: SetterElement? Function(String))
-    lookUpConstructor (method: ConstructorElement? Function(String?, LibraryElement), deprecated)
     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}))

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

@@ -146,12 +146,6 @@ abstract class AugmentedInstanceElement {
 /// Clients may not extend, implement or mix-in this class.
 @Deprecated(elementModelDeprecationMsg)
 abstract class AugmentedInterfaceElement implements AugmentedInstanceElement {
-  /// The constructors declared in this element.
-  ///
-  /// `ConstructorAugmentationElement`s replace corresponding elements,
-  /// other [ConstructorElement]s are appended.
-  List<ConstructorElement> get constructors;
-
   @override
   InterfaceElement get firstFragment;
 
@@ -169,12 +163,6 @@ abstract class AugmentedInterfaceElement implements AugmentedInstanceElement {
 
   @override
   InterfaceType get thisType;
-
-  /// The unnamed constructor from [constructors].
-  ConstructorElement? get unnamedConstructor;
-
-  /// Returns the constructor from [constructors] that has the given [name].
-  ConstructorElement? getNamedConstructor(String name);
 }
 
 /// The result of applying augmentations to a [MixinElement].
@@ -270,62 +258,6 @@ abstract class CompilationUnitElement implements UriReferencedElement {
   List<TypeAliasElement> get typeAliases;
 }
 
-/// An element representing a constructor or a factory method defined within a
-/// class.
-///
-/// Clients may not extend, implement or mix-in this class.
-@Deprecated('Use ConstructorElement2 instead')
-abstract class ConstructorElement
-    implements ClassMemberElement, ExecutableElement, ConstantEvaluationTarget {
-  @override
-  ConstructorElement get declaration;
-
-  @override
-  String get displayName;
-
-  @override
-  InterfaceElement get enclosingElement3;
-
-  /// Whether the constructor is a const constructor.
-  bool get isConst;
-
-  /// Whether the constructor can be used as a default constructor - unnamed,
-  /// and has no required parameters.
-  bool get isDefaultConstructor;
-
-  /// Whether the constructor represents a factory constructor.
-  bool get isFactory;
-
-  /// Whether the constructor represents a generative constructor.
-  bool get isGenerative;
-
-  @override
-  String get name;
-
-  /// The offset of the character immediately following the last character of
-  /// this constructor's name, or `null` if not named.
-  ///
-  // TODO(migration): encapsulate [nameEnd] and [periodOffset]?
-  int? get nameEnd;
-
-  /// The offset of the `.` before this constructor name, or `null` if not
-  /// named.
-  int? get periodOffset;
-
-  /// The constructor to which this constructor is redirecting, or `null` if
-  /// this constructor does not redirect to another constructor or if the
-  /// library containing this constructor has not yet been resolved.
-  ConstructorElement? get redirectedConstructor;
-
-  @override
-  InterfaceType get returnType;
-
-  /// The constructor of the superclass that this constructor invokes, or
-  /// `null` if this constructor redirects to another constructor, or if the
-  /// library containing this constructor has not yet been resolved.
-  ConstructorElement? get superConstructor;
-}
-
 /// [ImportElementPrefix] that is used together with `deferred`.
 ///
 /// Clients may not extend, implement or mix-in this class.
@@ -1236,12 +1168,6 @@ abstract class InterfaceElement implements InstanceElement {
   @override
   AugmentedInterfaceElement get augmented;
 
-  /// The declared constructors.
-  ///
-  /// The list is empty for [MixinElement].
-  @Deprecated(elementModelDeprecationMsg)
-  List<ConstructorElement> get constructors;
-
   /// The interfaces that are implemented by this class.
   ///
   /// <b>Note:</b> Because the element model represents the state of the code,
@@ -1290,14 +1216,6 @@ abstract class InterfaceElement implements InstanceElement {
   @override
   InterfaceType get thisType;
 
-  /// The unnamed constructor declared directly in this class.
-  ///
-  /// If the class does not declare any constructors, a synthetic default
-  /// constructor will be returned.
-  // TODO(scheglov): Deprecate and remove it.
-  @Deprecated(elementModelDeprecationMsg)
-  ConstructorElement? get unnamedConstructor;
-
   /// The field (synthetic or explicit) defined directly in this class or
   /// augmentation that has the given [name].
   // TODO(scheglov): Deprecate and remove it.
@@ -1313,12 +1231,6 @@ abstract class InterfaceElement implements InstanceElement {
   // TODO(scheglov): Deprecate and remove it.
   MethodElement? getMethod(String name);
 
-  /// The constructor defined directly in this class or augmentation
-  /// that has the given [name].
-  // TODO(scheglov): Deprecate and remove it.
-  @Deprecated(elementModelDeprecationMsg)
-  ConstructorElement? getNamedConstructor(String name);
-
   /// The setter (synthetic or explicit) defined directly in this class or
   /// augmentation that has the given [name].
   // TODO(scheglov): Deprecate and remove it.

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

@@ -352,10 +352,6 @@ abstract class InterfaceType implements ParameterizedType {
   /// includes superclasses, mixins, interfaces, and superclass constraints.
   List<InterfaceType> get allSupertypes;
 
-  /// Return a list containing all of the constructors declared in this type.
-  @Deprecated('Use constructors2 instead')
-  List<ConstructorElement> get constructors;
-
   /// Return a list containing all of the constructors declared in this type.
   @experimental
   List<ConstructorElement2> get constructors2;
@@ -442,19 +438,6 @@ abstract class InterfaceType implements ParameterizedType {
   /// with the given name.
   SetterElement? getSetter2(String name);
 
-  /// 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 lookUpConstructor2() instead')
-  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

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

@@ -13,7 +13,6 @@ import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/syntactic_entity.dart';
 import 'package:analyzer/dart/constant/value.dart';
-import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/element2.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/diagnostic/diagnostic.dart';
@@ -157,9 +156,6 @@ class ConstructorInvocation {
   ConstructorInvocation(
       this.constructor2, this._argumentValues, this.namedArguments);
 
-  @Deprecated('Use constructor2 instead')
-  ConstructorElement get constructor => constructor2.asElement;
-
   /// The positional arguments passed to the constructor.
   List<DartObjectImpl> get positionalArguments {
     var result = <DartObjectImpl>[];

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

@@ -165,9 +165,6 @@ class AugmentedInterfaceElementImpl extends AugmentedInstanceElementImpl
     implements AugmentedInterfaceElement {
   AugmentedInterfaceElementImpl(super.firstFragment);
 
-  @override
-  List<ConstructorElement> get constructors => firstFragment.constructors;
-
   @override
   InterfaceElementImpl get firstFragment {
     return super.firstFragment as InterfaceElementImpl;
@@ -183,15 +180,6 @@ class AugmentedInterfaceElementImpl extends AugmentedInstanceElementImpl
   InterfaceType get thisType {
     return super.thisType as InterfaceType;
   }
-
-  @override
-  ConstructorElement? get unnamedConstructor =>
-      firstFragment.unnamedConstructor;
-
-  @override
-  ConstructorElement? getNamedConstructor(String name) {
-    return constructors.firstWhereOrNull((e) => e.name == name);
-  }
 }
 
 class BindPatternVariableElementImpl extends PatternVariableElementImpl
@@ -1386,12 +1374,8 @@ class ConstLocalVariableElementImpl extends LocalVariableElementImpl
 
 /// A concrete implementation of a [ConstructorFragment].
 class ConstructorElementImpl extends ExecutableElementImpl
-    with
-        ConstructorElementMixin
-    implements
-        // ignore:deprecated_member_use_from_same_package,analyzer_use_new_elements
-        ConstructorElement,
-        ConstructorFragment {
+    with ConstructorElementMixin
+    implements ConstructorFragment {
   late final ConstructorElementImpl2 element =
       ConstructorElementImpl2(name.ifNotEmptyOrElse('new'), this);
 
@@ -1419,7 +1403,6 @@ class ConstructorElementImpl extends ExecutableElementImpl
   @override
   int? periodOffset;
 
-  @override
   int? nameEnd;
 
   @override
@@ -1559,7 +1542,6 @@ class ConstructorElementImpl extends ExecutableElementImpl
     assert(false);
   }
 
-  @override
   ConstructorElementMixin? get superConstructor {
     linkedData?.read(this);
     return _superConstructor;
@@ -1728,17 +1710,18 @@ class ConstructorElementImpl2 extends ExecutableElementImpl2
 }
 
 mixin ConstructorElementMixin
-    implements
-        // ignore:deprecated_member_use_from_same_package,analyzer_use_new_elements
-        ConstructorElement,
-        ExecutableElementOrMember {
+    implements ConstantEvaluationTarget, ExecutableElementOrMember {
   @override
   ConstructorElementImpl get declaration;
 
   @override
   InterfaceElementImpl get enclosingElement3;
 
-  @override
+  /// Whether the constructor is a const constructor.
+  bool get isConst;
+
+  /// Whether the constructor can be used as a default constructor - unnamed,
+  /// and has no required parameters.
   bool get isDefaultConstructor {
     // unnamed
     if (name.isNotEmpty) {
@@ -1754,15 +1737,17 @@ mixin ConstructorElementMixin
     return true;
   }
 
-  @override
+  /// Whether the constructor represents a factory constructor.
+  bool get isFactory;
+
+  /// Whether the constructor represents a generative constructor.
   bool get isGenerative {
     return !isFactory;
   }
 
   @override
   LibraryElementImpl get library;
 
-  @override
   ConstructorElementMixin? get redirectedConstructor;
 
   @override
@@ -6012,7 +5997,6 @@ abstract class InterfaceElementImpl extends InstanceElementImpl
         ...typeParameters,
       ];
 
-  @override
   List<ConstructorElementImpl> get constructors {
     if (!identical(_constructors, _Sentinel.constructorElement)) {
       return _constructors;
@@ -6126,11 +6110,6 @@ abstract class InterfaceElementImpl extends InstanceElementImpl
     return element.thisType;
   }
 
-  @override
-  ConstructorElementMixin? get unnamedConstructor {
-    return constructors.firstWhereOrNull((element) => element.name.isEmpty);
-  }
-
   @Deprecated(elementModelDeprecationMsg)
   @override
   FieldElement? getField(String name) {
@@ -6148,15 +6127,6 @@ abstract class InterfaceElementImpl extends InstanceElementImpl
     return methods.firstWhereOrNull((method) => method.name == methodName);
   }
 
-  @override
-  ConstructorElementMixin? getNamedConstructor(String name) {
-    if (name == 'new') {
-      // A constructor declared as `C.new` is unnamed, and is modeled as such.
-      name = '';
-    }
-    return constructors.firstWhereOrNull((element) => element.name == name);
-  }
-
   @override
   PropertyAccessorElementOrMember? getSetter(String setterName) {
     return getSetterFromAccessors(setterName, accessors);