Rework contribution sorter to use futures

pkg/analysis_server/test/domain_completion_test.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library test.domain.completion;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/protocol/protocol.dart';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/channel/channel.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/context_manager.dart';
 import 'package:analysis_server/src/domain_analysis.dart';
 import 'package:analysis_server/src/domain_completion.dart';
 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';
 import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/instrumentation/instrumentation.dart';
 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';
 
 import 'analysis_abstract.dart';
 import 'mock_sdk.dart';
 import 'mocks.dart';
 import 'utils.dart';
 
 main() {
@@ skipping 567 matching lines @@
     return getSuggestions().then((_) {
       expect(replacementOffset, equals(completionOffset));
       expect(replacementLength, equals(0));
       assertHasResult(CompletionSuggestionKind.INVOCATION, 'Object');
       assertHasResult(CompletionSuggestionKind.INVOCATION, 'HtmlElement');
       assertHasResult(CompletionSuggestionKind.INVOCATION, 'A');
       assertNoResult('test');
     });
   }
 
-  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() {
         ^
       }
     ''');
     return getSuggestions().then((_) {
       expect(replacementOffset, equals(completionOffset));
       expect(replacementLength, equals(0));
       assertHasResult(CompletionSuggestionKind.INVOCATION, 'Object');
@@ skipping 85 matching lines @@
   }
 
   @override
   TimestampedData<String> getContents(Source source) {
     return source.contents;
   }
 
   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();
   }
 }
 
 /**
  * Mock stream for tracking calls to listen and subscription.cancel.
  */
 class MockStream<E> implements Stream<E> {
   MockSubscription<E> mockSubscription = new MockSubscription<E>();
   int listenCount = 0;
 
@@ skipping 101 matching lines @@
 }
     ''');
     await waitForTasksFinished();
     Request request =
         new CompletionGetSuggestionsParams(testFile, 0).toRequest('0');
     Response response = handler.handleRequest(request);
     expect(response.error, isNotNull);
     expect(response.error.code, RequestErrorCode.NO_INDEX_GENERATED);
   }
 }