linter: Reduce usage of InheritanceManager3

Change-Id: Ifb33d26de1223a575cf29b7904f1cf1269f4a3e8
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/428063
Reviewed-by: Paul Berry <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>

Author: srawlins

pkg/linter/lib/src/extensions.dart

@@ -591,6 +591,8 @@ extension LinterContextExtension on LinterContext {
 }
 
 extension MethodDeclarationExtension on MethodDeclaration {
+  bool get hasInheritedMethod => lookUpInheritedMethod() != null;
+
   /// Returns whether this method is an override of a method in any supertype.
   bool get isOverride {
     var element = declaredFragment?.element;
@@ -621,17 +623,14 @@ extension MethodDeclarationExtension on MethodDeclaration {
     }
   }
 
-  bool hasInheritedMethod(InheritanceManager3 inheritanceManager) =>
-      lookUpInheritedMethod(inheritanceManager) != null;
-
-  MethodElement? lookUpInheritedMethod(InheritanceManager3 inheritanceManager) {
+  MethodElement? lookUpInheritedMethod() {
     var declaredElement = declaredFragment?.element;
     if (declaredElement != null) {
       var parent = declaredElement.enclosingElement2;
       if (parent is InterfaceElement) {
         var methodName = Name.forElement(declaredElement);
         if (methodName == null) return null;
-        var inherited = inheritanceManager.getInherited4(parent, methodName);
+        var inherited = parent.getInheritedMember(methodName);
         if (inherited is MethodElement2OrMember) return inherited;
       }
     }

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

@@ -44,9 +44,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     var element = fragment.element;
     if (element.isSealed) return;
 
-    var interface = context.inheritanceManager.getInterface2(element);
-    var map = interface.map2;
-    for (var member in map.values) {
+    for (var member in element.interfaceMembers.values) {
       var enclosingElement = member.enclosingElement2;
       if (enclosingElement is ClassElement &&
           !enclosingElement.isDartCoreObject) {

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

@@ -23,7 +23,7 @@ class AvoidImplementingValueTypes extends LintRule {
     NodeLintRegistry registry,
     LinterContext context,
   ) {
-    var visitor = _Visitor(this, context.inheritanceManager);
+    var visitor = _Visitor(this);
     registry.addClassDeclaration(this, visitor);
   }
 }
@@ -32,9 +32,8 @@ class _Visitor extends SimpleAstVisitor<void> {
   static var equalsName = Name(null, '==');
 
   final LintRule rule;
-  final InheritanceManager3 inheritanceManager;
 
-  _Visitor(this.rule, this.inheritanceManager);
+  _Visitor(this.rule);
 
   @override
   void visitClassDeclaration(ClassDeclaration node) {
@@ -53,11 +52,7 @@ class _Visitor extends SimpleAstVisitor<void> {
   }
 
   bool _overridesEquals(InterfaceElement element) {
-    var member = inheritanceManager.getMember4(
-      element,
-      equalsName,
-      concrete: true,
-    );
+    var member = element.getInterfaceMember(equalsName);
     var definingLibrary = member?.enclosingElement2?.library2;
     return definingLibrary != null && !definingLibrary.isDartCore;
   }

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

@@ -86,7 +86,7 @@ class _Visitor extends SimpleAstVisitor<void> {
         !node.isSetter &&
         !declaredElement.isPrivate &&
         !node.isOperator &&
-        !node.hasInheritedMethod(context.inheritanceManager) &&
+        !node.hasInheritedMethod &&
         !_isOverridingMember(declaredElement)) {
       checkParams(node.parameters?.parameters);
     }
@@ -100,11 +100,7 @@ class _Visitor extends SimpleAstVisitor<void> {
     if (name == null) return false;
 
     var libraryUri = classElement.library2.uri;
-    return context.inheritanceManager.getInherited3(
-          classElement.thisType,
-          Name(libraryUri, name),
-        ) !=
-        null;
+    return classElement.getInheritedMember(Name(libraryUri, name)) != null;
   }
 
   static bool _isBoolean(FormalParameter node) {

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

@@ -40,13 +40,10 @@ class _Visitor extends SimpleAstVisitor<void> {
   /// Whether the `wildcard_variables` feature is enabled.
   final bool _wildCardVariablesEnabled;
 
-  final InheritanceManager3 inheritanceManager;
-
   final LintRule rule;
 
   _Visitor(this.rule, LinterContext context)
-    : _wildCardVariablesEnabled = context.isEnabled(Feature.wildcard_variables),
-      inheritanceManager = context.inheritanceManager;
+    : _wildCardVariablesEnabled = context.isEnabled(Feature.wildcard_variables);
 
   bool isWildcardIdentifier(String lexeme) =>
       _wildCardVariablesEnabled && lexeme == '_';
@@ -73,10 +70,8 @@ class _Visitor extends SimpleAstVisitor<void> {
       if (parentElement is! InterfaceElement) return;
       if (parentElement.isPrivate) return;
 
-      var parentMethod = inheritanceManager.getMember4(
-        parentElement,
+      var parentMethod = parentElement.getInheritedConcreteMember(
         Name(parentElement.library2.uri, node.name.lexeme),
-        forSuper: true,
       );
       if (parentMethod == null) return;
 

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

@@ -22,7 +22,7 @@ class AvoidSettersWithoutGetters extends LintRule {
     NodeLintRegistry registry,
     LinterContext context,
   ) {
-    var visitor = _Visitor(this, context.inheritanceManager);
+    var visitor = _Visitor(this);
     registry.addClassDeclaration(this, visitor);
     registry.addEnumDeclaration(this, visitor);
     registry.addExtensionTypeDeclaration(this, visitor);
@@ -32,9 +32,8 @@ class AvoidSettersWithoutGetters extends LintRule {
 
 class _Visitor extends SimpleAstVisitor<void> {
   final LintRule rule;
-  final InheritanceManager3 inheritanceManager;
 
-  _Visitor(this.rule, this.inheritanceManager);
+  _Visitor(this.rule);
 
   @override
   void visitClassDeclaration(ClassDeclaration node) {
@@ -63,20 +62,17 @@ class _Visitor extends SimpleAstVisitor<void> {
       if (name == null) continue;
 
       // If we're overriding a setter, don't report here.
-      var overridden = inheritanceManager.getOverridden4(interface, name);
+      var overridden = interface.getOverridden(name);
       if (overridden != null && overridden.isNotEmpty) continue;
 
       var getterName = element.name3;
       if (getterName == null) continue;
 
-      // Check for a declared (static) getter.
-      ExecutableElement? getter = interface.getGetter2(getterName);
-      // Then look up for an inherited one.
-      getter ??= inheritanceManager.getMember4(
-        interface,
-        name.forGetter,
-        concrete: true,
-      );
+      var getter =
+          // Check for a declared (static) getter.
+          interface.getGetter2(getterName) ??
+          // Then look for an inherited one.
+          interface.getInheritedConcreteMember(name.forGetter);
 
       if (getter == null) {
         rule.reportAtToken(member.name);

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

@@ -29,7 +29,7 @@ class DiagnosticDescribeAllProperties extends LintRule {
     NodeLintRegistry registry,
     LinterContext context,
   ) {
-    var visitor = _Visitor(this, context.inheritanceManager);
+    var visitor = _Visitor(this);
     registry.addClassDeclaration(this, visitor);
   }
 }
@@ -64,9 +64,8 @@ class _IdentifierVisitor extends RecursiveAstVisitor<void> {
 
 class _Visitor extends SimpleAstVisitor<void> {
   final LintRule rule;
-  final InheritanceManager3 inheritanceManager;
 
-  _Visitor(this.rule, this.inheritanceManager);
+  _Visitor(this.rule);
 
   void removeReferences(MethodDeclaration? method, List<Token> properties) {
     method?.body.accept(_IdentifierVisitor(properties));
@@ -132,7 +131,6 @@ class _Visitor extends SimpleAstVisitor<void> {
     var name = member.name3;
     if (name == null) return false;
 
-    return inheritanceManager.getInherited4(classElement, Name(null, name)) !=
-        null;
+    return classElement.getInheritedMember(Name(null, name)) != null;
   }
 }

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

@@ -24,16 +24,15 @@ class OverriddenFields extends LintRule {
     NodeLintRegistry registry,
     LinterContext context,
   ) {
-    var visitor = _Visitor(this, context.inheritanceManager);
+    var visitor = _Visitor(this);
     registry.addFieldDeclaration(this, visitor);
   }
 }
 
 class _Visitor extends SimpleAstVisitor<void> {
   final LintRule rule;
-  final InheritanceManager3 inheritanceManager;
 
-  _Visitor(this.rule, this.inheritanceManager);
+  _Visitor(this.rule);
 
   @override
   void visitFieldDeclaration(FieldDeclaration node) {
@@ -43,10 +42,8 @@ class _Visitor extends SimpleAstVisitor<void> {
     for (var variable in node.fields.variables) {
       var parent = variable.declaredFragment?.element.enclosingElement2;
       if (parent is InterfaceElement) {
-        var overriddenMember = inheritanceManager.getMember4(
-          parent,
+        var overriddenMember = parent.getInheritedConcreteMember(
           Name(parent.library2.uri, variable.name.lexeme),
-          forSuper: true,
         );
         if (overriddenMember is GetterElement2OrMember &&
             overriddenMember.isSynthetic) {

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

@@ -31,14 +31,12 @@ class PreferFinalFields extends LintRule {
 
 class _DeclarationsCollector extends RecursiveAstVisitor<void> {
   final fields = <FieldElement, VariableDeclaration>{};
-  final InheritanceManager3 inheritanceManager;
 
-  _DeclarationsCollector(this.inheritanceManager);
   bool overridesField(FieldElement field) {
     var enclosingElement = field.enclosingElement2;
     if (enclosingElement is! InterfaceElement) return false;
-    return inheritanceManager.getOverridden4(
-          enclosingElement,
+
+    return enclosingElement.getOverridden(
           Name.forLibrary(field.library2, '${field.name3!}='),
         ) !=
         null;
@@ -112,9 +110,7 @@ class _Visitor extends SimpleAstVisitor<void> {
 
   @override
   void visitCompilationUnit(CompilationUnit node) {
-    var declarationsCollector = _DeclarationsCollector(
-      context.inheritanceManager,
-    );
+    var declarationsCollector = _DeclarationsCollector();
     node.accept(declarationsCollector);
     var fields = declarationsCollector.fields;
 

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

@@ -94,13 +94,12 @@ class _DeclarationGatherer {
         return false;
       }
 
-      var nameObj = Name.forElement(element);
-      if (nameObj == null) {
+      var name = Name.forElement(element);
+      if (name == null) {
         return false;
       }
 
-      var inheritance = linterContext.inheritanceManager;
-      return inheritance.getOverridden(containerElement, nameObj) != null;
+      return containerElement.getOverridden(name) != null;
     }
 
     for (var member in members) {