add element to completion suggestions

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.dart' hide Element;
+import 'package:analysis_server/src/protocol.dart' as protocol show Element, ElementKind;
+import 'package:analysis_server/src/protocol.dart' hide Element, ElementKind;
 import 'package:analysis_server/src/services/completion/dart_completion_manager.dart';
 import 'package:analyzer/src/generated/element.dart';
 
 /**
  * This class visits elements in a class and provides suggestions based upon
  * the visible members in that class. Clients should call
  * [ClassElementSuggestionBuilder.suggestionsFor].
  */
 class ClassElementSuggestionBuilder extends GeneralizingElementVisitor {
   final DartCompletionRequest request;
@@ skipping 11 matching lines @@
 
   @override
   visitElement(Element element) {
     // ignored
   }
 
   @override
   visitFieldElement(FieldElement element) {
     _addSuggestion(
         element,
-        CompletionSuggestionKind.FIELD,
+        CompletionSuggestionKind.GETTER,
         element.type,
         element.enclosingElement);
   }
 
   @override
   visitMethodElement(MethodElement element) {
     _addSuggestion(
         element,
         CompletionSuggestionKind.METHOD,
         element.returnType,
@@ skipping 30 matching lines @@
       if (elementLibrary != unitLibrary) {
         return;
       }
     }
     String completion = element.displayName;
     if (completion == null ||
         completion.length <= 0 ||
         !_completions.add(completion)) {
       return;
     }
-    var suggestion = new CompletionSuggestion(
+    CompletionSuggestion suggestion = new CompletionSuggestion(
         kind,
         CompletionRelevance.DEFAULT,
         completion,
         completion.length,
         0,
         element.isDeprecated,
         false);
+    suggestion.element = new protocol.Element.fromEngine(element);
+    if (suggestion.element != null) {
+      if (element is FieldElement) {
+        suggestion.element.kind = protocol.ElementKind.GETTER;
+        suggestion.element.returnType =
+            element.type != null ? element.type.displayName : 'dynamic';
+      }
+    }
     if (enclosingElement != null) {
       suggestion.declaringType = enclosingElement.displayName;
     }
     if (type != null) {
       String typeName = type.displayName;
       if (typeName != null && typeName.length > 0 && typeName != 'dynamic') {
         suggestion.returnType = typeName;
       }
     }
     request.suggestions.add(suggestion);
@@ skipping 42 matching lines @@
 
   @override
   visitTopLevelVariableElement(TopLevelVariableElement element) {
     _addSuggestion(element);
   }
 
   void _addSuggestion(Element element) {
     if (element != null) {
       String completion = element.name;
       if (completion != null && completion.length > 0) {
-        request.suggestions.add(
-            new CompletionSuggestion(
-                new CompletionSuggestionKind.fromElementKind(element.kind),
-                CompletionRelevance.DEFAULT,
-                completion,
-                completion.length,
-                0,
-                element.isDeprecated,
-                false));
+        CompletionSuggestion suggestion = new CompletionSuggestion(
+            new CompletionSuggestionKind.fromElementKind(element.kind),
+            CompletionRelevance.DEFAULT,
+            completion,
+            completion.length,
+            0,
+            element.isDeprecated,
+            false);
+
+        suggestion.element = new protocol.Element.fromEngine(element);
+
+        request.suggestions.add(suggestion);
       }
     }
   }
 
   /**
    * 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));
     }
   }
 }