[element model] cleanup extensions

Change-Id: If51dec5ff014d404fd0ccd7bb62c155dc05ece26
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/398601
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Phil Quitslund <[email protected]>
Auto-Submit: Phil Quitslund <[email protected]>

Author: pq

pkg/linter/lib/src/extensions.dart

@@ -155,32 +155,7 @@ extension BlockExtension on Block {
   }
 }
 
-extension ClassElementExtension on ClassElement {
-  /// Get all accessors, including merged augmentations.
-  List<PropertyAccessorElement> get allAccessors => augmented.accessors;
-
-  /// Get all constructors, including merged augmentations.
-  List<ConstructorElement> get allConstructors => augmented.constructors;
-
-  /// Get all fields, including merged augmentations.
-  List<FieldElement> get allFields => augmented.fields;
-
-  /// Get all interfaces, including merged augmentations.
-  List<InterfaceType> get allInterfaces => augmented.interfaces;
-
-  /// Get all methods, including merged augmentations.
-  List<MethodElement> get allMethods => augmented.methods;
-
-  /// Get all mixins, including merged augmentations.
-  List<InterfaceType> get allMixins => augmented.mixins;
-
-  /// Returns whether this class is exactly [otherName] declared in
-  /// [otherLibrary].
-  bool isClass(String otherName, String otherLibrary) =>
-      name == otherName && library.name == otherLibrary;
-}
-
-extension ClassElementExtension2 on ClassElement2 {
+extension ClassElement2Extension on ClassElement2 {
   bool get hasImmutableAnnotation {
     var inheritedAndSelfElements = <InterfaceElement2>[
       ...allSupertypes.map((t) => t.element3),
@@ -273,6 +248,12 @@ extension ClassElementExtension2 on ClassElement2 {
   bool isEnumLikeClass() => asEnumLikeClass() != null;
 }
 
+// TODO(pq): remove when internal migration is complete.
+extension ClassElementExtension on ClassElement {
+  /// Get all constructors, including merged augmentations.
+  List<ConstructorElement> get allConstructors => augmented.constructors;
+}
+
 extension ClassMemberListExtension on List<ClassMember> {
   MethodDeclaration? getMethod(String name) => whereType<MethodDeclaration>()
       .firstWhereOrNull((node) => node.name.lexeme == name);
@@ -523,27 +504,7 @@ extension FunctionBodyExtension on FunctionBody? {
 extension InhertanceManager3Extension on InheritanceManager3 {
   /// Returns the class member that is overridden by [member], if there is one,
   /// as defined by [getInherited].
-  ExecutableElement? overriddenMember(Element? member) {
-    if (member == null) {
-      return null;
-    }
-
-    var interfaceElement = member.thisOrAncestorOfType<InterfaceElement>();
-    if (interfaceElement == null) {
-      return null;
-    }
-    var name = member.name;
-    if (name == null) {
-      return null;
-    }
-
-    var libraryUri = interfaceElement.library.source.uri;
-    return getInherited(interfaceElement.thisType, Name(libraryUri, name));
-  }
-
-  /// Returns the class member that is overridden by [member], if there is one,
-  /// as defined by [getInherited].
-  ExecutableElement2? overriddenMember2(Element2? member) {
+  ExecutableElement2? overriddenMember(Element2? member) {
     ExecutableElement2? executable;
     switch (member) {
       case FieldElement2():
@@ -649,62 +610,6 @@ extension MethodDeclarationExtension on MethodDeclaration {
     }
   }
 
-  PropertyAccessorElement? lookUpGetter() {
-    var declaredElement = this.declaredElement;
-    if (declaredElement == null) {
-      return null;
-    }
-    var parent = declaredElement.enclosingElement3;
-    if (parent is InterfaceElement) {
-      return parent.augmented
-          .lookUpGetter(name: name.lexeme, library: declaredElement.library);
-    }
-    if (parent is ExtensionElement) {
-      return parent.getGetter(name.lexeme);
-    }
-    return null;
-  }
-
-  PropertyAccessorElement? lookUpInheritedConcreteGetter() {
-    var declaredElement = this.declaredElement;
-    if (declaredElement == null) {
-      return null;
-    }
-    var parent = declaredElement.enclosingElement3;
-    if (parent is InterfaceElement) {
-      return parent.lookUpInheritedConcreteGetter(
-          name.lexeme, declaredElement.library);
-    }
-    // Extensions don't inherit.
-    return null;
-  }
-
-  MethodElement? lookUpInheritedConcreteMethod() {
-    var declaredElement = this.declaredElement;
-    if (declaredElement != null) {
-      var parent = declaredElement.enclosingElement3;
-      if (parent is InterfaceElement) {
-        return parent.lookUpInheritedConcreteMethod(
-            name.lexeme, declaredElement.library);
-      }
-    }
-    // Extensions don't inherit.
-    return null;
-  }
-
-  PropertyAccessorElement? lookUpInheritedConcreteSetter() {
-    var declaredElement = this.declaredElement;
-    if (declaredElement != null) {
-      var parent = declaredElement.enclosingElement3;
-      if (parent is InterfaceElement) {
-        return parent.lookUpInheritedConcreteSetter(
-            name.lexeme, declaredElement.library);
-      }
-    }
-    // Extensions don't inherit.
-    return null;
-  }
-
   MethodElement? lookUpInheritedMethod() {
     var declaredElement = this.declaredElement;
     if (declaredElement != null) {

pkg/linter/lib/src/rules/annotate_overrides.dart

@@ -41,7 +41,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     if (element == null) return;
     if (element case Annotatable a when a.metadata2.hasOverride) return;
 
-    var member = context.inheritanceManager.overriddenMember2(element);
+    var member = context.inheritanceManager.overriddenMember(element);
     if (member != null) {
       rule.reportLintForToken(target, arguments: [member.name3!]);
     }

pkg/linter/lib/src/rules/prefer_void_to_null.dart

@@ -46,7 +46,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     if (parent.returnType?.offset != node.offset) return false;
 
     var member = context.inheritanceManager
-        .overriddenMember2(parent.declaredFragment?.element);
+        .overriddenMember(parent.declaredFragment?.element);
     if (member == null) return false;
 
     var returnType = member.returnType;

pkg/linter/lib/src/rules/public_member_api_docs.dart

@@ -112,7 +112,7 @@ class _Visitor extends SimpleAstVisitor<void> {
   /// Whether [node] overrides some other member.
   bool isOverridingMember(Declaration node) =>
       context.inheritanceManager
-          .overriddenMember2(node.declaredFragment?.element) !=
+          .overriddenMember(node.declaredFragment?.element) !=
       null;
 
   @override