fix invocation completion with trailing stmt

pkg/analysis_server/lib/src/services/completion/invocation_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.invocation;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/services/completion/dart_completion_manager.dart';
+import 'package:analysis_server/src/services/completion/local_declaration_visitor.dart';
 import 'package:analysis_server/src/services/completion/optype.dart';
 import 'package:analysis_server/src/services/completion/suggestion_builder.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 
 import '../../protocol_server.dart' show CompletionSuggestionKind;
 
 /**
  * A computer for calculating invocation / access suggestions
  * `completion.getSuggestions` request results.
@@ skipping 94 matching lines @@
     return new _ExpressionSuggestionBuilder(request);
   }
 
   @override
   SuggestionBuilder visitSimpleIdentifier(SimpleIdentifier node) {
     return node.parent.accept(this);
   }
 }
 
 /**
+ * An [AstVisitor] which looks for a declaration with the given name
+ * and if found, tries to determine a type for that declaration.
+ */
+class _LocalBestTypeVisitor extends LocalDeclarationVisitor {
+
+  /**
+   * The name for the declaration to be found.
+   */
+  final String targetName;
+
+  /**
+   * The best type for the found declaration,
+   * or `null` if no declaration found or failed to determine a type.
+   */
+  DartType typeFound;
+
+  /**
+   * Construct a new instance to search for a declaration
+   */
+  _LocalBestTypeVisitor(this.targetName, int offset) : super(offset);
+
+  @override
+  void declaredClass(ClassDeclaration declaration) {
+    if (declaration.name.name == targetName) {
+      finished = true;
+      // no type
+    }
+  }
+
+  @override
+  void declaredClassTypeAlias(ClassTypeAlias declaration) {
+    if (declaration.name.name == targetName) {
+      finished = true;
+      // no type
+    }
+  }
+
+  @override
+  void declaredField(FieldDeclaration fieldDecl, VariableDeclaration varDecl) {
+    if (varDecl.name.name == targetName) {
+      finished = true;
+      // Type provided by the element in computeFull above
+    }
+  }
+
+  @override
+  void declaredFunction(FunctionDeclaration declaration) {
+    if (declaration.name.name == targetName) {
+      finished = true;
+      TypeName typeName = declaration.returnType;
+      if (typeName != null) {
+        typeFound = typeName.type;
+      }
+    }
+  }
+
+  @override
+  void declaredFunctionTypeAlias(FunctionTypeAlias declaration) {
+    if (declaration.name.name == targetName) {
+      finished = true;
+      TypeName typeName = declaration.returnType;
+      if (typeName != null) {
+        typeFound = typeName.type;
+      }
+    }
+  }
+
+  @override
+  void declaredLabel(Label label, bool isCaseLabel) {
+    if (label.label.name == targetName) {
+      finished = true;
+      // no type
+    }
+  }
+
+  @override
+  void declaredLocalVar(SimpleIdentifier name, TypeName type) {
+    if (name.name == targetName) {
+      finished = true;
+      typeFound = name.bestType;
+    }
+  }
+
+  @override
+  void declaredMethod(MethodDeclaration declaration) {
+    if (declaration.name.name == targetName) {
+      finished = true;
+      TypeName typeName = declaration.returnType;
+      if (typeName != null) {
+        typeFound = typeName.type;
+      }
+    }
+  }
+
+  @override
+  void declaredParam(SimpleIdentifier name, TypeName type) {
+    if (name.name == targetName) {
+      finished = true;
+      // Type provided by the element in computeFull above
+    }
+  }
+
+  @override
+  void declaredTopLevelVar(VariableDeclarationList varList,
+      VariableDeclaration varDecl) {
+    if (varDecl.name.name == targetName) {
+      finished = true;
+      // Type provided by the element in computeFull above
+    }
+  }
+}
+
+/**
  * An [Element] visitor for determining the appropriate invocation/access
  * suggestions based upon the element for which the completion is requested.
  */
 class _PrefixedIdentifierSuggestionBuilder extends
     GeneralizingElementVisitor<Future<bool>> implements SuggestionBuilder {
 
   final DartCompletionRequest request;
 
   _PrefixedIdentifierSuggestionBuilder(this.request);
 
@@ skipping 10 matching lines @@
     if (node is ConstructorName) {
       // some PrefixedIdentifier nodes are transformed into
       // ConstructorName nodes during the resolution process.
       return new NamedConstructorSuggestionBuilder(request).computeFull(node);
     }
     if (node is PrefixedIdentifier) {
       SimpleIdentifier prefix = node.prefix;
       if (prefix != null) {
         Element element = prefix.bestElement;
         DartType type = prefix.bestType;
-        if (element is! ClassElement && type != null && !type.isDynamic) {
-          InterfaceTypeSuggestionBuilder.suggestionsFor(
-              request,
-              type);
-          return new Future.value(true);
-        } else if (element != null) {
+        if (element is! ClassElement) {
+          if (type == null || type.isDynamic) {
+            //
+            // Given `g. int y = 0;`, the parser interprets `g` as a prefixed
+            // identifier with no type.
+            // If the user is requesting completions for `g`,
+            // then check for a function, getter, or similar with a type.
+            //
+            _LocalBestTypeVisitor visitor =
+                new _LocalBestTypeVisitor(prefix.name, request.offset);
+            prefix.accept(visitor);
+            type = visitor.typeFound;
+          }
+          if (type != null && !type.isDynamic) {
+            InterfaceTypeSuggestionBuilder.suggestionsFor(request, type);
+            return new Future.value(true);
+          }
+        }
+        if (element != null) {
           return element.accept(this);
         }
       }
     }
     return new Future.value(false);
   }
 
   @override
   Future<bool> visitClassElement(ClassElement element) {
     if (element != null) {
@@ skipping 11 matching lines @@
   Future<bool> visitElement(Element element) {
     return new Future.value(false);
   }
 
   @override
   Future<bool> visitPrefixElement(PrefixElement element) {
     //TODO (danrubel) reimplement to use prefixElement.importedLibraries
     // once that accessor is implemented and available in Dart
     bool modified = false;
     // Find the import directive with the given prefix
-    request.unit.directives.forEach((Directive directive) {
+    for (Directive directive in request.unit.directives) {
       if (directive is ImportDirective) {
         if (directive.prefix != null) {
           if (directive.prefix.name == element.name) {
             // Suggest elements from the imported library
             LibraryElement library = directive.uriElement;
             LibraryElementSuggestionBuilder.suggestionsFor(
                 request,
                 CompletionSuggestionKind.INVOCATION,
                 library);
             modified = true;
           }
         }
       }
-    });
+    };
     return new Future.value(modified);
   }
 
   @override
   Future<bool> visitPropertyAccessorElement(PropertyAccessorElement element) {
     if (element != null) {
       PropertyInducingElement elemVar = element.variable;
       if (elemVar != null) {
         InterfaceTypeSuggestionBuilder.suggestionsFor(request, elemVar.type);
       }
       return new Future.value(true);
     }
     return new Future.value(false);
   }
 
   @override
   Future<bool> visitVariableElement(VariableElement element) {
     InterfaceTypeSuggestionBuilder.suggestionsFor(request, element.type);
     return new Future.value(true);
   }
 }