Elements. Remove V1 PropertyAccessorElement.

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

Author: scheglov

pkg/analyzer/api.txt

@@ -2976,7 +2976,6 @@ package:analyzer/dart/element/element.dart:
     isStatic (getter: bool)
   CompilationUnitElement (class extends Object implements UriReferencedElement, deprecated):
     new (constructor: CompilationUnitElement Function())
-    accessors (getter: List<PropertyAccessorElement>)
     enclosingElement3 (getter: CompilationUnitElement?)
     libraryExports (getter: List<LibraryExportElement>)
     libraryImportPrefixes (getter: List<PrefixElement>)
@@ -3280,24 +3279,13 @@ package:analyzer/dart/element/element.dart:
   PromotableElement (class extends Object implements LocalElement, VariableElement, deprecated):
     new (constructor: PromotableElement Function())
     name (getter: String)
-  PropertyAccessorElement (class extends Object implements ExecutableElement, deprecated):
-    new (constructor: PropertyAccessorElement Function())
-    correspondingGetter (getter: PropertyAccessorElement?)
-    correspondingSetter (getter: PropertyAccessorElement?)
-    declaration (getter: PropertyAccessorElement)
-    enclosingElement3 (getter: Element)
-    isGetter (getter: bool)
-    isSetter (getter: bool)
-    variable2 (getter: PropertyInducingElement?)
   PropertyInducingElement (class extends Object implements VariableElement, deprecated):
     new (constructor: PropertyInducingElement Function())
     displayName (getter: String)
-    getter (getter: PropertyAccessorElement?, deprecated)
     hasInitializer (getter: bool)
     isAugmentation (getter: bool)
     library (getter: LibraryElement)
     name (getter: String)
-    setter (getter: PropertyAccessorElement?, deprecated)
   ShowElementCombinator (class extends Object implements NamespaceCombinator):
     new (constructor: ShowElementCombinator Function())
     shownNames (getter: List<String>)

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

