process sorter analysis request(s)

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 435586c5f2050d0c3a96d2f20df29a866b1f2b97..6c4b29577e7d3b2166d5a7d2e80efe830068dfa3 100644
--- a/pkg/analysis_server/test/domain_completion_test.dart
+++ b/pkg/analysis_server/test/domain_completion_test.dart
@@ -30,6 +30,9 @@ 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';
@@ -617,6 +620,28 @@ 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() {
@@ -724,14 +749,36 @@ class MockContext implements AnalysisContext {
 
 class MockRelevancySorter implements ContributionSorter {
   bool enabled = true;
+  List<ResultDescriptor> descriptors = <ResultDescriptor>[];
+
+  void addTask(ResultDescriptor descriptor) {
+    descriptors.add(descriptor);
+  }
+
+  void assertAnalysisRequestsProcessed() {
+    expect(descriptors, hasLength(0));
+  }
 
   @override
-  AnalysisRequest sort(CompletionRequest request,
-      Iterable<CompletionSuggestion> suggestions) {
+  AnalysisRequest sort(
+      CompletionRequest request, Iterable<CompletionSuggestion> suggestions) {
     if (!enabled) {
       throw 'unexpected sort';
     }
-    return null;
+    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);
   }
 }