combinator suggestion fix and more common tests

pkg/analysis_server/lib/src/services/completion/suggestion_builder.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.suggestion.builder;
 
 import 'package:analysis_server/src/protocol_server.dart' as protocol;
 import 'package:analysis_server/src/protocol_server.dart' hide Element,
     ElementKind;
 import 'package:analysis_server/src/services/completion/dart_completion_manager.dart';
@@ skipping 64 matching lines @@
       return element.accept(new ClassElementSuggestionBuilder(request));
     }
   }
 }
 
 /**
  * This class visits elements in a library and provides suggestions based upon
  * the visible members in that library. Clients should call
  * [LibraryElementSuggestionBuilder.suggestionsFor].
  */
-class LibraryElementSuggestionBuilder extends GeneralizingElementVisitor {
+class LibraryElementSuggestionBuilder extends _AbstractSuggestionBuilder {
 
-  final DartCompletionRequest request;
-
-  LibraryElementSuggestionBuilder(this.request);
+  LibraryElementSuggestionBuilder(DartCompletionRequest request)
+      : super(request);
 
   @override
   visitClassElement(ClassElement element) {
-    _addSuggestion(element);
+    _addElementSuggestion(element, CompletionSuggestionKind.CLASS, null, null);
   }
 
   @override
   visitCompilationUnitElement(CompilationUnitElement element) {
     element.visitChildren(this);
   }
 
   @override
   visitElement(Element element) {
     // ignored
   }
 
   @override
+  visitFunctionElement(FunctionElement element) {
+    _addElementSuggestion(
+        element,
+        CompletionSuggestionKind.FUNCTION,
+        element.returnType,
+        null);
+  }
+
+  @override
   visitFunctionTypeAliasElement(FunctionTypeAliasElement element) {
-    _addSuggestion(element);
+    _addElementSuggestion(
+        element,
+        CompletionSuggestionKind.FUNCTION_TYPE_ALIAS,
+        element.returnType,
+        null);
   }
 
   @override
   visitTopLevelVariableElement(TopLevelVariableElement element) {
-    _addSuggestion(element);
-  }
-
-  void _addSuggestion(Element element) {
-    if (element != null) {
-      String completion = element.name;
-      if (completion != null && completion.length > 0) {
-        CompletionSuggestion suggestion = new CompletionSuggestion(
-            protocol.newCompletionSuggestionKind_fromElementKind(element.kind),
-            CompletionRelevance.DEFAULT,
-            completion,
-            completion.length,
-            0,
-            element.isDeprecated,
-            false);
-
-        suggestion.element = newElement_fromEngine(element);
-
-        request.suggestions.add(suggestion);
-      }
-    }
+    _addElementSuggestion(
+        element,
+        CompletionSuggestionKind.TOP_LEVEL_VARIABLE,
+        element.type,
+        null);
   }
 
   /**
    * Add suggestions for the visible members in the given library
    */
   static void suggestionsFor(DartCompletionRequest request,
       LibraryElement library) {
     if (library != null) {
       library.visitChildren(new LibraryElementSuggestionBuilder(request));
     }
@@ skipping 87 matching lines @@
     }
     if (type != null) {
       String typeName = type.displayName;
       if (typeName != null && typeName.length > 0 && typeName != 'dynamic') {
         suggestion.returnType = typeName;
       }
     }
     request.suggestions.add(suggestion);
   }
 }