new DartCompletionPlugin

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

 // Copyright (c) 2015, 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 services.completion.dart.manager;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/protocol/protocol.dart';
-import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/provisional/completion/completion_core.dart'
     show CompletionContributor, CompletionRequest;
 import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';
+import 'package:analysis_server/src/provisional/completion/dart/completion_plugin.dart';
 import 'package:analysis_server/src/provisional/completion/dart/completion_target.dart';
 import 'package:analysis_server/src/services/completion/completion_core.dart';
-import 'package:analysis_server/src/services/completion/dart/keyword_contributor.dart';
+import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/src/context/context.dart'
     show AnalysisFutureHelper, AnalysisContextImpl;
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/engine.dart' hide AnalysisContextImpl;
 import 'package:analyzer/src/generated/source.dart';
 import 'package:analyzer/src/task/dart.dart';
 import 'package:analyzer/task/dart.dart';
 
 /**
- * A factory for constructing the default set of [DartCompletionContributor]s.
- * Do not call this function directly...
- *    use ServerPlugin.dartCompletionContributorFactories
- */
-List<DartCompletionContributor> defaultDartCompletionContributorFactory() =>
-    [new KeywordContributor(),];
-
-/**
  * [DartCompletionManager] determines if a completion request is Dart specific
  * and forwards those requests to all [DartCompletionContributor]s.
  */
 class DartCompletionManager implements CompletionContributor {
   @override
   Future<List<CompletionSuggestion>> computeSuggestions(
       CompletionRequest request) {
     if (AnalysisEngine.isDartFileName(request.source.shortName)) {
       return _computeDartSuggestions(
           new DartCompletionRequestImpl.forRequest(request));
     }
     return new Future.value();
   }
 
   /**
    * Return a [Future] that completes with a list of suggestions
    * for the given completion [request].
    */
   Future<List<CompletionSuggestion>> _computeDartSuggestions(
       DartCompletionRequest request) async {
     // Build the Dart specific completion contributors
     List<DartCompletionContributor> contributors =
         <DartCompletionContributor>[];
     for (DartCompletionContributorFactory contributorFactory
-        in request.serverPlugin.dartCompletionContributorFactories) {
-      contributors.addAll(contributorFactory());
+        in dartCompletionPlugin.contributorFactories) {
+      contributors.add(contributorFactory());
     }
 
     // Request Dart specific completions from each contributor
     List<CompletionSuggestion> suggestions = <CompletionSuggestion>[];
     for (DartCompletionContributor contributor in contributors) {
       suggestions.addAll(await contributor.computeSuggestions(request));
     }
     return suggestions;
   }
 }
@@ skipping 11 matching lines @@
   /**
    * `true` if [resolveDeclarationsInScope] has partially resolved the unit
    * referenced by [target], else `false`.
    */
   bool _haveResolveDeclarationsInScope = false;
 
   /**
    * Initialize a newly created completion request based on the given request.
    */
   factory DartCompletionRequestImpl.forRequest(CompletionRequest request) {
-    return new DartCompletionRequestImpl._(request.server, request.context,
-        request.resourceProvider, request.source, request.offset);
+    return new DartCompletionRequestImpl._(
+        request.context,
+        request.resourceProvider,
+        request.searchEngine,
+        request.source,
+        request.offset);
   }
 
-  DartCompletionRequestImpl._(AnalysisServer server, AnalysisContext context,
-      ResourceProvider resourceProvider, Source source, int offset)
-      : super(server, context, source, offset);
+  DartCompletionRequestImpl._(
+      AnalysisContext context,
+      ResourceProvider resourceProvider,
+      SearchEngine searchEngine,
+      Source source,
+      int offset)
+      : super(context, resourceProvider, searchEngine, source, offset);
 
   @override
   Future<CompilationUnit> resolveDeclarationsInScope() async {
     CompilationUnit unit = target.unit;
     if (_haveResolveDeclarationsInScope) {
       return unit;
     }
 
     // Determine the library source
     Source librarySource;
@@ skipping 31 matching lines @@
 
   @override
   CompletionTarget get target {
     if (_target == null) {
       CompilationUnit unit = context.computeResult(source, PARSED_UNIT);
       _target = new CompletionTarget.forOffset(unit, offset);
     }
     return _target;
   }
 }