Refactor CompletionSuggestionKind

pkg/analysis_server/lib/src/services/completion/imported_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.toplevel;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/protocol_server.dart' hide Element,
     ElementKind;
@@ skipping 21 matching lines @@
     return false;
   }
 
   @override
   Future<bool> computeFull(DartCompletionRequest request) {
     return request.node.accept(new _ImportedVisitor(request));
   }
 }
 
 /**
- * A visitor for determining which imported class and top level variable
+ * A visitor for determining which imported classes and top level variables
  * should be suggested and building those suggestions.
  */
 class _ImportedVisitor extends GeneralizingAstVisitor<Future<bool>> {
   final DartCompletionRequest request;
 
   _ImportedVisitor(this.request);
 
   @override
   Future<bool> visitArgumentList(ArgumentList node) {
     return _addImportedElementSuggestions(node, excludeVoidReturn: true);
@@ skipping 134 matching lines @@
     if (equals != null && request.offset >= equals.end) {
       return _addImportedElementSuggestions(node, excludeVoidReturn: true);
     }
     return new Future.value(false);
   }
 
   Future _addCombinatorSuggestions(Combinator node) {
     var directive = node.getAncestor((parent) => parent is NamespaceDirective);
     if (directive is NamespaceDirective) {
       LibraryElement library = directive.uriElement;
-      LibraryElementSuggestionBuilder.suggestionsFor(request, library);
+      LibraryElementSuggestionBuilder.suggestionsFor(
+          request,
+          CompletionSuggestionKind.IDENTIFIER,
+          library);
       return new Future.value(true);
     }
-
     return new Future.value(false);
   }
 
   void _addElementSuggestion(Element element, bool typesOnly,
       bool excludeVoidReturn, CompletionRelevance relevance) {
 
     if (element is ExecutableElement) {
       if (element.isOperator) {
         return;
       }
       if (excludeVoidReturn) {
         DartType returnType = element.returnType;
         if (returnType != null && returnType.isVoid) {
           return;
         }
       }
     }
     if (typesOnly && element is! ClassElement) {
       return;
     }
 
-    CompletionSuggestionKind kind =
-        newCompletionSuggestionKind_fromElementKind(element.kind);
-
     String completion = element.displayName;
     CompletionSuggestion suggestion = new CompletionSuggestion(
-        kind,
+        CompletionSuggestionKind.INVOCATION,
         relevance,
         completion,
         completion.length,
         0,
         element.isDeprecated,
         false);
 
     suggestion.element = newElement_fromEngine(element);
 
     DartType type;
@@ skipping 136 matching lines @@
         }
       });
       return true;
     });
   }
 
   void _addLibraryPrefixSuggestion(ImportElement importElem) {
     String completion = importElem.prefix.displayName;
     if (completion != null && completion.length > 0) {
       CompletionSuggestion suggestion = new CompletionSuggestion(
-          CompletionSuggestionKind.LIBRARY_PREFIX,
+          CompletionSuggestionKind.INVOCATION,
           CompletionRelevance.DEFAULT,
           completion,
           completion.length,
           0,
           importElem.isDeprecated,
           false);
       LibraryElement lib = importElem.importedLibrary;
       if (lib != null) {
         suggestion.element = newElement_fromEngine(lib);
       }
       request.suggestions.add(suggestion);
     }
   }
 }