DAS: Migrate from InheritanceManager3 in corrections

Change-Id: I2adf06ba0a1b19c233bd54f5116e6f63c62b1fd3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/429720
Commit-Queue: Samuel Rawlins <[email protected]>
Reviewed-by: Keerti Parthasarathy <[email protected]>

Author: srawlins

pkg/analysis_server/lib/src/services/correction/dart/add_call_super.dart

@@ -40,7 +40,7 @@ class AddCallSuper extends ResolvedCorrectionProducer {
 
     var name = methodDeclaration.name.lexeme;
     var nameObj = Name.forLibrary(classElement.library2, name);
-    var overridden = InheritanceManager3().getInherited4(classElement, nameObj);
+    var overridden = classElement.getInheritedMember(nameObj);
     if (overridden == null) return;
     var overriddenNamedParameters = overridden.formalParameters
         .where((p) => p.isNamed)

pkg/analysis_server/lib/src/services/correction/dart/create_extension_member.dart

@@ -9,7 +9,6 @@ import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
-import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
 import 'package:analyzer/src/dart/element/type.dart';
 import 'package:analyzer/src/dart/resolver/applicable_extensions.dart';
 import 'package:analyzer/src/utilities/extensions/ast.dart';
@@ -534,21 +533,14 @@ extension on Element? {
     if (element is! InterfaceElement) {
       return false;
     }
-    var inheritanceManager3 = InheritanceManager3();
-    var interface = inheritanceManager3.getInterface2(element);
-    var bracesGetter =
-        interface.map2[Name.forLibrary(
-          element.library2,
-          TokenType.INDEX.lexeme,
-        )];
-    if (bracesGetter != null) {
-      return true;
-    }
-    var bracesSetter =
-        interface.map2[Name.forLibrary(
-          element.library2,
-          TokenType.INDEX_EQ.lexeme,
-        )];
-    return bracesSetter != null;
+    var indexName = Name.forLibrary(element.library2, TokenType.INDEX.lexeme);
+    var indexEqName = Name.forLibrary(
+      element.library2,
+      TokenType.INDEX_EQ.lexeme,
+    );
+    var member =
+        element.getInterfaceMember(indexName) ??
+        element.getInterfaceMember(indexEqName);
+    return member != null;
   }
 }

pkg/analysis_server/lib/src/services/correction/dart/replace_return_type.dart

@@ -105,23 +105,16 @@ class ReplaceReturnType extends ResolvedCorrectionProducer {
     }
 
     var classElement = clazz.declaredFragment!.element;
-    var overriddenList = InheritanceManager3().getOverridden4(
-      classElement,
+    var overriddenList = classElement.getOverridden(
       Name.forLibrary(classElement.library2, methodName),
     );
 
-    if (overriddenList != null) {
-      var notSubtype = overriddenList.any(
-        (element) =>
-            !libraryElement2.typeSystem.isSubtypeOf(
-              newType,
-              element.returnType,
-            ),
-      );
-      if (notSubtype) {
-        return false;
-      }
+    if (overriddenList == null) {
+      return true;
     }
-    return true;
+
+    return overriddenList.every(
+      (e) => libraryElement2.typeSystem.isSubtypeOf(newType, e.returnType),
+    );
   }
 }

pkg/analysis_server/lib/src/services/correction/fix/data_driven/rename_parameter.dart

@@ -6,7 +6,6 @@ import 'package:analysis_server/src/services/correction/dart/data_driven.dart';
 import 'package:analysis_server/src/services/correction/fix/data_driven/change.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_dart.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
 
@@ -33,9 +32,7 @@ class RenameParameter extends Change<_Data> {
       var declaration = data.methodDeclaration;
       var parameter = declaration.parameterNamed(oldName);
       if (parameter != null) {
-        var overriddenMethod = declaration.overriddenElement(
-          fix.inheritanceManager,
-        );
+        var overriddenMethod = declaration.overriddenElement;
         var overriddenParameter = overriddenMethod?.parameterNamed(oldName);
         if (overriddenParameter == null) {
           // If the overridden parameter has already been removed, then just
@@ -134,13 +131,13 @@ extension on MethodDeclaration {
   /// Returns the element that this method overrides.
   ///
   /// Returns `null` if this method doesn't override any inherited member.
-  ExecutableElement? overriddenElement(InheritanceManager3 inheritanceManager) {
+  ExecutableElement? get overriddenElement {
     var element = declaredFragment?.element;
     if (element != null) {
       var enclosingElement = element.enclosingElement;
       if (enclosingElement is InterfaceElement) {
         var name = Name(enclosingElement.library2.uri, element.name3!);
-        return inheritanceManager.getInherited4(enclosingElement, name);
+        return enclosingElement.getInheritedMember(name);
       }
     }
     return null;