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

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 'dart:collection';
 
 import 'package:analysis_server/src/protocol_server.dart'
@@ skipping 21 matching lines @@
     OpType optype = request.optype;
     if (optype.includeReturnValueSuggestions ||
         optype.includeTypeNameSuggestions ||
         optype.includeVoidReturnSuggestions ||
         optype.includeConstructorSuggestions) {
       builder = new _ImportedSuggestionBuilder(request, optype);
       builder.shouldWaitForLowPrioritySuggestions =
           shouldWaitForLowPrioritySuggestions;
       // If target is an argument in an argument list
       // then suggestions may need to be adjusted
-      suggestionsComputed = builder.computeFast(request.node);
+      suggestionsComputed = builder.computeFast(request.target.containingNode);
       return suggestionsComputed && request.target.argIndex == null;
     }
     return true;
   }
 
   @override
-  Future<bool> computeFull(DartCompletionRequest request) {
+  Future<bool> computeFull(DartCompletionRequest request) async {
     if (builder != null) {
       if (!suggestionsComputed) {
-        return builder.computeFull(request.node).then((bool result) {
-          _updateSuggestions(request);
-          return result;
-        });
+        bool result = await builder.computeFull(request.target.containingNode);
+        _updateSuggestions(request);
+        return result;
       }
       _updateSuggestions(request);
-      return new Future.value(true);
+      return true;
     }
-    return new Future.value(false);
+    return false;
   }
 
   /**
    * If target is a function argument, suggest identifiers not invocations
    */
   void _updateSuggestions(DartCompletionRequest request) {
     if (request.target.isFunctionalArgument()) {
       request.convertInvocationsToIdentifiers();
     }
   }
@@ skipping 80 matching lines @@
         if (elem is ExecutableElement) {
           DartType returnType = elem.returnType;
           if (returnType != null && returnType.isVoid) {
             if (!optype.includeVoidReturnSuggestions) {
               return;
             }
           }
         }
       }
       addSuggestion(elem, relevance: relevance);
-    };
+    }
+    ;
   }
 
   /**
    * Add suggestions which start with the given text.
    */
   _addFilteredSuggestions(
       String filterText, List<CompletionSuggestion> unfiltered) {
     //TODO (danrubel) Revisit this filtering once paged API has been added
     unfiltered.forEach((CompletionSuggestion suggestion) {
       if (filterText.length > 0) {
@@ skipping 81 matching lines @@
       _addFilteredSuggestions(filterText, cache.libraryPrefixSuggestions);
     }
     if (optype.includeReturnValueSuggestions) {
       _addFilteredSuggestions(filterText, cache.otherImportedSuggestions);
     }
     if (optype.includeVoidReturnSuggestions) {
       _addFilteredSuggestions(filterText, cache.importedVoidReturnSuggestions);
     }
   }
 }