Elements. Deprecate PropertyAccessorElement.

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

Author: scheglov

pkg/analyzer/api.txt

@@ -3471,7 +3471,7 @@ package:analyzer/dart/element/element.dart:
   PromotableElement (class extends Object implements LocalElement, VariableElement):
     new (constructor: PromotableElement Function())
     name (getter: String)
-  PropertyAccessorElement (class extends Object implements ExecutableElement):
+  PropertyAccessorElement (class extends Object implements ExecutableElement, deprecated):
     new (constructor: PropertyAccessorElement Function())
     correspondingGetter (getter: PropertyAccessorElement?)
     correspondingSetter (getter: PropertyAccessorElement?)
@@ -3483,12 +3483,12 @@ package:analyzer/dart/element/element.dart:
   PropertyInducingElement (class extends Object implements VariableElement):
     new (constructor: PropertyInducingElement Function())
     displayName (getter: String)
-    getter (getter: PropertyAccessorElement?)
+    getter (getter: PropertyAccessorElement?, deprecated)
     hasInitializer (getter: bool)
     isAugmentation (getter: bool)
     library (getter: LibraryElement)
     name (getter: String)
-    setter (getter: PropertyAccessorElement?)
+    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

@@ -2050,6 +2050,7 @@ abstract class PromotableElement implements LocalElement, VariableElement {
 ///   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
@@ -2092,8 +2093,10 @@ abstract class PropertyAccessorElement implements ExecutableElement {
 /// * Every explicit variable is represented by a non-synthetic
 ///   [PropertyInducingElement].
 /// * Every explicit variable induces a getter and possibly a setter, both of
+// ignore:deprecated_member_use_from_same_package
 ///   which are represented by synthetic [PropertyAccessorElement]s.
 /// * Every explicit getter or setter is represented by a non-synthetic
+// ignore:deprecated_member_use_from_same_package
 ///   [PropertyAccessorElement].
 /// * Every explicit getter or setter (or pair thereof if they have the same
 ///   name) induces a variable that is represented by a synthetic
@@ -2108,6 +2111,7 @@ abstract class PropertyInducingElement implements VariableElement {
   ///
   /// 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.
@@ -2133,6 +2137,7 @@ abstract class PropertyInducingElement implements VariableElement {
   /// 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;
 }
 

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

@@ -3973,6 +3973,7 @@ class ExtensionElementImpl extends InstanceElementImpl
     return null;
   }
 
+  @Deprecated(elementModelDeprecationMsg)
   @override
   PropertyAccessorElement? getSetter(String setterName) {
     return InterfaceElementImpl.getSetterFromAccessors(setterName, accessors);
@@ -9945,7 +9946,6 @@ abstract class PropertyAccessorElement2OrMember
   PropertyInducingElement2OrMember? get variable3;
 }
 
-/// A concrete implementation of a [PropertyAccessorElement].
 sealed class PropertyAccessorElementImpl extends ExecutableElementImpl
     implements PropertyAccessorElementOrMember, PropertyAccessorFragment {
   @override
@@ -10225,7 +10225,10 @@ class PropertyAccessorElementImpl_ImplicitSetter extends SetterFragmentImpl {
 /// Common base class for all analyzer-internal classes that implement
 /// `PropertyAccessorElement`.
 abstract class PropertyAccessorElementOrMember
-    implements PropertyAccessorElement, ExecutableElementOrMember {
+    implements
+        // ignore:deprecated_member_use_from_same_package
+        PropertyAccessorElement,
+        ExecutableElementOrMember {
   @override
   TypeImpl get returnType;
 

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

@@ -643,15 +643,6 @@ extension PrefixElementExtension on PrefixElement {
   }
 }
 
-extension PropertyAccessorElement2Extension on PropertyAccessorElement2 {
-  PropertyAccessorElement get asElement {
-    if (this case PropertyAccessorMember member) {
-      return member;
-    }
-    return (this as PropertyAccessorElementImpl2).lastFragment;
-  }
-}
-
 extension PropertyAccessorElement2OrMemberExtension
     on PropertyAccessorElement2OrMember {
   PropertyAccessorElementOrMember get asElement {
@@ -662,16 +653,6 @@ extension PropertyAccessorElement2OrMemberExtension
   }
 }
 
-extension PropertyAccessorElementExtension on PropertyAccessorElement {
-  PropertyAccessorElement2 get asElement2 {
-    return switch (this) {
-      PropertyAccessorFragment(:var element) => element,
-      PropertyAccessorMember member => member,
-      _ => throw UnsupportedError('Unsupported type: $runtimeType'),
-    };
-  }
-}
-
 extension PropertyAccessorElementImplExtension on PropertyAccessorElementImpl {
   PropertyAccessorElementImpl2 get asElement2 {
     return element;