add code completion declared and return types

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/services/completion/dart_completion_manager.dart';
 import 'package:analyzer/src/generated/element.dart';
 
@@ skipping 16 matching lines @@
     });
   }
 
   @override
   visitElement(Element element) {
     // ignored
   }
 
   @override
   visitFieldElement(FieldElement element) {
-    _addSuggestion(element, CompletionSuggestionKind.FIELD);
+    _addSuggestion(
+        element,
+        CompletionSuggestionKind.FIELD,
+        element.type,
+        element.enclosingElement);
   }
 
   @override
   visitMethodElement(MethodElement element) {
-    _addSuggestion(element, CompletionSuggestionKind.METHOD);
+    _addSuggestion(
+        element,
+        CompletionSuggestionKind.METHOD,
+        element.returnType,
+        element.enclosingElement);
   }
 
   @override
   visitPropertyAccessorElement(PropertyAccessorElement element) {
     if (element.isGetter) {
-      _addSuggestion(element, CompletionSuggestionKind.GETTER);
+      _addSuggestion(
+          element,
+          CompletionSuggestionKind.GETTER,
+          element.returnType,
+          element.enclosingElement);
     } else if (element.isSetter) {
-      _addSuggestion(element, CompletionSuggestionKind.SETTER);
+      _addSuggestion(
+          element,
+          CompletionSuggestionKind.SETTER,
+          element.returnType,
+          element.enclosingElement);
     }
   }
 
-  void _addSuggestion(Element element, CompletionSuggestionKind kind) {
+  void _addSuggestion(Element element, CompletionSuggestionKind kind,
+      DartType type, ClassElement enclosingElement) {
     if (element.isSynthetic) {
       return;
     }
     if (element.isPrivate) {
       LibraryElement elementLibrary =
           element.getAncestor((parent) => parent is LibraryElement);
       LibraryElement unitLibrary =
           request.unit.element.getAncestor((parent) => parent is LibraryElement);
       if (elementLibrary != unitLibrary) {
         return;
       }
     }
     String completion = element.displayName;
     if (completion == null ||
         completion.length <= 0 ||
         !_completions.add(completion)) {
       return;
     }
-    request.suggestions.add(
-        new CompletionSuggestion(
-            kind,
-            CompletionRelevance.DEFAULT,
-            completion,
-            completion.length,
-            0,
-            element.isDeprecated,
-            false));
+    var suggestion = new CompletionSuggestion(
+        kind,
+        CompletionRelevance.DEFAULT,
+        completion,
+        completion.length,
+        0,
+        element.isDeprecated,
+        false);
+    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);
   }
 
   /**
    * Add suggestions for the visible members in the given class
    */
   static void suggestionsFor(DartCompletionRequest request, Element element) {
     if (element is ClassElement) {
       element.accept(new ClassElementSuggestionBuilder(request));
     }
   }
@@ skipping 55 matching lines @@
   /**
    * 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));
     }
   }
 }