In InheritanceManager remove unused, and deprecate used (in lints) methods.

Also, remove it from ErrorVerifier.

R=brianwilkerson@google.com

Change-Id: I35f6f7fd2f8c6680ec470e7bf7da4780a3c69df3
Reviewed-on: https://dart-review.googlesource.com/c/79360
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>

Author: scheglov

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

@@ -335,7 +335,6 @@ class LibraryAnalyzer {
         errorReporter,
         _libraryElement,
         _typeProvider,
-        new InheritanceManager(_libraryElement),
         _inheritance,
         _analysisOptions.enableSuperMixins);
     unit.accept(errorVerifier);

pkg/analyzer/lib/src/dart/resolver/inheritance_manager.dart

@@ -125,6 +125,7 @@ class InheritanceManager {
    * @return the inherited executable element with the member name, or `null` if no such
    *         member exists
    */
+  @deprecated
   ExecutableElement lookupInheritance(
       ClassElement classElt, String memberName) {
     if (memberName == null || memberName.isEmpty) {
@@ -149,6 +150,7 @@ class InheritanceManager {
    * @return the inherited executable element with the member name, or `null` if no such
    *         member exists
    */
+  @deprecated
   ExecutableElement lookupMember(ClassElement classElt, String memberName) {
     ExecutableElement element = _lookupMemberInClass(classElt, memberName);
     if (element != null) {
@@ -193,47 +195,6 @@ class InheritanceManager {
     return result;
   }
 
-  /**
-   * This method takes some inherited [FunctionType], and resolves all the parameterized types
-   * in the function type, dependent on the class in which it is being overridden.
-   *
-   * @param baseFunctionType the function type that is being overridden
-   * @param memberName the name of the member, this is used to lookup the inheritance path of the
-   *          override
-   * @param definingType the type that is overriding the member
-   * @return the passed function type with any parameterized types substituted
-   */
-  // TODO(jmesserly): investigate why this is needed in ErrorVerifier's override
-  // checking. There seems to be some rare cases where we get partially
-  // substituted type arguments, and the function types don't compare equally.
-  FunctionType substituteTypeArgumentsInMemberFromInheritance(
-      FunctionType baseFunctionType,
-      String memberName,
-      InterfaceType definingType) {
-    // if the baseFunctionType is null, or does not have any parameters,
-    // return it.
-    if (baseFunctionType == null || baseFunctionType.typeArguments.isEmpty) {
-      return baseFunctionType;
-    }
-    // First, generate the path from the defining type to the overridden member
-    Queue<InterfaceType> inheritancePath = new Queue<InterfaceType>();
-    _computeInheritancePath(inheritancePath, definingType, memberName);
-    if (inheritancePath == null || inheritancePath.isEmpty) {
-      // TODO(jwren) log analysis engine error
-      return baseFunctionType;
-    }
-    FunctionType functionTypeToReturn = baseFunctionType;
-    // loop backward through the list substituting as we go:
-    while (!inheritancePath.isEmpty) {
-      InterfaceType lastType = inheritancePath.removeLast();
-      List<DartType> parameterTypes = lastType.element.type.typeArguments;
-      List<DartType> argumentTypes = lastType.typeArguments;
-      functionTypeToReturn =
-          functionTypeToReturn.substitute2(argumentTypes, parameterTypes);
-    }
-    return functionTypeToReturn;
-  }
-
   /**
    * Compute and return a mapping between the set of all string names of the members inherited from
    * the passed [ClassElement] superclass hierarchy, and the associated
@@ -336,78 +297,6 @@ class InheritanceManager {
     return resultMap;
   }
 
-  /**
-   * Compute and return the inheritance path given the context of a type and a member that is
-   * overridden in the inheritance path (for which the type is in the path).
-   *
-   * @param chain the inheritance path that is built up as this method calls itself recursively,
-   *          when this method is called an empty [Queue] should be provided
-   * @param currentType the current type in the inheritance path
-   * @param memberName the name of the member that is being looked up the inheritance path
-   */
-  void _computeInheritancePath(Queue<InterfaceType> chain,
-      InterfaceType currentType, String memberName) {
-    // TODO (jwren) create a public version of this method which doesn't require
-    // the initial chain to be provided, then provided tests for this
-    // functionality in InheritanceManagerTest
-    chain.add(currentType);
-    ClassElement classElt = currentType.element;
-    // Base case- reached Object
-    if (currentType.isObject) {
-      // Looked up the chain all the way to Object, return null.
-      // This should never happen.
-      return;
-    }
-    // If we are done, return the chain
-    // We are not done if this is the first recursive call on this method.
-    if (chain.length != 1) {
-      // We are done however if the member is in this classElt
-      if (_lookupMemberInClass(classElt, memberName) != null) {
-        return;
-      }
-    }
-    // Mixins- note that mixins call lookupMemberInClass, not lookupMember
-    List<InterfaceType> mixins = classElt.mixins;
-    for (int i = mixins.length - 1; i >= 0; i--) {
-      ClassElement mixinElement = mixins[i].element;
-      if (mixinElement != null) {
-        ExecutableElement elt = _lookupMemberInClass(mixinElement, memberName);
-        if (elt != null) {
-          // this is equivalent (but faster than) calling this method
-          // recursively
-          // (return computeInheritancePath(chain, mixins[i], memberName);)
-          chain.add(mixins[i]);
-          return;
-        }
-      }
-    }
-    // Superclass
-    InterfaceType supertype = classElt.supertype;
-    if (supertype != null &&
-        lookupMember(supertype.element, memberName) != null) {
-      _computeInheritancePath(chain, supertype, memberName);
-      return;
-    }
-    // Superclass constraints
-    for (InterfaceType interfaceType in classElt.superclassConstraints) {
-      ClassElement interfaceElement = interfaceType.element;
-      if (interfaceElement != null &&
-          lookupMember(interfaceElement, memberName) != null) {
-        _computeInheritancePath(chain, interfaceType, memberName);
-        return;
-      }
-    }
-    // Interfaces
-    for (InterfaceType interfaceType in classElt.interfaces) {
-      ClassElement interfaceElement = interfaceType.element;
-      if (interfaceElement != null &&
-          lookupMember(interfaceElement, memberName) != null) {
-        _computeInheritancePath(chain, interfaceType, memberName);
-        return;
-      }
-    }
-  }
-
   /**
    * Compute and return a mapping between the set of all string names of the members inherited from
    * the passed [ClassElement] interface hierarchy, and the associated

pkg/analyzer/lib/src/generated/error_verifier.dart

@@ -19,7 +19,6 @@ import 'package:analyzer/src/dart/element/element.dart';
 import 'package:analyzer/src/dart/element/inheritance_manager2.dart';
 import 'package:analyzer/src/dart/element/member.dart';
 import 'package:analyzer/src/dart/element/type.dart';
-import 'package:analyzer/src/dart/resolver/inheritance_manager.dart';
 import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer/src/error/pending_error.dart';
 import 'package:analyzer/src/generated/element_resolver.dart';
@@ -74,12 +73,7 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
   /**
    * The manager for the inheritance mappings.
    */
-  final InheritanceManager _inheritanceManager;
-
-  /**
-   * The manager for the inheritance mappings.
-   */
-  final InheritanceManager2 _inheritanceManager2;
+  final InheritanceManager2 _inheritanceManager;
 
   /**
    * A flag indicating whether the visitor is currently within a constructor
@@ -292,13 +286,8 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
   /**
    * Initialize a newly created error verifier.
    */
-  ErrorVerifier(
-      ErrorReporter errorReporter,
-      this._currentLibrary,
-      this._typeProvider,
-      this._inheritanceManager,
-      this._inheritanceManager2,
-      this.enableSuperMixins,
+  ErrorVerifier(ErrorReporter errorReporter, this._currentLibrary,
+      this._typeProvider, this._inheritanceManager, this.enableSuperMixins,
       {this.disableConflictingGenericsCheck: false})
       : _errorReporter = errorReporter,
         _uninstantiatedBoundChecker =
@@ -2449,10 +2438,10 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
       String name = method.name;
 
       // find inherited property accessor
-      ExecutableElement inherited = _inheritanceManager2
+      ExecutableElement inherited = _inheritanceManager
           .getInherited(enclosingType, new Name(libraryUri, name))
           ?.element;
-      inherited ??= _inheritanceManager2
+      inherited ??= _inheritanceManager
           .getInherited(enclosingType, new Name(libraryUri, '$name='))
           ?.element;
 
@@ -2478,10 +2467,10 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
       String name = accessor.displayName;
 
       // find inherited method or property accessor
-      ExecutableElement inherited = _inheritanceManager2
+      ExecutableElement inherited = _inheritanceManager
           .getInherited(enclosingType, new Name(libraryUri, name))
           ?.element;
-      inherited ??= _inheritanceManager2
+      inherited ??= _inheritanceManager
           .getInherited(enclosingType, new Name(libraryUri, '$name='))
           ?.element;
 
@@ -4163,7 +4152,7 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
     for (var name in mixinElementImpl.superInvokedNames) {
       var nameObject = new Name(mixinLibraryUri, name);
 
-      var superMemberType = _inheritanceManager2.getMember(
+      var superMemberType = _inheritanceManager.getMember(
           enclosingType, nameObject,
           forMixinIndex: mixinIndex, forSuper: true);
 
@@ -4177,7 +4166,7 @@ class ErrorVerifier extends RecursiveAstVisitor<Object> {
       }
 
       FunctionType mixinMemberType =
-          _inheritanceManager2.getMember(mixinType, nameObject);
+          _inheritanceManager.getMember(mixinType, nameObject);
 
       if (mixinMemberType != null &&
           !_typeSystem.isOverrideSubtypeOf(superMemberType, mixinMemberType)) {

pkg/analyzer/lib/src/task/dart.dart

@@ -5571,9 +5571,9 @@ class VerifyUnitTask extends SourceBasedAnalysisTask {
     // Compute inheritance and override errors.
     //
     var typeSystem = libraryElement.context.typeSystem;
-    var inheritanceManager2 = new InheritanceManager2(typeSystem);
+    var inheritanceManager = new InheritanceManager2(typeSystem);
     var inheritanceOverrideVerifier = new InheritanceOverrideVerifier(
-        typeSystem, inheritanceManager2, errorReporter);
+        typeSystem, inheritanceManager, errorReporter);
     inheritanceOverrideVerifier.verifyUnit(unit);
 
     //
@@ -5583,8 +5583,7 @@ class VerifyUnitTask extends SourceBasedAnalysisTask {
         errorReporter,
         libraryElement,
         typeProvider,
-        new InheritanceManager(libraryElement),
-        inheritanceManager2,
+        inheritanceManager,
         context.analysisOptions.enableSuperMixins,
         disableConflictingGenericsCheck: true);
     unit.accept(errorVerifier);