update completion sorter to new API

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

Index: pkg/analysis_server/lib/src/services/completion/common_usage_computer.dart
diff --git a/pkg/analysis_server/lib/src/services/completion/common_usage_computer.dart b/pkg/analysis_server/lib/src/services/completion/common_usage_computer.dart
index e3c44ce487ea660195f174cf80d6ff6ee8020fe6..4daebe71ac1cc7b75397ea002b69a5de6a94a114 100644
--- a/pkg/analysis_server/lib/src/services/completion/common_usage_computer.dart
+++ b/pkg/analysis_server/lib/src/services/completion/common_usage_computer.dart
@@ -13,6 +13,10 @@ import 'package:analysis_server/src/services/completion/dart_completion_manager.
     show DART_RELEVANCE_COMMON_USAGE;
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
+import 'package:analysis_server/src/provisional/completion/completion_core.dart';
+import 'package:analysis_server/src/provisional/completion/dart/completion_target.dart';
+import 'package:analyzer/task/dart.dart';
+import 'package:analyzer/src/task/dart.dart';
 
 part 'common_usage_generated.dart';
 
@@ -33,9 +37,24 @@ class CommonUsageComputer implements ContributionSorter {
   CommonUsageComputer([this.selectorRelevance = defaultSelectorRelevance]);
 
   @override
-  void sort(DartCompletionRequest request,
-      Iterable<CompletionSuggestion> suggestions) {
+  AnalysisRequest sort(
+      CompletionRequest request, Iterable<CompletionSuggestion> suggestions) {
     _update(request, suggestions);
+    return null;
+  }
+
+  CompletionTarget _getCompletionTarget(CompletionRequest request) {
+    // TODO (danrubel) get cached completion target
+    var libElem = request.context.getResult(request.source, LIBRARY_ELEMENT1);

[Brian Wilkerson, 2015/11/14 16:59:24]

If `request.source` is a part file, then `libElem` will always be `null`. You
need to ask for the `CONTAINING_LIBRARIES` and deal with the possibility that
the part might be in multiple libraries.

[danrubel, 2015/11/17 06:58:45]

Good point. Fixed.

+    if (libElem is LibraryElement) {

[Brian Wilkerson, 2015/11/14 16:59:24]

The value of `libElem` can only be a LibraryElement or `null`. Personally, I'd
find the code to be cleaner if we gave `libElem` a type of `LibraryElement` and
made the null check explicit here. (Of course, this will all change anyway as a
result of my previous comment...)

In general, it's better to include type annotations everywhere so that we get
extra checking when we run our tests.

+      var unit = request.context.getResult(
+          new LibrarySpecificUnit(libElem.source, request.source),
+          RESOLVED_UNIT3);
+      if (unit is CompilationUnit){

[Brian Wilkerson, 2015/11/14 16:59:24]

"){"? Did the formatter leave the code this way?

[danrubel, 2015/11/17 06:58:45]

Oops. Must forgotten to run the formatter. Done.

+        return new CompletionTarget.forOffset(unit, request.offset);
+      }
+    }
+    return null;
   }
 
   /**
@@ -43,16 +62,19 @@ class CommonUsageComputer implements ContributionSorter {
    * The compilation unit and completion node
    * in the given completion context may not be resolved.
    */
-  void _update(DartCompletionRequest request,
-      Iterable<CompletionSuggestion> suggestions) {
-    var visitor = new _BestTypeVisitor(request.target.entity);
-    DartType type = request.target.containingNode.accept(visitor);
-    if (type != null) {
-      Element typeElem = type.element;
-      if (typeElem != null) {
-        LibraryElement libElem = typeElem.library;
-        if (libElem != null) {
-          _updateInvocationRelevance(request, type, libElem, suggestions);
+  void _update(
+      CompletionRequest request, Iterable<CompletionSuggestion> suggestions) {
+    var target = _getCompletionTarget(request);
+    if (target != null) {
+      var visitor = new _BestTypeVisitor(target.entity);
+      DartType type = target.containingNode.accept(visitor);
+      if (type != null) {
+        Element typeElem = type.element;
+        if (typeElem != null) {
+          LibraryElement libElem = typeElem.library;
+          if (libElem != null) {
+            _updateInvocationRelevance(type, libElem, suggestions);
+          }
         }
       }
     }
@@ -62,8 +84,8 @@ class CommonUsageComputer implements ContributionSorter {
    * Adjusts the relevance of all method suggestions based upon the given
    * target type and library.
    */
-  void _updateInvocationRelevance(DartCompletionRequest request, DartType type,
-      LibraryElement libElem, Iterable<CompletionSuggestion> suggestions) {
+  void _updateInvocationRelevance(DartType type, LibraryElement libElem,
+      Iterable<CompletionSuggestion> suggestions) {
     String typeName = type.name;
     List<String> selectors = selectorRelevance['${libElem.name}.${typeName}'];
     if (selectors != null) {