cascade target fix and common test

pkg/analysis_server/lib/src/services/completion/imported_computer.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.computer.dart.toplevel;
 
 import 'dart:async';
 
-import 'package:analysis_server/src/protocol_server.dart' hide Element, ElementKind;
+import 'package:analysis_server/src/protocol_server.dart' hide Element,
+    ElementKind;
 import 'package:analysis_server/src/services/completion/dart_completion_manager.dart';
 import 'package:analysis_server/src/services/completion/suggestion_builder.dart';
 import 'package:analysis_server/src/services/search/search_engine.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/resolver.dart';
 import 'package:analyzer/src/generated/source.dart';
 
 /**
  * A computer for calculating imported class and top level variable
@@ skipping 24 matching lines @@
   final DartCompletionRequest request;
 
   _ImportedVisitor(this.request);
 
   @override
   Future<bool> visitBlock(Block node) {
     return _addImportedElementSuggestions();
   }
 
   @override
+  Future<bool> visitCombinator(Combinator node) {
+    return _addCombinatorSuggestions(node);
+  }
+
+  @override
+  Future<bool> visitExpressionStatement(ExpressionStatement node) {
+    Expression expression = node.expression;
+    // A pre-variable declaration (e.g. C ^) is parsed as an expression
+    // statement. Do not make suggestions for the variable name.

[scheglov, 2014/10/07 18:15:45]

Actually it would be nice to propose variable names based on the type name.

For example for SimpleIdentifier: simpleIdentifier and identifier.

+    if (expression is SimpleIdentifier && request.offset <= expression.end) {
+      return _addImportedElementSuggestions();
+    }
+    return new Future.value(false);
+  }
+
+  @override
   Future<bool> visitNode(AstNode node) {
     return new Future.value(false);
   }
 
   @override
-  Future<bool> visitSimpleIdentifier(SimpleIdentifier node) {
-    AstNode parent = node.parent;
-    if (parent is Combinator) {
-      return _addCombinatorSuggestions(parent);
-    }
-    if (parent is ExpressionStatement) {
+  Future<bool> visitPrefixedIdentifier(PrefixedIdentifier node) {
+    // Make suggestions for the prefix, but not for the selector
+    // InvocationComputer makes selector suggestions
+    if (request.offset <= node.prefix.end) {
       return _addImportedElementSuggestions();
     }
-    if (parent is PrefixedIdentifier) {
-      if (request.offset <= parent.prefix.end) {
-        return _addImportedElementSuggestions();
-      }
+    return new Future.value(false);
+  }
+
+  @override
+  Future<bool> visitCascadeExpression(CascadeExpression node) {
+    // Make suggestions for the target, but not for the selector
+    // InvocationComputer makes selector suggestions
+    Expression target = node.target;
+    if (target != null && request.offset <= target.end) {
+      return _addImportedElementSuggestions();
     }
     return new Future.value(false);
   }
 
+  @override
+  Future<bool> visitSimpleIdentifier(SimpleIdentifier node) {
+    return node.parent.accept(this);
+  }
+
   Future _addCombinatorSuggestions(Combinator node) {
     var directive = node.getAncestor((parent) => parent is NamespaceDirective);
     if (directive is NamespaceDirective) {
       LibraryElement library = directive.uriElement;
       LibraryElementSuggestionBuilder.suggestionsFor(request, library);
       return new Future.value(true);
     }
 
     return new Future.value(false);
   }
 
+  void _addElementSuggestion(Element element, CompletionRelevance relevance) {
+    CompletionSuggestionKind kind =
+        newCompletionSuggestionKind_fromElementKind(element.kind);
+
+    String completion = element.displayName;
+    CompletionSuggestion suggestion = new CompletionSuggestion(
+        kind,
+        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;
+      }
+    }
+
+    request.suggestions.add(suggestion);
+  }
+
   Future<bool> _addImportedElementSuggestions() {
 
     // Exclude elements from local library
     // because they are provided by LocalComputer
     Set<LibraryElement> excludedLibs = new Set<LibraryElement>();
     excludedLibs.add(request.unit.element.enclosingElement);
 
     // Include explicitly imported elements
     request.unit.directives.forEach((Directive directive) {
       if (directive is ImportDirective) {
@@ skipping 38 matching lines @@
               !excludedLibs.contains(element.library) &&
               !completionSet.contains(element.displayName)) {
             _addElementSuggestion(element, CompletionRelevance.LOW);
           }
         }
       });
       return true;
     });
   }
 
-  void _addElementSuggestion(Element element, CompletionRelevance relevance) {
-    CompletionSuggestionKind kind =
-        newCompletionSuggestionKind_fromElementKind(element.kind);
-
-    String completion = element.displayName;
-    CompletionSuggestion suggestion = new CompletionSuggestion(
-        kind,
-        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;
-      }
-    }
-
-    request.suggestions.add(suggestion);
-  }
-
   void _addLibraryPrefixSuggestion(ImportElement importElem) {
     String completion = importElem.prefix.displayName;
     if (completion != null && completion.length > 0) {
       CompletionSuggestion suggestion = new CompletionSuggestion(
           CompletionSuggestionKind.LIBRARY_PREFIX,
           CompletionRelevance.DEFAULT,
           completion,
           completion.length,
           0,
           importElem.isDeprecated,
           false);
       LibraryElement lib = importElem.importedLibrary;
       if (lib != null) {
         suggestion.element = newElement_fromEngine(lib);
       }
       request.suggestions.add(suggestion);
     }
   }
 }