DAS: Migrate from InheritanceManager3 in completion code

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

Author: srawlins

pkg/analysis_server/lib/src/services/completion/dart/completion_manager.dart

@@ -31,7 +31,6 @@ import 'package:analyzer/src/dart/analysis/driver_based_analysis_context.dart';
 import 'package:analyzer/src/dart/analysis/file_state.dart';
 import 'package:analyzer/src/dart/analysis/results.dart';
 import 'package:analyzer/src/dart/analysis/session.dart';
-import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
 import 'package:analyzer/src/dartdoc/dartdoc_directive_info.dart';
 import 'package:analyzer/src/generated/source.dart' show SourceFactory;
 import 'package:analyzer/src/util/file_paths.dart' as file_paths;
@@ -403,10 +402,6 @@ class DartCompletionRequest {
     return opType.includeIdentifiers;
   }
 
-  InheritanceManager3 get inheritanceManager {
-    return analysisSession.inheritanceManager;
-  }
-
   /// Answer the [DartType] for Object in dart:core
   InterfaceType get objectType => libraryElement.typeProvider.objectType;
 

pkg/analysis_server/lib/src/services/completion/dart/declaration_helper.dart

@@ -1023,7 +1023,7 @@ class DeclarationHelper {
       return;
     }
     var referencingInterface = _referencingInterfaceFor(element);
-    var members = request.inheritanceManager.getInheritedMap(element);
+    var members = element.inheritedMembers;
     for (var member in members.values) {
       switch (member) {
         case MethodElement():
@@ -1060,8 +1060,8 @@ class DeclarationHelper {
     var substitution = Substitution.fromInterfaceType(type);
     var map =
         onlySuper
-            ? request.inheritanceManager.getInheritedConcreteMap(type.element3)
-            : request.inheritanceManager.getInterface2(type.element3).map2;
+            ? type.element3.inheritedConcreteMembers
+            : type.element3.interfaceMembers;
 
     var membersByName = <String, List<ExecutableElement>>{};
     for (var rawMember in map.values) {

pkg/analysis_server/lib/src/services/completion/dart/override_helper.dart

@@ -9,7 +9,6 @@ import 'package:analysis_server/src/services/completion/dart/completion_state.da
 import 'package:analysis_server/src/services/completion/dart/suggestion_collector.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/source/source_range.dart';
-import 'package:analyzer/src/dart/element/inheritance_manager3.dart';
 
 /// A helper class that produces candidate suggestions for overrides of
 /// inherited methods.
@@ -20,43 +19,34 @@ class OverrideHelper {
   /// The suggestion collector to which suggestions will be added.
   final SuggestionCollector collector;
 
-  /// The inheritance manager used to compute the set of methods that can be
-  /// overridden.
-  final InheritanceManager3 inheritanceManager;
-
   /// Initialize a newly created helper to add suggestions to the [collector].
-  OverrideHelper({required this.state, required this.collector})
-    : inheritanceManager = state.request.inheritanceManager;
+  OverrideHelper({required this.state, required this.collector});
 
   void computeOverridesFor({
     required InterfaceElement interfaceElement,
     required SourceRange replacementRange,
     required bool skipAt,
   }) {
-    var interface = inheritanceManager.getInterface2(interfaceElement);
-    var interfaceMap = interface.map2;
-    var namesToOverride = _namesToOverride(
-      interfaceElement.library2.uri,
-      interface,
-    );
+    var namesToOverride = _namesToOverride(interfaceElement);
 
-    // Build suggestions
+    // Build suggestions.
     for (var name in namesToOverride) {
-      var element = interfaceMap[name];
+      var element = interfaceElement.interfaceMembers[name];
       // Gracefully degrade if the overridden element has not been resolved.
       if (element != null) {
         if (_hasNonVirtualAnnotation(element)) {
           continue;
         }
 
-        var invokeSuper = interface.isSuperImplemented(name);
         var matcherScore = math.max(
           math.max(
             state.matcher.score('override'),
             state.matcher.score('operator'),
           ),
           state.matcher.score(element.displayName),
         );
+        var invokeSuper =
+            interfaceElement.getInheritedConcreteMember(name) != null;
         if (matcherScore != -1) {
           collector.addSuggestion(
             OverrideSuggestion(
@@ -83,19 +73,26 @@ class OverrideHelper {
     return element.metadata2.hasNonVirtual;
   }
 
-  /// Return the list of names that belong to the [interface] of a class, but
-  /// are not yet declared in the class.
-  List<Name> _namesToOverride(Uri libraryUri, Interface interface) {
+  /// Returns the list of names that belong to [interfaceElement], but are not
+  /// yet declared in the class.
+  List<Name> _namesToOverride(InterfaceElement interfaceElement) {
     var namesToOverride = <Name>[];
-    for (var name in interface.map2.keys) {
+    var libraryUri = interfaceElement.library2.uri;
+    var memberNames = interfaceElement.interfaceMembers.keys;
+    for (var name in memberNames) {
       if (name.isAccessibleFor(libraryUri)) {
         // TODO(brianwilkerson): When the user is typing the name of an
         //  inherited member, the map will contain a key matching the current
         //  prefix. If the name is the only thing typed (that is, the field
         //  declaration consists of a single identifier), and that identifier
         //  matches the name of an overridden member, then the override should
         //  still be suggested.
-        if (!interface.declared2.containsKey(name)) {
+        var declaredElement =
+            interfaceElement.getGetter(name.name) ??
+            interfaceElement.getMethod(name.name) ??
+            // `getSetter` accepts names without trailing `=` characters.
+            interfaceElement.getSetter(name.forGetter.name);
+        if (declaredElement == null) {
           namesToOverride.add(name);
         }
       }