analyzer: Remove unnecessary InheritanceManager3 from LinterContext

Work towards #50986

At the same time, migrate `redeclare_verifier` from InheritanceManager3,
so that the impl is the same as the `annotate_redeclares` lint rule.

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

Author: srawlins

pkg/analysis_server_plugin/lib/src/plugin_server.dart

@@ -27,7 +27,6 @@ import 'package:analyzer/src/dart/analysis/analysis_context_collection.dart';
 import 'package:analyzer/src/dart/analysis/analysis_options.dart';
 import 'package:analyzer/src/dart/analysis/byte_store.dart';
 import 'package:analyzer/src/dart/analysis/file_content_cache.dart';
-import 'package:analyzer/src/dart/analysis/session.dart';
 import 'package:analyzer/src/dart/element/type_system.dart';
 import 'package:analyzer/src/ignore_comments/ignore_info.dart';
 import 'package:analyzer/src/lint/linter.dart';
@@ -347,8 +346,6 @@ class PluginServer {
       currentUnit,
       libraryResult.element2.typeProvider,
       libraryResult.element2.typeSystem as TypeSystemImpl,
-      (analysisContext.currentSession as AnalysisSessionImpl)
-          .inheritanceManager,
       // TODO(srawlins): Support 'package' parameter.
       null,
     );

pkg/analyzer/lib/src/dart/analysis/library_analyzer.dart

@@ -408,7 +408,6 @@ class LibraryAnalyzer {
       definingContextUnit,
       _typeProvider,
       _typeSystem,
-      _inheritance,
       workspacePackage,
     );
 
@@ -520,7 +519,7 @@ class LibraryAnalyzer {
 
     unit.accept(OverrideVerifier(_inheritance, errorReporter));
 
-    unit.accept(RedeclareVerifier(_inheritance, errorReporter));
+    unit.accept(RedeclareVerifier(errorReporter));
 
     TodoFinder(errorReporter).findIn(unit);
     LanguageVersionOverrideVerifier(errorReporter).verify(unit);

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

@@ -6,23 +6,19 @@ import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/error/listener.dart';
-import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
 import 'package:analyzer/src/error/codes.dart';
 
 /// Instances of the class `RedeclareVerifier` visit all of the members of any
 /// extension type declarations in a compilation unit to verify that if they
 /// have a redeclare annotation it is being used correctly.
 class RedeclareVerifier extends RecursiveAstVisitor<void> {
-  /// The inheritance manager used to find redeclared members.
-  final InheritanceManager3 _inheritance;
-
   /// The error reporter used to report errors.
   final ErrorReporter _errorReporter;
 
   /// The current extension type.
   InterfaceElement? _currentExtensionType;
 
-  RedeclareVerifier(this._inheritance, this._errorReporter);
+  RedeclareVerifier(this._errorReporter);
 
   @override
   void visitExtensionTypeDeclaration(ExtensionTypeDeclaration node) {
@@ -69,10 +65,8 @@ class RedeclareVerifier extends RecursiveAstVisitor<void> {
   bool _redeclaresMember(ExecutableElement member) {
     var currentType = _currentExtensionType;
     if (currentType != null) {
-      var interface = _inheritance.getInterface2(currentType);
-      var redeclared = interface.redeclared2;
       var name = Name.forElement(member);
-      return redeclared.containsKey(name);
+      return name != null && currentType.getInheritedMember(name) != null;
     }
 
     return false;

pkg/analyzer/lib/src/lint/linter.dart

@@ -12,7 +12,6 @@ import 'package:analyzer/diagnostic/diagnostic.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/file_system/file_system.dart';
-import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
 import 'package:analyzer/src/lint/linter_visitor.dart' show NodeLintRegistry;
 import 'package:analyzer/src/lint/pub.dart';
 import 'package:analyzer/src/lint/state.dart';
@@ -234,8 +233,6 @@ abstract class LinterContext {
   /// The defining compilation unit of the library under analysis.
   LintRuleUnitContext get definingUnit;
 
-  InheritanceManager3 get inheritanceManager;
-
   /// Whether the [definingUnit]'s location is in a package's top-level 'lib'
   /// directory, including locations deeply nested, and locations in the
   /// package-implementation directory, 'lib/src'.
@@ -276,9 +273,6 @@ final class LinterContextWithParsedResults implements LinterContext {
   @override
   LintRuleUnitContext? currentUnit;
 
-  @override
-  final InheritanceManager3 inheritanceManager = InheritanceManager3();
-
   LinterContextWithParsedResults(this.allUnits, this.definingUnit);
 
   @override
@@ -333,15 +327,11 @@ final class LinterContextWithResolvedResults implements LinterContext {
   @override
   final TypeSystem typeSystem;
 
-  @override
-  final InheritanceManager3 inheritanceManager;
-
   LinterContextWithResolvedResults(
     this.allUnits,
     this.definingUnit,
     this.typeProvider,
     this.typeSystem,
-    this.inheritanceManager,
     this.package,
   );
 

pkg/analyzer/test/src/lint/linter/linter_context_impl_test.dart

@@ -4,7 +4,6 @@
 
 import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
-import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
 import 'package:analyzer/src/lint/constants.dart';
 import 'package:analyzer/src/lint/linter.dart';
 import 'package:analyzer/src/string_source.dart';
@@ -52,7 +51,6 @@ abstract class AbstractLinterContextTest extends PubPackageResolutionTest {
       contextUnit,
       result.typeProvider,
       result.typeSystem,
-      InheritanceManager3(),
       // TODO(pq): Use a test package or consider passing in `null`.
       workspacePackage,
     );

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

@@ -26,16 +26,15 @@ class AnnotateRedeclares extends LintRule {
     NodeLintRegistry registry,
     LinterContext context,
   ) {
-    var visitor = _Visitor(this, context);
+    var visitor = _Visitor(this);
     registry.addExtensionTypeDeclaration(this, visitor);
   }
 }
 
 class _Visitor extends SimpleAstVisitor<void> {
   final LintRule rule;
-  final LinterContext context;
 
-  _Visitor(this.rule, this.context);
+  _Visitor(this.rule);
 
   @override
   void visitExtensionTypeDeclaration(ExtensionTypeDeclaration node) {
@@ -60,17 +59,14 @@ class _Visitor extends SimpleAstVisitor<void> {
     }
   }
 
-  /// Return `true` if the [member] redeclares a member from a superinterface.
+  /// Returns whether the [member] redeclares a member from a superinterface.
   bool _redeclaresMember(
     ExecutableElement member,
     InterfaceElement extensionType,
   ) {
-    // TODO(pq): unify with similar logic in `redeclare_verifier` and move to inheritanceManager
-    var interface = context.inheritanceManager.getInterface2(extensionType);
     var memberName = member.name3;
-    return memberName != null &&
-        interface.redeclared2.containsKey(
-          Name.forLibrary(member.library2, memberName),
-        );
+    if (memberName == null) return false;
+    var name = Name.forLibrary(member.library2, memberName);
+    return extensionType.getInheritedMember(name) != null;
   }
 }