hookup new CompletionContributorFactory

pkg/analysis_server/lib/src/services/completion/dart_completion_manager.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 services.completion.dart;
 
 import 'dart:async';
 
 import 'package:analysis_server/plugin/protocol/protocol.dart';
 import 'package:analysis_server/src/provisional/completion/completion_core.dart'
     show AnalysisRequest, CompletionContributor, CompletionRequest;
 import 'package:analysis_server/src/provisional/completion/dart/completion_target.dart';
 import 'package:analysis_server/src/services/completion/arglist_contributor.dart';
 import 'package:analysis_server/src/services/completion/combinator_contributor.dart';
 import 'package:analysis_server/src/services/completion/completion_core.dart';
 import 'package:analysis_server/src/services/completion/completion_manager.dart';
 import 'package:analysis_server/src/services/completion/dart/common_usage_sorter.dart';
-import 'package:analysis_server/src/services/completion/dart/completion_manager.dart'
-    as newImpl;
 import 'package:analysis_server/src/services/completion/dart/contribution_sorter.dart';
 import 'package:analysis_server/src/services/completion/dart_completion_cache.dart';
 import 'package:analysis_server/src/services/completion/imported_reference_contributor.dart';
 import 'package:analysis_server/src/services/completion/local_reference_contributor.dart';
 import 'package:analysis_server/src/services/completion/optype.dart';
 import 'package:analysis_server/src/services/completion/prefixed_element_contributor.dart';
 import 'package:analysis_server/src/services/completion/uri_contributor.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/src/generated/ast.dart';
@@ skipping 50 matching lines @@
   /**
    * The [defaultContributionSorter] is a long-lived object that isn't allowed
    * to maintain state between calls to [ContributionSorter#sort(...)].
    */
   static DartContributionSorter defaultContributionSorter =
       new CommonUsageSorter();
 
   final SearchEngine searchEngine;
   final DartCompletionCache cache;
   List<DartCompletionContributor> contributors;
-  List<CompletionContributor> newContributors;
+  Iterable<CompletionContributor> newContributors;
   DartContributionSorter contributionSorter;
 
   DartCompletionManager(
       AnalysisContext context, this.searchEngine, Source source, this.cache,
       [this.contributors, this.newContributors, this.contributionSorter])
       : super(context, source) {
     if (contributors == null) {
       contributors = [
         // LocalReferenceContributor before ImportedReferenceContributor
         // because local suggestions take precedence
         // and can hide other suggestions with the same name
         new LocalReferenceContributor(),
         new ImportedReferenceContributor(),
         //new KeywordContributor(),
         new ArgListContributor(),
         new CombinatorContributor(),
         new PrefixedElementContributor(),
         new UriContributor(),
         // TODO(brianwilkerson) Use the completion contributor extension point
         // to add the contributor below (and eventually, all the contributors).
 //        new NewCompletionWrapper(new InheritedContributor())
       ];
     }
     if (newContributors == null) {
       newContributors = <CompletionContributor>[
         // TODO(danrubel) initialize using plugin API
-        new newImpl.DartCompletionManager(),
+        //new newImpl.DartCompletionManager(),
       ];
     }
     if (contributionSorter == null) {
       contributionSorter = defaultContributionSorter;
     }
   }
 
   /**
    * Create a new initialized Dart source completion manager
    */
   factory DartCompletionManager.create(
-      AnalysisContext context, SearchEngine searchEngine, Source source) {
+      AnalysisContext context,
+      SearchEngine searchEngine,
+      Source source,
+      Iterable<CompletionContributor> newContributors) {
     return new DartCompletionManager(context, searchEngine, source,
-        new DartCompletionCache(context, source));
+        new DartCompletionCache(context, source), null, newContributors);
   }
 
   @override
   Future<bool> computeCache() {
     return waitForAnalysis().then((CompilationUnit unit) {
       if (unit != null && !cache.isImportInfoCached(unit)) {
         return cache.computeImportInfo(unit, searchEngine, true);
       } else {
         return new Future.value(false);
       }
@@ skipping 305 matching lines @@
             parameterNames: suggestion.parameterNames,
             parameterTypes: suggestion.parameterTypes,
             requiredParameterCount: suggestion.requiredParameterCount,
             hasNamedParameters: suggestion.hasNamedParameters,
             returnType: suggestion.returnType,
             element: suggestion.element);
       }
     }
   }
 }