Elements. Pull a few getters / methods up into Member.

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

Author: scheglov

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

@@ -31,9 +31,6 @@ class ConstructorMember extends ExecutableMember
   ConstructorElementImpl get baseElement =>
       super.baseElement as ConstructorElementImpl;
 
-  @override
-  String get displayName => baseElement.displayName;
-
   @override
   InterfaceElementImpl get enclosingElement => baseElement.enclosingElement;
 
@@ -75,12 +72,6 @@ class ConstructorMember extends ExecutableMember
   @override
   LibraryElementImpl get library2 => library;
 
-  @override
-  String? get lookupName => baseElement.lookupName;
-
-  @override
-  String? get name3 => baseElement.name3;
-
   @override
   ConstructorElementMixin2? get redirectedConstructor2 {
     var element = baseElement.redirectedConstructor2;
@@ -183,9 +174,6 @@ abstract class ExecutableMember extends Member
     return [...typeParameters2, ...formalParameters];
   }
 
-  @override
-  String get displayName => baseElement.displayName;
-
   @override
   String? get documentationComment => baseElement.documentationComment;
 
@@ -268,13 +256,6 @@ abstract class ExecutableMember extends Member
   @override
   MetadataImpl get metadata2 => metadata;
 
-  @override
-  Element get nonSynthetic => baseElement;
-
-  @Deprecated('Use nonSynthetic instead')
-  @override
-  Element get nonSynthetic2 => nonSynthetic;
-
   @override
   TypeImpl get returnType {
     var result = baseElement.returnType;
@@ -305,18 +286,6 @@ abstract class ExecutableMember extends Member
     return builder.toString();
   }
 
