Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(776)

Unified Diff: pkg/analysis_server/lib/src/services/completion/local_computer.dart

Issue 830153004: Remove computation with no effect from local completion computer. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analysis_server/lib/src/services/completion/local_computer.dart
diff --git a/pkg/analysis_server/lib/src/services/completion/local_computer.dart b/pkg/analysis_server/lib/src/services/completion/local_computer.dart
index f140ff59e39ce42f8ede743d38d532460c39d681..89f8a40d6964b792452a75898106212c3611fedf 100644
--- a/pkg/analysis_server/lib/src/services/completion/local_computer.dart
+++ b/pkg/analysis_server/lib/src/services/completion/local_computer.dart
@@ -25,9 +25,11 @@ class LocalComputer extends DartCompletionComputer {
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.
@@ -61,12 +63,12 @@ class _LocalVisitor extends LocalDeclarationVisitor {
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) {
@@ -106,11 +108,8 @@ class _LocalVisitor extends LocalDeclarationVisitor {
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,
@@ -217,11 +216,8 @@ class _LocalVisitor extends LocalDeclarationVisitor {
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,
@@ -303,16 +299,6 @@ class _LocalVisitor extends LocalDeclarationVisitor {
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.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698