refactor import caching to exclude suggestions for inherited members

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 'dart:async';
 
 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';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 
 /**
+ * Create a suggestion based upon the given imported element.
+ */
+CompletionSuggestion createElementSuggestion(Element element,
+    {CompletionRelevance relevance: CompletionRelevance.DEFAULT}) {
+  String completion = element.displayName;
+  CompletionSuggestion suggestion = new CompletionSuggestion(
+      CompletionSuggestionKind.INVOCATION,
+      element.isDeprecated ? CompletionRelevance.LOW : relevance,
+      completion,
+      completion.length,
+      0,
+      element.isDeprecated,
+      false);
+
+  suggestion.element = newElement_fromEngine(element);
+
+  DartType type;
+  if (element is FunctionElement) {
+    type = element.returnType;
+  } else if (element is PropertyAccessorElement && element.isGetter) {
+    type = element.returnType;
+  } else if (element is TopLevelVariableElement) {
+    type = element.type;
+  }
+  if (type != null) {
+    String name = type.displayName;
+    if (name != null && name.length > 0 && name != 'dynamic') {
+      suggestion.returnType = name;
+    }
+  }
+  return suggestion;
+}
+
+/**
  * Call the given function with each non-null non-empty inherited type name
  * that is defined in the given class.
  */
 visitInheritedTypeNames(ClassDeclaration node, void inherited(String name)) {
 
   void visit(TypeName type) {
     if (type != null) {
       Identifier id = type.name;
       if (id != null) {
         String name = id.name;
@@ skipping 22 matching lines @@
     NodeList<TypeName> mixinTypes = withClause.mixinTypes;
     if (mixinTypes != null) {
       mixinTypes.forEach((TypeName type) {
         visit(type);
       });
     }
   }
 }
 
 /**
- * Call the given functions with each non-null non-empty inherited class
- * declaration, if the class is defined locally, or type name if it is not
- * defined locally.
+ * Starting with the given class node, traverse the inheritence hierarchy
+ * calling the given functions with each non-null non-empty inherited class
+ * declaration. For each locally defined class declaration, call [local].
+ * For each class identifier in the hierarchy that is not defined locally,
+ * call the [imported] function.
  */
 void visitInheritedTypes(ClassDeclaration node, void
     local(ClassDeclaration classNode), void imported(String typeName)) {
   CompilationUnit unit = node.getAncestor((p) => p is CompilationUnit);
   List<ClassDeclaration> todo = new List<ClassDeclaration>();
   todo.add(node);
   Set<String> visited = new Set<String>();
   while (todo.length > 0) {
     node = todo.removeLast();
     visitInheritedTypeNames(node, (String name) {
@@ skipping 268 matching lines @@
     }
     if (type != null) {
       String typeName = type.displayName;
       if (typeName != null && typeName.length > 0 && typeName != 'dynamic') {
         suggestion.returnType = typeName;
       }
     }
     request.suggestions.add(suggestion);
   }
 }