@@ -96,10 +96,6 @@ abstract class ClassMemberElement implements Element {
 /// Clients may not extend, implement or mix-in this class.
 @Deprecated(elementModelDeprecationMsg)
 abstract class CompilationUnitElement implements UriReferencedElement {
-  /// The top-level accessors (getters and setters) declared in this
-  /// compilation unit.
-  List<PropertyAccessorElement> get accessors;
-
   /// The [CompilationUnitElement] that uses `part` directive to include this
   /// element, or `null` if this element is the defining unit of the library.
   @override
@@ -1321,53 +1317,6 @@ abstract class PromotableElement implements LocalElement, VariableElement {
   String get name;
 }
 
-/// A getter or a setter. Note that explicitly defined property accessors
-/// implicitly define a synthetic field. Symmetrically, synthetic accessors are
-/// implicitly created for explicitly defined fields. The following rules apply:
-///
-/// * Every explicit field is represented by a non-synthetic [FieldElement].
-/// * Every explicit field induces a getter and possibly a setter, both of which
-///   are represented by synthetic [PropertyAccessorElement]s.
-/// * Every explicit getter or setter is represented by a non-synthetic
-///   [PropertyAccessorElement].
-/// * Every explicit getter or setter (or pair thereof if they have the same
-///   name) induces a field that is represented by a synthetic [FieldElement].
-///
-/// Clients may not extend, implement or mix-in this class.
-@Deprecated('Use PropertyAccessorElement2 instead')
-abstract class PropertyAccessorElement implements ExecutableElement {
-  /// The accessor representing the getter that corresponds to (has the same
-  /// name as) this setter, or `null` if this accessor is not a setter or
-  /// if there is no corresponding getter.
-  PropertyAccessorElement? get correspondingGetter;
-
-  /// The accessor representing the setter that corresponds to (has the same
-  /// name as) this getter, or `null` if this accessor is not a getter or
-  /// if there is no corresponding setter.
-  PropertyAccessorElement? get correspondingSetter;
-
-  @override
-  PropertyAccessorElement get declaration;
-
-  @override
-  Element get enclosingElement3;
-
-  /// Whether the accessor represents a getter.
-  bool get isGetter;
-
-  /// Whether the accessor represents a setter.
-  bool get isSetter;
-
-  /// The field or top-level variable associated with this accessor.
-  ///
-  /// If this accessor was explicitly defined (is not synthetic) then the
-  /// variable associated with it will be synthetic.
-  ///
-  /// If this accessor is an augmentation, and [augmentationTarget] is `null`,
-  /// the variable is `null`.
-  PropertyInducingElement? get variable2;
-}
-
 /// A variable that has an associated getter and possibly a setter. Note that
 /// explicitly defined variables implicitly define a synthetic getter and that
 /// non-`final` explicitly defined variables implicitly define a synthetic
@@ -1390,13 +1339,6 @@ abstract class PropertyInducingElement implements VariableElement {
   @override
   String get displayName;
 
-  /// The getter associated with this variable.
-  ///
-  /// If this variable was explicitly defined (is not synthetic) then the
-  /// getter associated with it will be synthetic.
-  @Deprecated(elementModelDeprecationMsg)
-  PropertyAccessorElement? get getter;
-
   /// Whether the variable has an initializer at declaration.
   bool get hasInitializer;
 
@@ -1410,18 +1352,6 @@ abstract class PropertyInducingElement implements VariableElement {
 
   @override
   String get name;
-
-  /// The setter associated with this variable, or `null` if the variable
-  /// is effectively `final` and therefore does not have a setter associated
-  /// with it.
-  ///
-  /// This can happen either because the variable is explicitly defined as
-  /// being `final` or because the variable is induced by an explicit getter
-  /// that does not have a corresponding setter. If this variable was
-  /// explicitly defined (is not synthetic) then the setter associated with
-  /// it will be synthetic.
-  @Deprecated(elementModelDeprecationMsg)
-  PropertyAccessorElement? get setter;
 }
 
 /// A combinator that cause some of the names in a namespace to be visible (and

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

@@ -768,7 +768,6 @@ class CompilationUnitElementImpl extends UriReferencedElementImpl
     return scope.accessibleExtensions;
   }
 
-  @override
   List<PropertyAccessorElementImpl> get accessors {
     return _accessors;
   }
@@ -9407,14 +9406,33 @@ class PropertyAccessorElementImpl_ImplicitSetter extends SetterFragmentImpl {
 /// Common base class for all analyzer-internal classes that implement
 /// `PropertyAccessorElement`.
 abstract class PropertyAccessorElementOrMember
-    implements
-        // ignore:deprecated_member_use_from_same_package,analyzer_use_new_elements
-        PropertyAccessorElement,
-        ExecutableElementOrMember {
+    implements ExecutableElementOrMember {
+  /// The accessor representing the getter that corresponds to (has the same
+  /// name as) this setter, or `null` if this accessor is not a setter or
+  /// if there is no corresponding getter.
+  PropertyAccessorElementOrMember? get correspondingGetter;
+
+  /// The accessor representing the setter that corresponds to (has the same
+  /// name as) this getter, or `null` if this accessor is not a getter or
+  /// if there is no corresponding setter.
+  PropertyAccessorElementOrMember? get correspondingSetter;
+
+  /// Whether the accessor represents a getter.
+  bool get isGetter;
+
+  /// Whether the accessor represents a setter.
+  bool get isSetter;
+
   @override
   TypeImpl get returnType;
 
-  @override
+  /// The field or top-level variable associated with this accessor.
+  ///
+  /// If this accessor was explicitly defined (is not synthetic) then the
+  /// variable associated with it will be synthetic.
+  ///
+  /// If this accessor is an augmentation, and [augmentationTarget] is `null`,
+  /// the variable is `null`.
   PropertyInducingElementOrMember? get variable2;
 }
 
@@ -9448,14 +9466,21 @@ abstract class PropertyInducingElementImpl
   @override
   PropertyInducingElementImpl? nextFragment;
 
-  /// The getter associated with this element.
-  @override
+  /// The getter associated with this variable.
+  ///
+  /// If this variable was explicitly defined (is not synthetic) then the
+  /// getter associated with it will be synthetic.
   GetterFragmentImpl? getter;
 
-  /// The setter associated with this element, or `null` if the element is
-  /// effectively `final` and therefore does not have a setter associated with
-  /// it.
-  @override
+  /// The setter associated with this variable, or `null` if the variable
+  /// is effectively `final` and therefore does not have a setter associated
+  /// with it.
+  ///
+  /// This can happen either because the variable is explicitly defined as
+  /// being `final` or because the variable is induced by an explicit getter
+  /// that does not have a corresponding setter. If this variable was
+  /// explicitly defined (is not synthetic) then the setter associated with
+  /// it will be synthetic.
   SetterFragmentImpl? setter;
 
   /// This field is set during linking, and performs type inference for

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

@@ -522,18 +522,6 @@ class FieldMember extends VariableMember
     ];
   }
 
-  @override
-  PropertyAccessorElementOrMember? get getter {
-    var baseGetter = declaration.getter;
-    if (baseGetter == null) {
-      return null;
-    }
-    return PropertyAccessorMember(
-      declaration: baseGetter,
-      substitution: substitution,
-    );
-  }
-
   @override
   GetterElement2OrMember? get getter2 {
     var baseGetter = declaration.getter;
@@ -587,18 +575,6 @@ class FieldMember extends VariableMember
   @override
   Element2 get nonSynthetic2 => _element2.nonSynthetic2;
 
-  @override
-  PropertyAccessorElementOrMember? get setter {
-    var baseSetter = declaration.setter;
-    if (baseSetter == null) {
-      return null;
-    }
-    return PropertyAccessorMember(
-      declaration: baseSetter,
-      substitution: substitution,
-    );
-  }
-
   @override
   SetterElement2OrMember? get setter2 {
     var baseSetter = declaration.setter;