Remove computation with no effect from local completion computer.

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;
 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/local_declaration_visitor.dart';
 import 'package:analysis_server/src/services/completion/optype.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/scanner.dart';
 
 /**
  * A computer for calculating `completion.getSuggestions` request results
  * for the local library in which the completion is requested.
  */
 class LocalComputer extends DartCompletionComputer {
 
   @override
   bool computeFast(DartCompletionRequest request) {
     OpType optype = request.optype;
     if (optype.includeTopLevelSuggestions) {
-      _LocalVisitor localVisitor = new _LocalVisitor(request, request.offset);
-      localVisitor.typesOnly = optype.includeOnlyTypeNameSuggestions;
-      localVisitor.excludeVoidReturn = !optype.includeVoidReturnSuggestions;
+      _LocalVisitor localVisitor = new _LocalVisitor(
+          request,
+          request.offset,
+          optype.includeOnlyTypeNameSuggestions,
+          !optype.includeVoidReturnSuggestions);
 
       // Collect suggestions from the specific child [AstNode] that contains
       // the completion offset and all of its parents recursively.
       request.node.accept(localVisitor);
     }
 
     // If the unit is not a part and does not reference any parts
     // then work is complete
     return !request.unit.directives.any(
         (Directive directive) =>
@@ skipping 13 matching lines @@
  * that contains the completion offset to the [CompilationUnit].
  */
 class _LocalVisitor extends LocalDeclarationVisitor {
   static const DYNAMIC = 'dynamic';
 
   static final TypeName NO_RETURN_TYPE = new TypeName(
       new SimpleIdentifier(new StringToken(TokenType.IDENTIFIER, '', 0)),
       null);
 
   final DartCompletionRequest request;
-  bool typesOnly = false;
-  bool excludeVoidReturn;
+  final bool typesOnly;
+  final bool excludeVoidReturn;
 
-  _LocalVisitor(this.request, int offset) : super(offset) {
-    excludeVoidReturn = _computeExcludeVoidReturn(request.node);
-  }
+  _LocalVisitor(this.request, int offset, this.typesOnly,
+      this.excludeVoidReturn)
+      : super(offset);
 
   @override
   void declaredClass(ClassDeclaration declaration) {
     bool isDeprecated = _isDeprecated(declaration);
     CompletionSuggestion suggestion =
         _addSuggestion(declaration.name, null, null, isDeprecated);
     if (suggestion != null) {
       suggestion.element = _createElement(
           protocol.ElementKind.CLASS,
           declaration.name,
@@ skipping 19 matching lines @@
           isDeprecated);
     }
   }
 
   @override
   void declaredField(FieldDeclaration fieldDecl, VariableDeclaration varDecl) {
     if (typesOnly) {
       return;
     }
     bool isDeprecated = _isDeprecated(fieldDecl) || _isDeprecated(varDecl);
-    CompletionSuggestion suggestion = _addSuggestion(
-        varDecl.name,
-        null,
-        fieldDecl.parent,
-        isDeprecated);
+    CompletionSuggestion suggestion =
+        _addSuggestion(varDecl.name, null, fieldDecl.parent, isDeprecated);
     if (suggestion != null) {
       suggestion.element = _createElement(
           protocol.ElementKind.FIELD,
           varDecl.name,
           null,
           null,
           false,
           isDeprecated);
     }
   }
@@ skipping 86 matching lines @@
       kind = protocol.ElementKind.SETTER;
       returnType = null;
     } else {
       if (excludeVoidReturn && _isVoid(returnType)) {
         return;
       }
       kind = protocol.ElementKind.METHOD;
       parameters = declaration.parameters.toSource();
     }
     bool isDeprecated = _isDeprecated(declaration);
-    CompletionSuggestion suggestion = _addSuggestion(
-        declaration.name,
-        returnType,
-        declaration.parent,
-        isDeprecated);
+    CompletionSuggestion suggestion =
+        _addSuggestion(declaration.name, returnType, declaration.parent, isDeprecated);
     if (suggestion != null) {
       suggestion.element = _createElement(
           kind,
           declaration.name,
           parameters,
           returnType,
           declaration.isAbstract,
           isDeprecated);
     }
   }
@@ skipping 61 matching lines @@
             }
           }
         }
         request.suggestions.add(suggestion);
         return suggestion;
       }
     }
     return null;
   }
 
-  bool _computeExcludeVoidReturn(AstNode node) {
-    if (node is Block) {
-      return false;
-    } else if (node is SimpleIdentifier) {
-      return node.parent is ExpressionStatement ? false : true;
-    } else {
-      return true;
-    }
-  }
-
 
   /**
    * Create a new protocol Element for inclusion in a completion suggestion.
    */
   protocol.Element _createElement(protocol.ElementKind kind,
       SimpleIdentifier id, String parameters, TypeName returnType, bool isAbstract,
       bool isDeprecated) {
     String name = id.name;
     int flags = protocol.Element.makeFlags(
         isAbstract: isAbstract,
@@ skipping 50 matching lines @@
     if (name == null || name.length <= 0) {
       return DYNAMIC;
     }
     TypeArgumentList typeArgs = type.typeArguments;
     if (typeArgs != null) {
       //TODO (danrubel) include type arguments
     }
     return name;
   }
 }