exclude identifier being completed from list of suggestions

pkg/analysis_server/lib/src/services/completion/local_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.local;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/protocol.dart' as protocol
     show Element, ElementKind;
@@ skipping 411 matching lines @@
 }
 
 /**
  * A visitor for collecting suggestions from the most specific child [AstNode]
  * that contains the completion offset to the [CompilationUnit].
  */
 class _LocalVisitor extends LocalDeclarationVisitor {
   final DartCompletionRequest request;
   final OpType optype;
 
+  /**
+   * The simple identifier that is being completed, or `null` if none.
+   */
+  SimpleIdentifier targetId;
+
   _LocalVisitor(this.request, int offset, this.optype) : super(offset);
 
   @override
   void declaredClass(ClassDeclaration declaration) {
     if (optype.includeTypeNameSuggestions) {
       bool isDeprecated = _isDeprecated(declaration);
       CompletionSuggestion suggestion = _addSuggestion(declaration.name,
           _NO_RETURN_TYPE, isDeprecated, DART_RELEVANCE_DEFAULT);
       if (suggestion != null) {
         suggestion.element = _createElement(
@@ skipping 177 matching lines @@
       CompletionSuggestion suggestion = _addSuggestion(varDecl.name,
           varList.type, isDeprecated, DART_RELEVANCE_LOCAL_TOP_LEVEL_VARIABLE);
       if (suggestion != null) {
         suggestion.element = _createElement(
             protocol.ElementKind.TOP_LEVEL_VARIABLE, varDecl.name,
             returnType: varList.type, isDeprecated: isDeprecated);
       }
     }
   }
 
+  @override
+  void visitSimpleIdentifier(SimpleIdentifier node) {
+    // Record the visited identifier so as not to suggest it
+    targetId = node;
+    return super.visitSimpleIdentifier(node);
+  }
+
   void _addParameterInfo(
       CompletionSuggestion suggestion, FormalParameterList parameters) {
     var paramList = parameters.parameters;
     suggestion.parameterNames = paramList
         .map((FormalParameter param) => param.identifier.name)
         .toList();
     suggestion.parameterTypes = paramList.map((FormalParameter param) {
       TypeName type = null;
       if (param is DefaultFormalParameter) {
         NormalFormalParameter child = param.parameter;
@@ skipping 18 matching lines @@
       return typeId.name;
     }).toList();
     suggestion.requiredParameterCount = paramList.where(
         (FormalParameter param) => param is! DefaultFormalParameter).length;
     suggestion.hasNamedParameters = paramList
         .any((FormalParameter param) => param.kind == ParameterKind.NAMED);
   }
 
   CompletionSuggestion _addSuggestion(SimpleIdentifier id, TypeName returnType,
       bool isDeprecated, int defaultRelevance, {ClassDeclaration classDecl}) {
-    if (id != null) {
+    if (id != null && !identical(id, targetId)) {
       String completion = id.name;
       if (completion != null && completion.length > 0 && completion != '_') {
         CompletionSuggestion suggestion = new CompletionSuggestion(
             CompletionSuggestionKind.INVOCATION,
             isDeprecated ? DART_RELEVANCE_LOW : defaultRelevance, completion,
             completion.length, 0, isDeprecated, false,
             returnType: _nameForType(returnType));
         if (classDecl != null) {
           SimpleIdentifier identifier = classDecl.name;
           if (identifier != null) {
@@ skipping 13 matching lines @@
   bool _isVoid(TypeName returnType) {
     if (returnType != null) {
       Identifier id = returnType.name;
       if (id != null && id.name == 'void') {
         return true;
       }
     }
     return false;
   }
 }