Elements. Stop implementing V1 interfaces in MethodMember and PropertyAccessorMember.

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

Author: scheglov

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

@@ -854,8 +854,7 @@ abstract class Member implements FragmentOrMember {
 
 /// A method element defined in a parameterized type where the values of the
 /// type parameters are known.
-class MethodMember extends ExecutableMember
-    implements MethodElementOrMember, MethodElement2OrMember {
+class MethodMember extends ExecutableMember implements MethodElement2OrMember {
   factory MethodMember({
     required MethodFragmentImpl declaration,
     required MapSubstitution substitution,
@@ -1172,9 +1171,7 @@ class ParameterMember extends VariableMember
 /// A property accessor element defined in a parameterized type where the values
 /// of the type parameters are known.
 abstract class PropertyAccessorMember extends ExecutableMember
-    implements
-        PropertyAccessorElementOrMember,
-        PropertyAccessorElement2OrMember {
+    implements PropertyAccessorElement2OrMember {
   factory PropertyAccessorMember({
     required PropertyAccessorFragmentImpl declaration,
     required MapSubstitution substitution,
@@ -1217,12 +1214,6 @@ abstract class PropertyAccessorMember extends ExecutableMember
   @override
   Element get enclosingElement2 => enclosingElement;
 
-  @override
-  bool get isGetter => declaration.isGetter;
-
-  @override
-  bool get isSetter => declaration.isSetter;
-
   @override
   String? get name3 => _element2.name3;
 
@@ -1247,26 +1238,7 @@ abstract class PropertyAccessorMember extends ExecutableMember
   void appendTo(ElementDisplayStringBuilder builder) {
     builder.writeExecutableElement(
       this,
-      (isGetter ? 'get ' : 'set ') + displayName,
-    );
-  }
-
-  /// If the given [element]'s type is different when any type parameters from
-  /// the defining type's declaration are replaced with the actual type
-  /// arguments from the [definingType], create an accessor member representing
-  /// the given accessor. Return the member that was created, or the base
-  /// accessor if no member was created.
-  static PropertyAccessorElementOrMember? from(
-    PropertyAccessorFragmentImpl? element,
-    InterfaceType definingType,
-  ) {
-    if (element == null || definingType.typeArguments.isEmpty) {
-      return element;
-    }
-
-    return PropertyAccessorMember(
-      declaration: element,
-      substitution: Substitution.fromInterfaceType(definingType),
+      (this is GetterElement ? 'get ' : 'set ') + displayName,
     );
   }
 }

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

@@ -411,15 +411,6 @@ extension LocalVariableElementImplExtension on LocalVariableFragmentImpl {
   }
 }
 
-extension MethodElement2OrMemberExtension on MethodElement2OrMember {
-  MethodElementOrMember get asElement {
-    if (this case MethodMember member) {
-      return member;
-    }
-    return (this as MethodElementImpl).lastFragment;
-  }
-}
-
 extension MethodElementImpl2Extension on MethodElementImpl {
   MethodFragmentImpl get asElement {
     return lastFragment;
@@ -476,16 +467,6 @@ extension PatternVariableElementImplExtension on PatternVariableFragmentImpl {
   }
 }
 
-extension PropertyAccessorElement2OrMemberExtension
-    on PropertyAccessorElement2OrMember {
-  PropertyAccessorElementOrMember get asElement {
-    if (this case PropertyAccessorMember member) {
-      return member;
-    }
-    return (this as PropertyAccessorElementImpl).lastFragment;
-  }
-}
-
 extension PropertyAccessorElementImplExtension on PropertyAccessorFragmentImpl {
   PropertyAccessorElementImpl get asElement2 {
     return element;