Move the last of the local reference contributor to the first pass

Change-Id: Ib345a5facef37e2d9d9fc8494b8df116d36c23f0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/341332
Commit-Queue: Brian Wilkerson <[email protected]>
Reviewed-by: Samuel Rawlins <[email protected]>

Author: bwilkerson

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

@@ -17,7 +17,6 @@ import 'package:analysis_server/src/services/completion/dart/field_formal_contri
 import 'package:analysis_server/src/services/completion/dart/in_scope_completion_pass.dart';
 import 'package:analysis_server/src/services/completion/dart/library_member_contributor.dart';
 import 'package:analysis_server/src/services/completion/dart/library_prefix_contributor.dart';
-import 'package:analysis_server/src/services/completion/dart/local_reference_contributor.dart';
 import 'package:analysis_server/src/services/completion/dart/named_constructor_contributor.dart';
 import 'package:analysis_server/src/services/completion/dart/not_imported_contributor.dart';
 import 'package:analysis_server/src/services/completion/dart/override_contributor.dart';
@@ -30,7 +29,6 @@ import 'package:analysis_server/src/services/completion/dart/super_formal_contri
 import 'package:analysis_server/src/services/completion/dart/type_member_contributor.dart';
 import 'package:analysis_server/src/services/completion/dart/uri_contributor.dart';
 import 'package:analysis_server/src/services/completion/dart/variable_name_contributor.dart';
-import 'package:analysis_server/src/services/completion/dart/visibility_tracker.dart';
 import 'package:analysis_server/src/utilities/selection.dart';
 import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/analysis/results.dart';
@@ -135,7 +133,6 @@ class DartCompletionManager {
     // Compute the list of contributors that will be run.
     var builder =
         SuggestionBuilder(request, useFilter: useFilter, listener: listener);
-    var localReferenceContributor = LocalReferenceContributor(request, builder);
     var contributors = <DartCompletionContributor>[
       ArgListContributor(request, builder),
       ClosureContributor(request, builder),
@@ -145,7 +142,6 @@ class DartCompletionManager {
       FieldFormalContributor(request, builder),
       LibraryMemberContributor(request, builder),
       LibraryPrefixContributor(request, builder),
-      localReferenceContributor,
       NamedConstructorContributor(request, builder),
       if (enableOverrideContributor) OverrideContributor(request, builder),
       RecordLiteralContributor(request, builder),
@@ -170,17 +166,12 @@ class DartCompletionManager {
     }
 
     try {
-      VisibilityTracker? visibilityTracker;
       await performance.runAsync(
         'InScopeCompletionPass',
         (performance) async {
-          visibilityTracker =
-              _runFirstPass(request, builder, includedElementKinds != null);
+          _runFirstPass(request, builder, includedElementKinds != null);
         },
       );
-      if (visibilityTracker != null) {
-        localReferenceContributor.visibilityTracker = visibilityTracker!;
-      }
       for (var contributor in contributors) {
         await performance.runAsync(
           '${contributor.runtimeType}',
@@ -239,10 +230,8 @@ class DartCompletionManager {
   }
 
   // Run the first pass of the code completion algorithm.
-  VisibilityTracker? _runFirstPass(DartCompletionRequest request,
-      SuggestionBuilder builder, bool skipImports) {
-    // TODO(brianwilkerson): Stop returning the visibility tracker when the
-    //  `LocalReferenceContributor` has been deleted.
+  void _runFirstPass(DartCompletionRequest request, SuggestionBuilder builder,
+      bool skipImports) {
     var collector = SuggestionCollector();
     var selection = request.unit.select(offset: request.offset, length: 0);
     if (selection == null) {
@@ -253,7 +242,6 @@ class DartCompletionManager {
         state: state, collector: collector, skipImports: skipImports);
     pass.computeSuggestions();
     builder.suggestFromCandidates(collector.suggestions);
-    return pass.visibilityTracker;
   }
 }
 

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

@@ -169,7 +169,9 @@ class DeclarationHelper {
     } else if (parent is CompilationUnit) {
       parent = containingMember;
     }
+    CompilationUnitMember? topLevelMember;
     if (parent is CompilationUnitMember) {
+      topLevelMember = parent;
       _addMembersOf(parent, containingMember);
       parent = parent.parent;
     }
@@ -182,6 +184,9 @@ class DeclarationHelper {
         }
       }
     }
+    if (topLevelMember != null && !mustBeStatic && !mustBeType) {
+      _addInheritedMembers(topLevelMember);
+    }
   }
 
   void addMembersOfType(DartType type) {
@@ -319,6 +324,33 @@ class DeclarationHelper {
     }
   }
 
+  /// Add suggestions for any instance members inherited by the
+  /// [containingMember].
+  void _addInheritedMembers(CompilationUnitMember containingMember) {
+    var element = switch (containingMember) {
+      ClassDeclaration() => containingMember.declaredElement,
+      EnumDeclaration() => containingMember.declaredElement,
+      ExtensionDeclaration() => containingMember.declaredElement,
+      ExtensionTypeDeclaration() => containingMember.declaredElement,
+      MixinDeclaration() => containingMember.declaredElement,
+      ClassTypeAlias() => containingMember.declaredElement,
+      GenericTypeAlias() => containingMember.declaredElement,
+      _ => null,
+    };
+    if (element is! InterfaceElement) {
+      return;
+    }
+    var members = request.inheritanceManager.getInheritedMap2(element);
+    for (var member in members.values) {
+      switch (member) {
+        case MethodElement():
+          _suggestMethod(member, element);
+        case PropertyAccessorElement():
+          _suggestProperty(member, element);
+      }
+    }
+  }
+
   /// Add suggestions for any local declarations that are visible at the
   /// completion location, given that the completion location is within the
   /// [node].

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

@@ -110,6 +110,12 @@ class OverrideContributor extends DartCompletionContributor {
     var namesToOverride = <Name>[];
     for (var name in interface.map.keys) {
       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.declared.containsKey(name)) {
           namesToOverride.add(name);
         }

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

@@ -471,7 +471,6 @@ void f() {
   }
 
   Future<void> test_local_override() async {
-    // TODO(dantup): Debug why using "a" instead of "aa" doesn't work.
     final content = '''
 class Base {
   String aa(String a) => '';
@@ -4154,12 +4153,13 @@ void f() {
       prefix: IfElseStatement.prefix,
       label: IfElseStatement.label,
     );
-    expect(updated, r'''
+    var fourSpaces = '    ';
+    expect(updated, '''
 void f() {
-  if (${1:condition}) {
-    $0
+  if (\${1:condition}) {
+    \$0
   } else {
-    
+$fourSpaces
   }
 }
 ''');
@@ -4318,13 +4318,13 @@ void f() {
       prefix: TryCatchStatement.prefix,
       label: TryCatchStatement.label,
     );
-
-    expect(updated, r'''
+    var fourSpaces = '    ';
+    expect(updated, '''
 void f() {
   try {
-    $0
-  } catch (${1:e}) {
-    
+    \$0
+  } catch (\${1:e}) {
+$fourSpaces
   }
 }
 ''');