Rework contribution sorter to use futures

pkg/analysis_server/test/domain_completion_test.dart

Index: pkg/analysis_server/test/domain_completion_test.dart
diff --git a/pkg/analysis_server/test/domain_completion_test.dart b/pkg/analysis_server/test/domain_completion_test.dart
index fbcdbb9eaee7fd6283f387b925585019677ad5a5..625174ebdbb9b24af1361adac0a7855c5b083476 100644
--- a/pkg/analysis_server/test/domain_completion_test.dart
+++ b/pkg/analysis_server/test/domain_completion_test.dart
@@ -17,7 +17,7 @@ import 'package:analysis_server/src/plugin/server_plugin.dart';
 import 'package:analysis_server/src/provisional/completion/completion_core.dart'
     show AnalysisRequest, CompletionRequest, CompletionResult;
 import 'package:analysis_server/src/services/completion/completion_manager.dart';
-import 'package:analysis_server/src/services/completion/contribution_sorter.dart';
+import 'package:analysis_server/src/services/completion/dart/contribution_sorter.dart';
 import 'package:analysis_server/src/services/completion/dart_completion_manager.dart';
 import 'package:analysis_server/src/services/index/index.dart' show Index;
 import 'package:analysis_server/src/services/index/local_memory_index.dart';
@@ -28,9 +28,6 @@ import 'package:analyzer/source/pub_package_map_provider.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source.dart';
-import 'package:analyzer/src/task/dart.dart';
-import 'package:analyzer/task/dart.dart';
-import 'package:analyzer/task/model.dart';
 import 'package:plugin/manager.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 import 'package:unittest/unittest.dart';
@@ -618,28 +615,6 @@ class B extends A {m() {^}}
     });
   }
 
-  test_relevancy_sorter_analysis() {
-    var originalSorter = DartCompletionManager.defaultContributionSorter;
-
-    // Setup the mock sorter to request additional analysis
-    var mockSorter = new MockRelevancySorter();
-    mockSorter.addTask(PARSED_UNIT);
-    mockSorter.addTask(LIBRARY_ELEMENT1);
-    mockSorter.addTask(RESOLVED_UNIT3);
-    mockSorter.addTask(RESOLVED_UNIT3);
-
-    DartCompletionManager.defaultContributionSorter = mockSorter;
-    addTestFile('main() {Map m; m.^}');
-
-    return getSuggestions().then((_) {
-      DartCompletionManager.defaultContributionSorter = originalSorter;
-      mockSorter.enabled = false;
-
-      // Assert that the analysis requests were processed
-      mockSorter.assertAnalysisRequestsProcessed();
-    });
-  }
-
   test_simple() {
     addTestFile('''
       void main() {
@@ -745,38 +720,16 @@ class MockContext implements AnalysisContext {
   noSuchMethod(Invocation invocation) => super.noSuchMethod(invocation);
 }
 
-class MockRelevancySorter implements ContributionSorter {
+class MockRelevancySorter implements DartContributionSorter {
   bool enabled = true;
-  List<ResultDescriptor> descriptors = <ResultDescriptor>[];
-
-  void addTask(ResultDescriptor descriptor) {
-    descriptors.add(descriptor);
-  }
-
-  void assertAnalysisRequestsProcessed() {
-    expect(descriptors, hasLength(0));
-  }
 
   @override
-  AnalysisRequest sort(
+  Future sort(
       CompletionRequest request, Iterable<CompletionSuggestion> suggestions) {
     if (!enabled) {
       throw 'unexpected sort';
     }
-    return _nextAnalysisRequest(request);
-  }
-
-  AnalysisRequest _callback(CompletionRequest request, var value) {
-    expect(value, isNotNull);
-    return _nextAnalysisRequest(request);
-  }
-
-  AnalysisRequest _nextAnalysisRequest(CompletionRequest request) {
-    if (descriptors.length == 0) {
-      return null;
-    }
-    return new AnalysisRequest(
-        request.source, descriptors.removeAt(0), _callback);
+    return new Future.value();
   }
 }