new DartCompletionPlugin

pkg/analysis_server/test/services/completion/dart/completion_contributor_util.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.services.completion.dart.util;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/protocol/protocol.dart' as protocol
     show Element, ElementKind;
 import 'package:analysis_server/plugin/protocol/protocol.dart'
     hide Element, ElementKind;
 import 'package:analysis_server/plugin/protocol/protocol.dart';
-import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';
 import 'package:analysis_server/src/services/completion/completion_core.dart';
 import 'package:analysis_server/src/services/completion/dart/completion_manager.dart'
     show DartCompletionRequestImpl;
 import 'package:analysis_server/src/services/completion/dart_completion_manager.dart'
     show DART_RELEVANCE_DEFAULT, DART_RELEVANCE_LOW;
 import 'package:analysis_server/src/services/index/index.dart';
 import 'package:analysis_server/src/services/index/local_memory_index.dart';
 import 'package:analysis_server/src/services/search/search_engine_internal.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:unittest/unittest.dart';
 
 import '../../../abstract_context.dart';
-import '../../../operation/operation_queue_test.dart';
 
 int suggestionComparator(CompletionSuggestion s1, CompletionSuggestion s2) {
   String c1 = s1.completion.toLowerCase();
   String c2 = s2.completion.toLowerCase();
   return c1.compareTo(c2);
 }
 
 abstract class DartCompletionContributorTest extends AbstractContextTest {
   Index index;
   SearchEngineImpl searchEngine;
@@ skipping 87 matching lines @@
     context.performAnalysisTask();
     // We use a delayed future to allow microtask events to finish. The
     // Future.value or Future() constructors use scheduleMicrotask themselves and
     // would therefore not wait for microtask callbacks that are scheduled after
     // invoking this method.
     return new Future.delayed(
         Duration.ZERO, () => computeLibrariesContaining(times - 1));
   }
 
   Future computeSuggestions([int times = 200]) async {
-    AnalysisServer server = new AnalysisServerMock(
-        searchEngine: searchEngine, resourceProvider: provider);
     CompletionRequestImpl baseRequest = new CompletionRequestImpl(
-        server, context, testSource, completionOffset);
+        context, provider, searchEngine, testSource, completionOffset);
     request = new DartCompletionRequestImpl.forRequest(baseRequest);
     Completer<List<CompletionSuggestion>> completer =
         new Completer<List<CompletionSuggestion>>();
 
     // Request completions
     contributor
         .computeSuggestions(request)
         .then((List<CompletionSuggestion> computedSuggestions) {
       completer.complete(computedSuggestions);
     });
@@ skipping 63 matching lines @@
   }
 
   @override
   void setUp() {
     super.setUp();
     index = createLocalMemoryIndex();
     searchEngine = new SearchEngineImpl(index);
     contributor = createContributor();
   }
 }