replace request.node with request.target.containingNode in more situations

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.
  */
 class InvocationComputer extends DartCompletionComputer {
   SuggestionBuilder builder;
 
   @override
   bool computeFast(DartCompletionRequest request) {
     OpType optype = request.optype;
     if (optype.includeInvocationSuggestions) {
-      builder = request.node.accept(new _InvocationAstVisitor(request));
+      builder = request.target.containingNode
+          .accept(new _InvocationAstVisitor(request));
       if (builder != null) {
-        return builder.computeFast(request.node);
+        return builder.computeFast(request.target.containingNode);
       }
     }
 
     return true;
   }
 
   @override
   Future<bool> computeFull(DartCompletionRequest request) {
     if (builder != null) {
-      return builder.computeFull(request.node);
+      return builder.computeFull(request.target.containingNode);
     }
     return new Future.value(false);
   }
 }
 
 class _ExpressionSuggestionBuilder implements SuggestionBuilder {
   final DartCompletionRequest request;
 
   _ExpressionSuggestionBuilder(this.request);
 
   @override
   bool computeFast(AstNode node) {
     return false;
   }
 
   @override
   Future<bool> computeFull(AstNode node) {
-    if (node is SimpleIdentifier) {
-      node = node.parent;
-    }
     if (node is MethodInvocation) {
       node = (node as MethodInvocation).realTarget;
     } else if (node is PropertyAccess) {
       node = (node as PropertyAccess).realTarget;
     }
     if (node is Identifier) {
       Element elem = node.bestElement;
       if (elem is ClassElement || elem is PrefixElement) {
         elem.accept(new _PrefixedIdentifierSuggestionBuilder(request));
         return new Future.value(true);
@@ skipping 10 matching lines @@
 /**
  * An [AstNode] vistor for determining which suggestion builder
  * should be used to build invocation/access suggestions.
  */
 class _InvocationAstVisitor extends GeneralizingAstVisitor<SuggestionBuilder> {
   final DartCompletionRequest request;
 
   _InvocationAstVisitor(this.request);
 
   @override
-  visitConstructorName(ConstructorName node) {
+  SuggestionBuilder visitConstructorName(ConstructorName node) {
     // some PrefixedIdentifier nodes are transformed into
     // ConstructorName nodes during the resolution process.
     return new _PrefixedIdentifierSuggestionBuilder(request);
   }
 
   @override
   SuggestionBuilder visitMethodInvocation(MethodInvocation node) {
     return new _ExpressionSuggestionBuilder(request);
   }
 
   @override
   SuggestionBuilder visitNode(AstNode node) {
     return null;
   }
 
   @override
   SuggestionBuilder visitPrefixedIdentifier(PrefixedIdentifier node) {
     // some PrefixedIdentifier nodes are transformed into
     // ConstructorName nodes during the resolution process.
     return new _PrefixedIdentifierSuggestionBuilder(request);
   }
 
   @override
   SuggestionBuilder visitPropertyAccess(PropertyAccess node) {
     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.
@@ skipping 113 matching lines @@
 
   _PrefixedIdentifierSuggestionBuilder(this.request);
 
   @override
   bool computeFast(AstNode node) {
     return false;
   }
 
   @override
   Future<bool> computeFull(AstNode node) {
-    if (node is SimpleIdentifier) {
-      node = node.parent;
-    }
     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;
@@ skipping 75 matching lines @@
     }
     return new Future.value(false);
   }
 
   @override
   Future<bool> visitVariableElement(VariableElement element) {
     InterfaceTypeSuggestionBuilder.suggestionsFor(request, element.type);
     return new Future.value(true);
   }
 }