Elements. Remove FieldFormalParameterElementOrMember and SuperFormalParameterElementOrMember.

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

Author: scheglov

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

@@ -2982,18 +2982,11 @@ class FieldFormalParameterElementImpl extends FormalParameterElementImpl
   }
 }
 
-abstract class FieldFormalParameterElementOrMember
-    implements ParameterElementMixin {
+class FieldFormalParameterFragmentImpl extends FormalParameterFragmentImpl
+    implements FieldFormalParameterFragment {
   /// The field element associated with this field formal parameter, or `null`
   /// if the parameter references a field that doesn't exist.
-  FieldElementOrMember? get field;
-}
-
-class FieldFormalParameterFragmentImpl extends FormalParameterFragmentImpl
-    implements
-        FieldFormalParameterElementOrMember,
-        FieldFormalParameterFragment {
-  @override
+  // TODO(scheglov): move to element
   FieldFragmentImpl? field;
 
   /// Initialize a newly created parameter element to have the given [name] and
@@ -9288,21 +9281,8 @@ class SuperFormalParameterElementImpl extends FormalParameterElementImpl
   }
 }
 
-abstract class SuperFormalParameterElementOrMember
-    implements ParameterElementMixin {
-  /// The associated super-constructor parameter, from the super-constructor
-  /// that is referenced by the implicit or explicit super-constructor
-  /// invocation.
-  ///
-  /// Can be `null` for erroneous code - not existing super-constructor,
-  /// no corresponding parameter in the super-constructor.
-  FormalParameterElementMixin? get superConstructorParameter;
-}
-
 class SuperFormalParameterFragmentImpl extends FormalParameterFragmentImpl
-    implements
-        SuperFormalParameterElementOrMember,
-        SuperFormalParameterFragment {
+    implements SuperFormalParameterFragment {
   /// Initialize a newly created parameter element to have the given [name] and
   /// [nameOffset].
   SuperFormalParameterFragmentImpl({
@@ -9332,7 +9312,13 @@ class SuperFormalParameterFragmentImpl extends FormalParameterFragmentImpl
   SuperFormalParameterFragmentImpl? get previousFragment =>
       super.previousFragment as SuperFormalParameterFragmentImpl?;
 
-  @override
+  /// The associated super-constructor parameter, from the super-constructor
+  /// that is referenced by the implicit or explicit super-constructor
+  /// invocation.
+  ///
+  /// Can be `null` for erroneous code - not existing super-constructor,
+  /// no corresponding parameter in the super-constructor.
+  // TODO(scheglov): move to element
   FormalParameterElementMixin? get superConstructorParameter {
     var enclosingElement = enclosingElement3;
     if (enclosingElement is ConstructorFragmentImpl) {

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

@@ -392,9 +392,7 @@ abstract class ExecutableMember extends Member
 /// A parameter element defined in a parameterized type where the values of the
 /// type parameters are known.
 class FieldFormalParameterMember extends ParameterMember
-    implements
-        FieldFormalParameterElementOrMember,
-        FieldFormalParameterElement {
+    implements FieldFormalParameterElement {
   factory FieldFormalParameterMember({
     required FieldFormalParameterFragmentImpl declaration,
     required MapSubstitution substitution,
@@ -425,16 +423,6 @@ class FieldFormalParameterMember extends ParameterMember
     return _declaration as FieldFormalParameterFragmentImpl;
   }
 
-  @override
-  FieldElementOrMember? get field {
-    var field = declaration.field;
-    if (field == null) {
-      return null;
-    }
-
-    return FieldMember(declaration: field, substitution: substitution);
-  }
-
   @override
   FieldElement? get field2 {
     var field = baseElement.field2;
@@ -1352,9 +1340,7 @@ class SetterMember extends PropertyAccessorMember
 }
 
 class SuperFormalParameterMember extends ParameterMember
-    implements
-        SuperFormalParameterElementOrMember,
-        SuperFormalParameterElement {
+    implements SuperFormalParameterElement {
   factory SuperFormalParameterMember({
     required SuperFormalParameterFragmentImpl declaration,
     required MapSubstitution substitution,
@@ -1400,18 +1386,14 @@ class SuperFormalParameterMember extends ParameterMember
   bool get isCovariant => declaration.isCovariant;
 
   @override
-  FormalParameterElementMixin? get superConstructorParameter {
+  FormalParameterElementMixin? get superConstructorParameter2 {
     var superConstructorParameter = declaration.superConstructorParameter;
     if (superConstructorParameter == null) {
       return null;
     }
 
     return ParameterMember.from2(superConstructorParameter, substitution);
   }
-
-  @override
-  FormalParameterElement? get superConstructorParameter2 =>
-      superConstructorParameter;
 }
 
 /// A variable element defined in a parameterized type where the values of the