Elements. Remove PropertyAccessorElementOrMember.

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

Author: scheglov

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

@@ -4494,16 +4494,20 @@ class GetterFragmentImpl extends PropertyAccessorFragmentImpl
   GetterFragmentImpl.forVariable(super.variable) : super.forVariable();
 
   @override
-  bool get isGetter => true;
-
-  @override
-  bool get isSetter => false;
+  ElementKind get kind {
+    return ElementKind.GETTER;
+  }
 
   void addFragment(GetterFragmentImpl fragment) {
     fragment.element = element;
     fragment.previousFragment = this;
     nextFragment = fragment;
   }
+
+  @override
+  void appendTo(ElementDisplayStringBuilder builder) {
+    builder.writeExecutableElement(this, 'get $displayName');
+  }
 }
 
 /// A concrete implementation of a [HideElementCombinator].
@@ -5610,15 +5614,6 @@ abstract class InterfaceFragmentImpl extends InstanceFragmentImpl
     _constructors = [..._constructors, fragment];
     fragment.enclosingElement3 = this;
   }
-
-  static PropertyAccessorElementOrMember? getSetterFromAccessors(
-    String setterName,
-    List<PropertyAccessorElementOrMember> accessors,
-  ) {
-    return accessors.firstWhereOrNull(
-      (accessor) => accessor.isSetter && accessor.name2 == setterName,
-    );
-  }
 }
 
 class JoinPatternVariableElementImpl extends PatternVariableElementImpl
@@ -8869,22 +8864,8 @@ abstract class PropertyAccessorElementImpl extends ExecutableElementImpl
   }
 }
 
-/// Common base class for all analyzer-internal classes that implement
-/// `PropertyAccessorElement`.
-abstract class PropertyAccessorElementOrMember
-    implements ExecutableElementOrMember {
-  /// Whether the accessor represents a getter.
-  bool get isGetter;
-
-  /// Whether the accessor represents a setter.
-  bool get isSetter;
-
-  @override
-  TypeImpl get returnType;
-}
-
 sealed class PropertyAccessorFragmentImpl extends ExecutableFragmentImpl
-    implements PropertyAccessorElementOrMember, PropertyAccessorFragment {
+    implements PropertyAccessorFragment {
   @override
   final String? name2;
 
@@ -8931,14 +8912,6 @@ sealed class PropertyAccessorFragmentImpl extends ExecutableFragmentImpl
     setModifier(Modifier.ABSTRACT, isAbstract);
   }
 
-  @override
-  ElementKind get kind {
-    if (isGetter) {
-      return ElementKind.GETTER;
-    }
-    return ElementKind.SETTER;
-  }
-
   @override
   MetadataImpl get metadata {
     _ensureReadResolution();
@@ -8956,14 +8929,6 @@ sealed class PropertyAccessorFragmentImpl extends ExecutableFragmentImpl
     }
     return _nameOffset;
   }
-
-  @override
-  void appendTo(ElementDisplayStringBuilder builder) {
-    builder.writeExecutableElement(
-      this,
-      (isGetter ? 'get ' : 'set ') + displayName,
-    );
-  }
 }
 
 /// Common base class for all analyzer-internal classes that implement
@@ -9295,10 +9260,9 @@ class SetterFragmentImpl extends PropertyAccessorFragmentImpl
   SetterFragmentImpl.forVariable(super.variable) : super.forVariable();
 
   @override
-  bool get isGetter => false;
-
-  @override
-  bool get isSetter => true;
+  ElementKind get kind {
+    return ElementKind.SETTER;
+  }
 
   @override
   String? get lookupName {
@@ -9317,6 +9281,11 @@ class SetterFragmentImpl extends PropertyAccessorFragmentImpl
     fragment.previousFragment = this;
     nextFragment = fragment;
   }
+
+  @override
+  void appendTo(ElementDisplayStringBuilder builder) {
+    builder.writeExecutableElement(this, 'set $displayName');
+  }
 }
 
 /// A concrete implementation of a [ShowElementCombinator].

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

@@ -1223,7 +1223,7 @@ abstract class PropertyAccessorMember extends ExecutableMember
       declaration.typeParameters,
       substitution,
     );
