general completion contributor cleanup

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

 // Copyright (c) 2015, 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.computer.dart.relevance;
 
 import 'package:analysis_server/src/protocol_server.dart' as protocol;
 import 'package:analysis_server/src/protocol_server.dart'
     show CompletionSuggestion, CompletionSuggestionKind;
-import 'package:analysis_server/src/provisional/completion/completion_dart.dart';
+import 'package:analysis_server/src/provisional/completion/completion_core.dart';
+import 'package:analysis_server/src/provisional/completion/dart/completion_target.dart';
 import 'package:analysis_server/src/services/completion/contribution_sorter.dart';
 import 'package:analysis_server/src/services/completion/dart_completion_manager.dart'
     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/src/task/dart.dart';
 import 'package:analyzer/task/dart.dart';
-import 'package:analyzer/src/task/dart.dart';
 
 part 'common_usage_generated.dart';
 
 /**
  * A computer for adjusting the relevance of completions computed by others
  * based upon common Dart usage patterns. This is a long-lived object
  * that should not maintain state between calls to it's [sort] method.
  */
 class CommonUsageComputer implements ContributionSorter {
   /**
    * A map of <library>.<classname> to an ordered list of method names,
    * field names, getter names, and named constructors.
    * The names are ordered from most relevant to least relevant.
    * Names not listed are considered equally less relevant than those listed.
    */
   Map<String, List<String>> selectorRelevance;
 
   CommonUsageComputer([this.selectorRelevance = defaultSelectorRelevance]);
 
   @override
-  AnalysisRequest sort(
-      CompletionRequest 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 libSrcs = request.context.getLibrariesContaining(request.source);
     if (libSrcs.length == 0) {
       return null;
     }
@@ skipping 102 matching lines @@
   DartType visitPropertyAccess(PropertyAccess node) {
     if (node.propertyName == entity) {
       Expression target = node.realTarget;
       if (target != null) {
         return target.bestType;
       }
     }
     return null;
   }
 }