narrow imported element suggestions

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.dart' as protocol show Element, ElementKind;
+import 'package:analysis_server/src/protocol.dart' as protocol show Element,
+    ElementKind;
 import 'package:analysis_server/src/protocol.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';
 
 /**
  * A computer for calculating imported class and top level variable
  * `completion.getSuggestions` request results.
@@ skipping 18 matching lines @@
 /**
  * A visitor for determining which imported class and top level variable
  * should be suggested and building those suggestions.
  */
 class _ImportedVisitor extends GeneralizingAstVisitor<Future<bool>> {
   final DartCompletionRequest request;
 
   _ImportedVisitor(this.request);
 
   @override
-  Future<bool> visitCombinator(Combinator node) {
-    NamespaceDirective directive =
-        node.getAncestor((parent) => parent is NamespaceDirective);
-    if (directive != null) {
+  Future<bool> visitBlock(Block node) {
+    return _addImportedElementSuggestions();
+  }
+
+  @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) {
+      return _addImportedElementSuggestions();
+    }
+    return new Future.value(false);
+  }
+
+  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);
   }
 
-  @override
-  Future<bool> visitExpressionStatement(ExpressionStatement node) {
-    Expression expression = node.expression;
-    if (expression is SimpleIdentifier) {
-      if (expression.end < request.offset) {
-        // Don't suggest imported elements for local var name
-        return new Future.value(false);
-      }
-    }
-    return visitNode(node);
-  }
-
-  @override
-  Future<bool> visitNode(AstNode node) {
-    return _addImportedElements();
-  }
-
-  @override
-  Future<bool> visitSimpleIdentifier(SimpleIdentifier node) {
-    return node.parent.accept(this);
-  }
-
-  @override
-  Future<bool> visitVariableDeclaration(VariableDeclaration node) {
-    // Do not add suggestions if editing the name in a var declaration
-    SimpleIdentifier name = node.name;
-    if (name == null ||
-        name.offset < request.offset ||
-        request.offset > name.end) {
-      return visitNode(node);
-    }
-    return new Future.value(false);
-  }
-
-  Future<bool> _addImportedElements() {
+  Future<bool> _addImportedElementSuggestions() {
     var future = request.searchEngine.searchTopLevelDeclarations('');
     return future.then((List<SearchMatch> matches) {
 
       Set<LibraryElement> visibleLibs = new Set<LibraryElement>();
       Set<LibraryElement> excludedLibs = new Set<LibraryElement>();
 
       Map<LibraryElement, Set<String>> showNames =
           new Map<LibraryElement, Set<String>>();
       Map<LibraryElement, Set<String>> hideNames =
           new Map<LibraryElement, Set<String>>();
@@ skipping 75 matching lines @@
 
               request.suggestions.add(suggestion);
             }
           }
         }
       });
       return true;
     });
   }
 }