-    if (declaration.isGetter) {
+    if (declaration is GetterFragmentImpl) {
       return GetterMember._(
         declaration: declaration,
         substitution: freshTypeParameters.substitution,

pkg/analyzer/lib/src/dart/resolver/method_invocation_resolver.dart

@@ -23,7 +23,6 @@ import 'package:analyzer/src/generated/resolver.dart';
 import 'package:analyzer/src/generated/scope_helpers.dart';
 import 'package:analyzer/src/generated/super_context.dart';
 import 'package:analyzer/src/generated/variable_type_provider.dart';
-import 'package:analyzer/src/utilities/extensions/element.dart';
 
 class MethodInvocationResolver with ScopeHelpers {
   /// The resolver driving this participant.
@@ -567,7 +566,7 @@ class MethodInvocationResolver with ScopeHelpers {
     required TypeImpl contextType,
   }) {
     var result = _extensionResolver.getOverrideMember(override, name);
-    var member = result.getter2?.asElement;
+    var member = result.getter2;
 
     if (member == null) {
       _setInvalidTypeResolution(
@@ -600,9 +599,9 @@ class MethodInvocationResolver with ScopeHelpers {
       );
     }
 
-    nameNode.element = member.asElement2;
+    nameNode.element = member;
 
-    if (member is PropertyAccessorElementOrMember) {
+    if (member is PropertyAccessorElement2OrMember) {
       return _rewriteAsFunctionExpressionInvocation(
         node,
         node.target,

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

@@ -528,7 +528,7 @@ class MemberDuplicateDefinitionVerifier {
           if (staticMember.isSynthetic) {
             errorCode =
                 CompileTimeErrorCode.CONFLICTING_CONSTRUCTOR_AND_STATIC_FIELD;
-          } else if (staticMember.isGetter) {
+          } else if (staticMember is GetterFragmentImpl) {
             errorCode =
                 CompileTimeErrorCode.CONFLICTING_CONSTRUCTOR_AND_STATIC_GETTER;
           } else {

pkg/analyzer/lib/src/generated/error_verifier.dart

@@ -2255,24 +2255,24 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
       String name = method.name2 ?? '';
 
       // find inherited property accessors
-      var getter =
-          _inheritanceManager
-              .getInherited(enclosingClass, Name(libraryUri, name))
-              ?.asElement;
-      var setter =
-          _inheritanceManager
-              .getInherited(enclosingClass, Name(libraryUri, '$name='))
-              ?.asElement;
+      var getter = _inheritanceManager.getInherited(
+        enclosingClass,
+        Name(libraryUri, name),
+      );
+      var setter = _inheritanceManager.getInherited(
+        enclosingClass,
+        Name(libraryUri, '$name='),
+      );
 
       if (method.isStatic) {
-        void reportStaticConflict(ExecutableElementOrMember inherited) {
+        void reportStaticConflict(ExecutableElement2OrMember inherited) {
           diagnosticReporter.atElement2(
             method.asElement2,
             CompileTimeErrorCode.CONFLICTING_STATIC_AND_INSTANCE,
             arguments: [
               enclosingClass.displayName,
               name,
-              inherited.asElement2.enclosingElement!.displayName,
+              inherited.enclosingElement!.displayName,
             ],
           );
         }
@@ -2293,24 +2293,24 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
         continue;
       }
 
-      void reportFieldConflict(PropertyAccessorElementOrMember inherited) {
+      void reportFieldConflict(PropertyAccessorElement2OrMember inherited) {
         diagnosticReporter.atElement2(
           method.asElement2,
           CompileTimeErrorCode.CONFLICTING_METHOD_AND_FIELD,
           arguments: [
             enclosingClass.displayName,
             name,
-            inherited.asElement2.enclosingElement.displayName,
+            inherited.enclosingElement.displayName,
           ],
         );
       }
 
-      if (getter is PropertyAccessorElementOrMember) {
+      if (getter is GetterElement2OrMember) {
         reportFieldConflict(getter);
         continue;
       }
 
-      if (setter is PropertyAccessorElementOrMember) {
+      if (setter is SetterElement2OrMember) {
         reportFieldConflict(setter);
         continue;
       }

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

@@ -415,8 +415,8 @@ class PropertyAccessorElementFlags {
             : 0;
     result |= element.invokesSuperSelf ? _invokesSuperSelf : 0;
     result |= element.isAugmentation ? _isAugmentation : 0;
-    result |= element.isGetter ? _isGetter : 0;
-    result |= element.isSetter ? _isSetter : 0;
+    result |= element is GetterFragmentImpl ? _isGetter : 0;
+    result |= element is SetterFragmentImpl ? _isSetter : 0;
     result |= element.hasImplicitReturnType ? _hasImplicitReturnType : 0;
     result |= element.isAbstract ? _isAbstract : 0;
     result |= element.isAsynchronous ? _isAsynchronous : 0;

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

@@ -162,7 +162,7 @@ class InstanceMemberInferrer {
       return DynamicTypeImpl.instance;
     }
 
-    if (accessor != null && accessor.isGetter) {
+    if (accessor != null && accessor is GetterFragmentImpl) {
       if (!accessor.hasImplicitReturnType) {
         return;
       }
@@ -202,7 +202,7 @@ class InstanceMemberInferrer {
       return;
     }
 
-    if (accessor != null && accessor.isSetter) {
+    if (accessor != null && accessor is SetterFragmentImpl) {
       var parameters = accessor.parameters;
       if (parameters.isEmpty) {
         return;

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

@@ -444,17 +444,6 @@ extension PropertyAccessorElementImplExtension on PropertyAccessorFragmentImpl {
   }
 }
 
-extension PropertyAccessorElementOrMemberExtension
-    on PropertyAccessorElementOrMember {
-  PropertyAccessorElement2OrMember get asElement2 {
-    return switch (this) {
-      PropertyAccessorFragmentImpl(:var element) => element,
-      PropertyAccessorMember member => member,
-      _ => throw UnsupportedError('Unsupported type: $runtimeType'),
-    };
-  }
-}
-
 extension PropertyInducingElementExtension on PropertyInducingElement {
   bool get definesSetter {
     if (isConst) {