move DartCompletionSorter to dart specific contributor

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/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/contribution_sorter.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';
 import 'package:analyzer/src/generated/source.dart';
 
 /**
  * The base class for contributing code completion suggestions.
  */
 abstract class DartCompletionContributor {
@@ skipping 13 matching lines @@
    * in the given completion context are resolved.
    * Returns `true` if the receiver modified the list of suggestions.
    */
   Future<bool> computeFull(DartCompletionRequest request);
 }
 
 /**
  * Manages code completion for a given Dart file completion request.
  */
 class DartCompletionManager extends CompletionManager {
-  /**
-   * 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;
   Iterable<CompletionContributor> newContributors;
-  DartContributionSorter contributionSorter;
 
   DartCompletionManager(
       AnalysisContext context, this.searchEngine, Source source,
-      [this.newContributors, this.contributionSorter])
+      [this.newContributors])
       : super(context, source) {
     if (newContributors == null) {
       newContributors = <CompletionContributor>[];
     }
-    if (contributionSorter == null) {
-      contributionSorter = defaultContributionSorter;
-    }
   }
 
   /**
    * Create a new initialized Dart source completion manager
    */
   factory DartCompletionManager.create(
       AnalysisContext context,
       SearchEngine searchEngine,
       Source source,
       Iterable<CompletionContributor> newContributors) {
@@ skipping 28 matching lines @@
       List<CompletionSuggestion> newSuggestions =
           await contributor.computeSuggestions(request);
       for (CompletionSuggestion suggestion in newSuggestions) {
         request.addSuggestion(suggestion);
       }
       performance.logElapseTime(contributorTag);
     }
     performance.logElapseTime('computeSuggestions');
     performance.logStartTime('waitForAnalysis');
 
-    // 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);
     // TODO (danrubel) if request is obsolete
     // (processAnalysisRequest returns false)
     // then send empty results
     sendResults(request, true);
     return new Future.value();
   }
 
   @override
   void computeSuggestions(CompletionRequest completionRequest) {
     DartCompletionRequest request =
@@ skipping 76 matching lines @@
   /**
    * 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)) {
       _suggestions.add(suggestion);
     }
   }
 }