update suggestion element return type to have type param

pkg/analysis_server/lib/src/protocol_server.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 protocol.server;
 
 import 'package:analysis_server/src/protocol.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart'
     as engine;
 import 'package:analyzer/src/generated/ast.dart' as engine;
@@ skipping 29 matching lines @@
 /**
  * Adds [edit] to the [FileEdit] for the given [source].
  */
 void doSourceChange_addSourceEdit(SourceChange change,
     engine.AnalysisContext context, engine.Source source, SourceEdit edit) {
   String file = source.fullName;
   int fileStamp = context.getModificationStamp(source);
   change.addEdit(file, fileStamp, edit);
 }
 
+String getReturnTypeString(engine.Element element) {
+  if (element is engine.ExecutableElement) {
+    if (element.kind == engine.ElementKind.SETTER) {
+      return null;
+    } else {
+      return element.returnType.toString();

[Brian Wilkerson, 2015/08/04 04:40:13]

Shouldn't this (and line 61) be 'displayName' rather than 'toString()' (after
checking for 'null')?

[danrubel, 2015/08/05 05:08:24]

displayName does not include the type parameters, but perhaps there is an
accessor that does so that I have missed?

[Brian Wilkerson, 2015/08/05 13:19:18]

If not, then we need to add one. toString() is strictly for debugging and should
never be displayed to the user.

+    }
+  } else if (element is engine.VariableElement) {
+    engine.DartType type = element.type;
+    return type != null ? type.displayName : 'dynamic';
+  } else if (element is engine.FunctionTypeAliasElement) {
+    return element.returnType.toString();
+  } else {
+    return null;
+  }
+}
+
 /**
  * Construct based on error information from the analyzer engine.
  */
 AnalysisError newAnalysisError_fromEngine(
     engine.LineInfo lineInfo, engine.AnalysisError error) {
   engine.ErrorCode errorCode = error.errorCode;
   // prepare location
   Location location;
   {
     String file = error.source.fullName;
@@ skipping 19 matching lines @@
       correction: correction);
 }
 
 /**
  * Construct based on a value from the analyzer engine.
  */
 Element newElement_fromEngine(engine.Element element) {
   String name = element.displayName;
   String elementTypeParameters = _getTypeParametersString(element);
   String elementParameters = _getParametersString(element);
-  String elementReturnType = _getReturnTypeString(element);
+  String elementReturnType = getReturnTypeString(element);
   ElementKind kind = newElementKind_fromEngineElement(element);
   return new Element(kind, name, Element.makeFlags(
           isPrivate: element.isPrivate,
           isDeprecated: element.isDeprecated,
           isAbstract: _isAbstract(element),
           isConst: _isConst(element),
           isFinal: _isFinal(element),
           isStatic: _isStatic(element)),
       location: newLocation_fromElement(element),
       typeParameters: elementTypeParameters,
       parameters: elementParameters,
       returnType: elementReturnType);
 }
 
 /**
  * Construct based on a value from the analyzer engine.
- * This does not take into account that 
+ * This does not take into account that
  * instances of ClassElement can be an enum and
  * instances of FieldElement can be an enum constant.
  * Use [newElementKind_fromEngineElement] where possible.
  */
 ElementKind newElementKind_fromEngine(engine.ElementKind kind) {
   if (kind == engine.ElementKind.CLASS) {
     return ElementKind.CLASS;
   }
   if (kind == engine.ElementKind.COMPILATION_UNIT) {
     return ElementKind.COMPILATION_UNIT;
@@ skipping 227 matching lines @@
         sb.write('[');
         closeOptionalString = ']';
       }
     }
     sb.write(parameter.toString());
   }
   sb.write(closeOptionalString);
   return '(' + sb.toString() + ')';
 }
 
-String _getReturnTypeString(engine.Element element) {
-  if (element is engine.ExecutableElement) {
-    if (element.kind == engine.ElementKind.SETTER) {
-      return null;
-    } else {
-      return element.returnType.toString();
-    }
-  } else if (element is engine.VariableElement) {
-    engine.DartType type = element.type;
-    return type != null ? type.displayName : 'dynamic';
-  } else if (element is engine.FunctionTypeAliasElement) {
-    return element.returnType.toString();
-  } else {
-    return null;
-  }
-}
-
 String _getTypeParametersString(engine.Element element) {
   List<engine.TypeParameterElement> typeParameters;
   if (element is engine.ClassElement) {
     typeParameters = element.typeParameters;
   } else if (element is engine.FunctionTypeAliasElement) {
     typeParameters = element.typeParameters;
   }
   if (typeParameters == null || typeParameters.isEmpty) {
     return null;
   }
@@ skipping 56 matching lines @@
     if (lineInfo != null) {
       engine.LineInfo_Location offsetLocation =
           lineInfo.getLocation(range.offset);
       startLine = offsetLocation.lineNumber;
       startColumn = offsetLocation.columnNumber;
     }
   }
   return new Location(
       source.fullName, range.offset, range.length, startLine, startColumn);
 }