refactor ContributionSorter to use new API

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/completion/completion_core.dart'
     show CompletionRequest;
 import 'package:analysis_server/completion/completion_dart.dart' as newApi;
+import 'package:analysis_server/completion/dart/completion_target.dart';
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/protocol.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/common_usage_computer.dart';
 import 'package:analysis_server/src/services/completion/completion_manager.dart';
-import 'package:analysis_server/src/services/completion/completion_target.dart';
 import 'package:analysis_server/src/services/completion/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/inherited_computer.dart';
 import 'package:analysis_server/src/services/completion/keyword_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';
@@ skipping 40 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 ContributionSorter defaultContributionSorter = new CommonUsageComputer();
+  static ContributionSorter defaultContributionSorter =
+      new CommonUsageComputer();
 
   final SearchEngine searchEngine;
   final DartCompletionCache cache;
   List<DartCompletionContributor> contributors;
   ContributionSorter contributionSorter;
 
   DartCompletionManager(
       AnalysisContext context, this.searchEngine, Source source, this.cache,
       [this.contributors, this.contributionSorter])
       : super(context, source) {
@@ skipping 79 matching lines @@
           }
         }
       }
 
       List<DartCompletionContributor> todo = new List.from(contributors);
       todo.removeWhere((DartCompletionContributor c) {
         return performance.logElapseTime('computeFast ${c.runtimeType}', () {
           return c.computeFast(request);
         });
       });
-      contributionSorter.sort(request);
+      contributionSorter.sort(
+          new OldRequestWrapper(request), request.suggestions);
       sendResults(request, todo.isEmpty);
       return todo;
     });
   }
 
   /**
    * 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.
    */
@@ skipping 17 matching lines @@
         int count = todo.length;
         todo.forEach((DartCompletionContributor c) {
           String name = c.runtimeType.toString();
           String completeTag = 'computeFull $name complete';
           performance.logStartTime(completeTag);
           performance.logElapseTime('computeFull $name', () {
             c.computeFull(request).then((bool changed) {
               performance.logElapseTime(completeTag);
               bool last = --count == 0;
               if (changed || last) {
-                contributionSorter.sort(request);
+                contributionSorter.sort(
+                    new OldRequestWrapper(request), request.suggestions);
                 sendResults(request, last);
               }
             });
           });
         });
       });
     });
   }
 
   @override
@@ skipping 244 matching lines @@
   @override
   int get offset => request.offset;
 
   @override
   ResourceProvider get resourceProvider => request.resourceProvider;
 
   @override
   Source get source => request.source;
 
   @override
+  CompletionTarget get target => request.target;
+
+  @override
   CompilationUnit get unit => request.unit;
 
   @override
   String toString() => 'wrapped $request';
 }