-  @override
-  bool isAccessibleIn2(LibraryElement library) =>
-      baseElement.isAccessibleIn2(library);
-
-  @override
-  Element? thisOrAncestorMatching2(bool Function(Element p1) predicate) =>
-      baseElement.thisOrAncestorMatching2(predicate);
-
-  @override
-  E? thisOrAncestorOfType2<E extends Element>() =>
-      baseElement.thisOrAncestorOfType2();
-
   @override
   void visitChildren2<T>(ElementVisitor2<T> visitor) {
     for (var child in children2) {
@@ -438,14 +407,6 @@ class FieldMember extends VariableMember implements FieldElement2OrMember {
   @override
   List<Element> get children2 => const [];
 
-  @override
-  ConstantInitializer? get constantInitializer2 {
-    return baseElement.constantInitializer2;
-  }
-
-  @override
-  String get displayName => baseElement.displayName;
-
   @override
   String? get documentationComment => baseElement.documentationComment;
 
@@ -505,26 +466,13 @@ class FieldMember extends VariableMember implements FieldElement2OrMember {
   @override
   LibraryElement get library2 => library;
 
-  @override
-  String? get lookupName => baseElement.lookupName;
-
   @override
   MetadataImpl get metadata => baseElement.metadata;
 
   @Deprecated('Use metadata instead')
   @override
   MetadataImpl get metadata2 => metadata;
 
-  @override
-  String? get name3 => baseElement.name3;
-
-  @override
-  Element get nonSynthetic => baseElement.nonSynthetic;
-
-  @Deprecated('Use nonSynthetic instead')
-  @override
-  Element get nonSynthetic2 => nonSynthetic;
-
   @override
   SetterElement2OrMember? get setter2 {
     var baseSetter = baseElement.setter2;
@@ -546,37 +494,6 @@ class FieldMember extends VariableMember implements FieldElement2OrMember {
   @override
   T? accept2<T>(ElementVisitor2<T> visitor) => accept(visitor);
 
-  @override
-  DartObject? computeConstantValue() {
-    return baseElement.computeConstantValue();
-  }
-
-  @override
-  String displayString2({
-    bool multiline = false,
-    bool preferTypeAlias = false,
-  }) {
-    return baseElement.displayString2(
-      multiline: multiline,
-      preferTypeAlias: preferTypeAlias,
-    );
-  }
-
-  @override
-  bool isAccessibleIn2(LibraryElement library) {
-    return baseElement.isAccessibleIn2(library);
-  }
-
-  @override
-  Element? thisOrAncestorMatching2(bool Function(Element e) predicate) {
-    return baseElement.thisOrAncestorMatching2(predicate);
-  }
-
-  @override
-  E? thisOrAncestorOfType2<E extends Element>() {
-    return baseElement.thisOrAncestorOfType2<E>();
-  }
-
   @override
   void visitChildren2<T>(ElementVisitor2<T> visitor) {}
 
@@ -628,9 +545,6 @@ class GetterMember extends PropertyAccessorMember
     ];
   }
 
-  @override
-  String? get lookupName => baseElement.lookupName;
-
   @override
   Element get nonSynthetic {
     if (!isSynthetic) {
@@ -681,6 +595,9 @@ abstract class Member implements Element {
   /// [declaration], and applied [substitution].
   Member({required this.baseElement, required this.substitution});
 
+  @override
+  String get displayName => baseElement.displayName;
+
   @override
   int get id => baseElement.id;
 
@@ -696,6 +613,19 @@ abstract class Member implements Element {
   @override
   ElementKind get kind => baseElement.kind;
 
+  @override
+  String? get lookupName => baseElement.lookupName;
+
+  @override
+  String? get name3 => baseElement.name3;
+
+  @override
+  Element get nonSynthetic => baseElement;
+
+  @Deprecated('Use nonSynthetic instead')
+  @override
+  Element get nonSynthetic2 => nonSynthetic;
+
   @override
   AnalysisSession? get session => baseElement.session;
 
@@ -707,6 +637,21 @@ abstract class Member implements Element {
     return baseElement.getExtendedDisplayName2(shortName: shortName);
   }
 
+  @override
+  bool isAccessibleIn2(LibraryElement library) {
+    return baseElement.isAccessibleIn2(library);
+  }
+
+  @override
+  Element? thisOrAncestorMatching2(bool Function(Element e) predicate) {
+    return baseElement.thisOrAncestorMatching2(predicate);
+  }
+
+  @override
+  E? thisOrAncestorOfType2<E extends Element>() {
+    return baseElement.thisOrAncestorOfType2<E>();
+  }
+
   @override
   String toString() {
     var builder = ElementDisplayStringBuilder(preferTypeAlias: false);
@@ -768,12 +713,6 @@ class MethodMember extends ExecutableMember implements MethodElement2OrMember {
   @override
   LibraryElement get library2 => library;
 
-  @override
-  String? get lookupName => name3;
-
-  @override
-  String? get name3 => baseElement.name3;
-
   @override
   Version? get sinceSdkVersion => baseElement.sinceSdkVersion;
 
@@ -835,17 +774,9 @@ class ParameterMember extends VariableMember with FormalParameterElementMixin {
     return [...typeParameters2, ...formalParameters];
   }
 
-  @override
-  ConstantInitializer? get constantInitializer2 {
-    return baseElement.constantInitializer2;
-  }
-
   @override
   String? get defaultValueCode => baseElement.defaultValueCode;
 
-  @override
-  String get displayName => baseElement.displayName;
-
   @override
   String? get documentationComment => baseElement.documentationComment;
 
@@ -918,29 +849,16 @@ class ParameterMember extends VariableMember with FormalParameterElementMixin {
   @override
   LibraryElement? get library2 => library;
 
-  @override
-  String? get lookupName => baseElement.lookupName;
-
   @override
   MetadataImpl get metadata => baseElement.metadata;
 
   @Deprecated('Use metadata instead')
   @override
   MetadataImpl get metadata2 => metadata;
 
-  @override
-  String? get name3 => baseElement.name3;
-
   @override
   String get nameShared => name3!;
 
-  @override
-  Element get nonSynthetic => baseElement;
-
-  @Deprecated('Use nonSynthetic instead')
-  @override
-  Element get nonSynthetic2 => nonSynthetic;
-
   @deprecated
   @override
   ParameterKind get parameterKind {
@@ -967,36 +885,6 @@ class ParameterMember extends VariableMember with FormalParameterElementMixin {
     builder.writeFormalParameter2(this);
   }
 
-  @override
-  DartObject? computeConstantValue() {
-    return baseElement.computeConstantValue();
-  }
-
-  @override
-  String displayString2({
-    bool multiline = false,
-    bool preferTypeAlias = false,
-  }) {
-    return baseElement.displayString2(
-      multiline: multiline,
-      preferTypeAlias: preferTypeAlias,
-    );
-  }
-
-  @override
-  bool isAccessibleIn2(LibraryElement library) =>
-      baseElement.isAccessibleIn2(library);
-
-  @override
-  Element? thisOrAncestorMatching2(bool Function(Element p1) predicate) {
-    return baseElement.thisOrAncestorMatching2(predicate);
-  }
-
-  @override
-  E? thisOrAncestorOfType2<E extends Element>() {
-    return baseElement.thisOrAncestorOfType2();
-  }
-
   @override
   void visitChildren2<T>(ElementVisitor2<T> visitor) {
     baseElement.visitChildren2(visitor);
@@ -1075,9 +963,6 @@ abstract class PropertyAccessorMember extends ExecutableMember
   @override
   PropertyAccessorFragment get firstFragment;
 
-  @override
-  String? get name3 => baseElement.name3;
-
   @override
   PropertyInducingElement2OrMember? get variable3 {
     var variable = baseElement.variable3;
@@ -1135,9 +1020,6 @@ class SetterMember extends PropertyAccessorMember
     ];
   }
 
-  @override
-  String? get lookupName => baseElement.lookupName;
-
   @override
   Element get nonSynthetic {
     if (!isSynthetic) {
@@ -1241,6 +1123,11 @@ abstract class VariableMember extends Member
   VariableElementImpl get baseElement =>
       super.baseElement as VariableElementImpl;
 
+  @override
+  ConstantInitializer? get constantInitializer2 {
+    return baseElement.constantInitializer2;
+  }
+
   @override
   bool get hasImplicitType => baseElement.hasImplicitType;
 
@@ -1269,6 +1156,22 @@ abstract class VariableMember extends Member
   void appendTo(ElementDisplayStringBuilder builder) {
     builder.writeVariableElement2(this);
   }
+
+  @override
+  DartObject? computeConstantValue() {
+    return baseElement.computeConstantValue();
+  }
+
+  @override
+  String displayString2({
+    bool multiline = false,
+    bool preferTypeAlias = false,
+  }) {
+    return baseElement.displayString2(
+      multiline: multiline,
+      preferTypeAlias: preferTypeAlias,
+    );
+  }
 }
 
 class _SubstitutedTypeParameters {