new DartCompletionPlugin

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/analysis_server.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';
 import 'package:analyzer/src/generated/engine.dart' hide AnalysisContextImpl;
 import 'package:analyzer/src/generated/scanner.dart';
 import 'package:analyzer/src/generated/source.dart';
 
 export 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart'
     show
         DART_RELEVANCE_COMMON_USAGE,
         DART_RELEVANCE_DEFAULT,
         DART_RELEVANCE_HIGH,
@@ skipping 156 matching lines @@
 
   /**
    * If there is remaining work to be done, then wait for the unit to be
    * resolved and request that each remaining contributor finish their work.
    * Return a [Future] that completes when the last notification has been sent.
    */
   Future computeFull(
       DartCompletionRequest request,
       CompletionPerformance performance,
       List<DartCompletionContributor> todo) async {
-
     // Compute suggestions using the new API
     performance.logStartTime('computeSuggestions');
     for (CompletionContributor contributor in newContributors) {
       String contributorTag = 'computeSuggestions - ${contributor.runtimeType}';
       performance.logStartTime(contributorTag);
       List<CompletionSuggestion> newSuggestions =
           await contributor.computeSuggestions(request);
       for (CompletionSuggestion suggestion in newSuggestions) {
         request.addSuggestion(suggestion);
       }
       performance.logElapseTime(contributorTag);
     }
     performance.logElapseTime('computeSuggestions');
     performance.logStartTime('waitForAnalysis');
 
     if (todo.isEmpty) {
       // TODO(danrubel) current sorter requires no additional analysis,
       // but need to handle the returned future the same way that futures
       // returned from contributors are handled once this method is refactored
       // to be async.
-      /* await */ contributionSorter.sort(
-          request, request.suggestions);
+      /* await */ contributionSorter.sort(request, request.suggestions);
       // TODO (danrubel) if request is obsolete
       // (processAnalysisRequest returns false)
       // then send empty results
       sendResults(request, true);
     }
 
     // Compute the other suggestions
     return waitForAnalysis().then((CompilationUnit unit) {
       if (controller.isClosed) {
         return;
@@ skipping 130 matching lines @@
   /**
    * The list of suggestions to be sent to the client.
    */
   final List<CompletionSuggestion> _suggestions = <CompletionSuggestion>[];
 
   /**
    * The set of completions used to prevent duplicates
    */
   final Set<String> _completions = new Set<String>();
 
-  DartCompletionRequest(AnalysisServer server, AnalysisContext context,
-      Source source, int offset, this.cache)
-      : super(server, context, source, offset);
+  DartCompletionRequest(
+      AnalysisContext context,
+      ResourceProvider resourceProvider,
+      SearchEngine searchEngine,
+      Source source,
+      int offset,
+      this.cache)
+      : super(context, resourceProvider, searchEngine, source, offset);
 
   factory DartCompletionRequest.from(
           CompletionRequestImpl request, DartCompletionCache cache) =>
-      new DartCompletionRequest(request.server, request.context, request.source,
-          request.offset, cache);
+      new DartCompletionRequest(request.context, request.resourceProvider,
+          request.searchEngine, request.source, request.offset, cache);
 
   /**
    * Return the original text from the [replacementOffset] to the [offset]
    * that can be used to filter the suggestions on the server side.
    */
   String get filterText {
     return context
         .getContents(source)
         .data
         .substring(replacementOffset, offset);
   }
 
   /**
    * Information about the types of suggestions that should be included.
    * The [target] must be set first.
    */
   OpType get optype {
     if (_optype == null) {
       _optype = new OpType.forCompletion(target, offset);
     }
     return _optype;
   }
 
   /**
-   * The search engine for use when building suggestions.
-   */
-  SearchEngine get searchEngine => server.searchEngine;
-
-  /**
    * The list of suggestions to be sent to the client.
    */
   Iterable<CompletionSuggestion> get suggestions => _suggestions;
 
   /**
    * Add the given suggestion to the list that is returned to the client as long
    * as a suggestion with an identical completion has not already been added.
    */
   void addSuggestion(CompletionSuggestion suggestion) {
     if (_completions.add(suggestion.completion)) {
@@ skipping 24 matching lines @@
             parameterNames: suggestion.parameterNames,
             parameterTypes: suggestion.parameterTypes,
             requiredParameterCount: suggestion.requiredParameterCount,
             hasNamedParameters: suggestion.hasNamedParameters,
             returnType: suggestion.returnType,
             element: suggestion.element);
       }
     }
   }
 }