Refactor CompletionSuggestionKind

pkg/analysis_server/lib/src/services/completion/invocation_computer.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.computer.dart.invocation;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/services/completion/dart_completion_manager.dart';
 import 'package:analysis_server/src/services/completion/suggestion_builder.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/scanner.dart';
 
+import '../../protocol_server.dart' show CompletionSuggestionKind;
+
 /**
  * A computer for calculating invocation / access suggestions
  * `completion.getSuggestions` request results.
  */
 class InvocationComputer extends DartCompletionComputer {
 
   @override
   bool computeFast(DartCompletionRequest request) {
     // TODO: implement computeFast
     return false;
@@ skipping 108 matching lines @@
     {
   final DartCompletionRequest request;
 
   _InvocationElementVisitor(this.request);
 
   @override
   Future<bool> visitClassElement(ClassElement element) {
     if (element != null) {
       InterfaceType type = element.type;
       if (type != null) {
-        ClassElementSuggestionBuilder.staticSuggestionsFor(request, type.element);
+        ClassElementSuggestionBuilder.suggestionsFor(
+            request,
+            type.element,
+            staticOnly: true);
       }
     }
     return new Future.value(false);
   }
 
   @override
   Future<bool> visitElement(Element element) {
     return new Future.value(false);
   }
 
   @override
   Future<bool> visitPrefixElement(PrefixElement element) {
     //TODO (danrubel) reimplement to use prefixElement.importedLibraries
     // once that accessor is implemented and available in Dart
     bool modified = false;
     // Find the import directive with the given prefix
     request.unit.directives.forEach((Directive directive) {
       if (directive is ImportDirective) {
         if (directive.prefix != null) {
           if (directive.prefix.name == element.name) {
             // Suggest elements from the imported library
             LibraryElement library = directive.uriElement;
-            LibraryElementSuggestionBuilder.suggestionsFor(request, library);
+            LibraryElementSuggestionBuilder.suggestionsFor(
+                request,
+                CompletionSuggestionKind.INVOCATION,
+                library);
             modified = true;
           }
         }
       }
     });
     return new Future.value(modified);
   }
 
   @override
   Future<bool> visitPropertyAccessorElement(PropertyAccessorElement element) {
@@ skipping 12 matching lines @@
 
   @override
   Future<bool> visitVariableElement(VariableElement element) {
     DartType type = element.type;
     if (type != null) {
       ClassElementSuggestionBuilder.suggestionsFor(request, type.element);
     }
     return new Future.value(true);
   }
 }