cache import suggestions

pkg/analysis_server/test/services/completion/completion_test_util.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 test.services.completion.util;
 
 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/imported_computer.dart';
 import 'package:analysis_server/src/services/completion/invocation_computer.dart';
 import 'package:analysis_server/src/services/completion/local_computer.dart';
 import 'package:analysis_server/src/services/index/index.dart';
 import 'package:analysis_server/src/services/index/local_memory_index.dart';
 import 'package:analysis_server/src/services/search/search_engine_internal.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:unittest/unittest.dart';
 
 import '../../abstract_context.dart';
 
-class AbstractCompletionTest extends AbstractContextTest {
+abstract class AbstractCompletionTest extends AbstractContextTest {
   Index index;
   SearchEngineImpl searchEngine;
   DartCompletionComputer computer;
   String testFile = '/completionTest.dart';
   Source testSource;
   CompilationUnit testUnit;
   int completionOffset;
   AstNode completionNode;
   bool _computeFastCalled = false;
   DartCompletionRequest request;
+  DartCompletionCache cache;
 
   void addResolvedUnit(String file, String code) {
     Source source = addSource(file, code);
     CompilationUnit unit = resolveLibraryUnit(source);
     index.indexUnit(context, unit);
   }
 
   void addTestSource(String content) {
     expect(completionOffset, isNull, reason: 'Call addTestUnit exactly once');
     completionOffset = content.indexOf('^');
     expect(completionOffset, isNot(equals(-1)), reason: 'missing ^');
     int nextOffset = content.indexOf('^', completionOffset + 1);
     expect(nextOffset, equals(-1), reason: 'too many ^');
     content = content.substring(0, completionOffset) +
         content.substring(completionOffset + 1);
     testSource = addSource(testFile, content);
-    request =
-        new DartCompletionRequest(context, searchEngine, testSource, completionOffset);
+    cache = new DartCompletionCache(context, testSource);
+    request = new DartCompletionRequest(
+        context,
+        searchEngine,
+        testSource,
+        completionOffset,
+        cache);
   }
 
   void assertNoSuggestions({CompletionSuggestionKind kind: null}) {
     if (kind == null) {
       if (request.suggestions.length > 0) {
         failedCompletion('Expected no suggestions', request.suggestions);
       }
       return;
     }
     CompletionSuggestion suggestion = request.suggestions.firstWhere(
@@ skipping 336 matching lines @@
   bool computeFast() {
     _computeFastCalled = true;
     testUnit = context.parseCompilationUnit(testSource);
     completionNode =
         new NodeLocator.con1(completionOffset).searchWithin(testUnit);
     request.unit = testUnit;
     request.node = completionNode;
     return computer.computeFast(request);
   }
 
-  Future<bool> computeFull([bool fullAnalysis = false]) {
+  Future computeFull(assertFunction(bool result), {bool fullAnalysis: true}) {
     if (!_computeFastCalled) {
       expect(computeFast(), isFalse);
     }
 
     // Index SDK
     for (Source librarySource in context.librarySources) {
       CompilationUnit unit =
           context.getResolvedCompilationUnit2(librarySource, librarySource);
       if (unit != null) {
         index.indexUnit(context, unit);
@@ skipping 26 matching lines @@
             break;
           }
         }
       }
 
       result = context.performAnalysisTask();
     }
     if (!resolved) {
       fail('expected unit to be resolved');
     }
-    return computer.computeFull(request);
+    return computer.computeFull(request).then(assertFunction);
   }
 
   void failedCompletion(String message,
       [Iterable<CompletionSuggestion> completions]) {
     StringBuffer sb = new StringBuffer(message);
     if (completions != null) {
       sb.write('\n  found');
       completions.toList()
           ..sort((CompletionSuggestion s1, CompletionSuggestion s2) {
             String c1 = s1.completion.toLowerCase();
@@ skipping 40 matching lines @@
       }
     });
     return cs;
   }
 
   @override
   void setUp() {
     super.setUp();
     index = createLocalMemoryIndex();
     searchEngine = new SearchEngineImpl(index);
+    setUpComputer();
   }
+
+  void setUpComputer();
 }
 
 /**
  * Common tests for `ImportedTypeComputerTest`, `InvocationComputerTest`,
  * and `LocalComputerTest`.
  */
-class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
+abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
+
+  /**
+   * Assert that the ImportedComputer uses cached results to produce identical
+   * suggestions to the original set of suggestions.
+   */
+  void assertCachedCompute(_) {
+    // Subclasses override
+  }
 
   CompletionSuggestion assertLocalSuggestMethod(String name,
       String declaringType, String returnType, [CompletionRelevance relevance =
       CompletionRelevance.DEFAULT]) {
     if (computer is LocalComputer) {
       return assertSuggestMethod(name, declaringType, returnType, relevance);
     } else {
       return assertNotSuggested(name);
     }
   }
@@ skipping 186 matching lines @@
   CompletionSuggestion assertSuggestLocalTopLevelVar(String name,
       String returnType, [CompletionRelevance relevance =
       CompletionRelevance.DEFAULT]) {
     if (computer is LocalComputer) {
       return assertSuggestTopLevelVar(name, returnType, relevance);
     } else {
       return assertNotSuggested(name);
     }
   }
 
+  Future computeFull(assertFunction(bool result), {bool fullAnalysis: true}) {
+    return super.computeFull(
+        assertFunction,
+        fullAnalysis: fullAnalysis).then(assertCachedCompute);
+  }
+
   test_ArgumentList() {
     // ArgumentList  MethodInvocation  ExpressionStatement  Block
     addSource('/libA.dart', '''
       library A;
       bool hasLength(int expected) { }
       void baz() { }''');
     addTestSource('''
-      import '/libA.dart'
+      import '/libA.dart';
       class B { }
       String bar() => true;
       void main() {expect(^)}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertNoSuggestions(kind: CompletionSuggestionKind.ARGUMENT_LIST);
       assertSuggestLocalFunction('bar', 'String');
       assertSuggestImportedFunction('hasLength', 'bool');
       assertSuggestImportedFunction('identical', 'bool');
       assertSuggestLocalClass('B');
       assertSuggestImportedClass('Object');
       assertNotSuggested('main');
       assertNotSuggested('baz');
       assertNotSuggested('print');
     });
   }
 
   test_ArgumentList_imported_function() {
     // ArgumentList  MethodInvocation  ExpressionStatement  Block
     addSource('/libA.dart', '''
       library A;
       bool hasLength(int expected) { }
       expect(arg) { }
       void baz() { }''');
     addTestSource('''
       import '/libA.dart'
       class B { }
       String bar() => true;
       void main() {expect(^)}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertNoSuggestions(kind: CompletionSuggestionKind.ARGUMENT_LIST);
       assertSuggestLocalFunction('bar', 'String');
       assertSuggestImportedFunction('hasLength', 'bool');
       assertSuggestImportedFunction('identical', 'bool');
       assertSuggestLocalClass('B');
       assertSuggestImportedClass('Object');
       assertNotSuggested('main');
       assertNotSuggested('baz');
       assertNotSuggested('print');
     });
   }
 
   test_ArgumentList_local_function() {
     // ArgumentList  MethodInvocation  ExpressionStatement  Block
     addSource('/libA.dart', '''
       library A;
       bool hasLength(int expected) { }
       void baz() { }''');
     addTestSource('''
       import '/libA.dart'
       expect(arg) { }
       class B { }
       String bar() => true;
       void main() {expect(^)}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertNoSuggestions(kind: CompletionSuggestionKind.ARGUMENT_LIST);
       assertSuggestLocalFunction('bar', 'String');
       assertSuggestImportedFunction('hasLength', 'bool');
       assertSuggestImportedFunction('identical', 'bool');
       assertSuggestLocalClass('B');
       assertSuggestImportedClass('Object');
       assertNotSuggested('main');
       assertNotSuggested('baz');
       assertNotSuggested('print');
     });
   }
 
   test_ArgumentList_local_method() {
     // ArgumentList  MethodInvocation  ExpressionStatement  Block
     addSource('/libA.dart', '''
       library A;
       bool hasLength(int expected) { }
       void baz() { }''');
     addTestSource('''
       import '/libA.dart'
       class B {
         expect(arg) { }
         void foo() {expect(^)}}
       String bar() => true;''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertNoSuggestions(kind: CompletionSuggestionKind.ARGUMENT_LIST);
       assertSuggestLocalFunction('bar', 'String');
       assertSuggestImportedFunction('hasLength', 'bool');
       assertSuggestImportedFunction('identical', 'bool');
       assertSuggestLocalClass('B');
       assertSuggestImportedClass('Object');
       assertNotSuggested('main');
       assertNotSuggested('baz');
       assertNotSuggested('print');
     });
   }
 
   test_ArgumentList_namedParam() {
     // SimpleIdentifier  NamedExpression  ArgumentList  MethodInvocation
     // ExpressionStatement
     addSource('/libA.dart', '''
       library A;
       bool hasLength(int expected) { }''');
     addTestSource('''
       import '/libA.dart'
       String bar() => true;
       void main() {expect(foo: ^)}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestLocalFunction('bar', 'String');
       assertSuggestImportedFunction('hasLength', 'bool');
       assertNotSuggested('main');
     });
   }
 
   test_AssignmentExpression_name() {
     // SimpleIdentifier  VariableDeclaration  VariableDeclarationList
     // VariableDeclarationStatement  Block
     addTestSource('class A {} main() {int a; int ^b = 1;}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertNoSuggestions();
     });
   }
 
   test_AssignmentExpression_RHS() {
     // SimpleIdentifier  VariableDeclaration  VariableDeclarationList
     // VariableDeclarationStatement  Block
     addTestSource('class A {} main() {int a; int b = ^}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestLocalVariable('a', 'int');
       assertSuggestLocalFunction('main', null);
       assertSuggestLocalClass('A');
       assertSuggestImportedClass('Object');
     });
   }
 
   test_AssignmentExpression_type() {
     // SimpleIdentifier  TypeName  VariableDeclarationList
     // VariableDeclarationStatement  Block
     addTestSource('class A {} main() {int a; int^ b = 1;}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestLocalClass('A');
       assertSuggestImportedClass('int');
       assertNotSuggested('a');
       assertNotSuggested('main');
     });
   }
 
   test_AwaitExpression() {
     // SimpleIdentifier  AwaitExpression  ExpressionStatement
     addTestSource('''
       class A {int x; int y() => 0;}
       main(){A a; await ^}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestLocalVariable('a', 'A');
       assertSuggestLocalFunction('main', null);
       assertSuggestLocalClass('A');
       assertSuggestImportedClass('Object');
     });
   }
 
   test_BinaryExpression_LHS() {
     // SimpleIdentifier  BinaryExpression  VariableDeclaration
     // VariableDeclarationList  VariableDeclarationStatement
     addTestSource('main() {int a = 1, b = ^ + 2;}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestLocalVariable('a', 'int');
       assertSuggestImportedClass('Object');
       assertNotSuggested('b');
     });
   }
 
   test_BinaryExpression_RHS() {
     // SimpleIdentifier  BinaryExpression  VariableDeclaration
     // VariableDeclarationList  VariableDeclarationStatement
     addTestSource('main() {int a = 1, b = 2 + ^;}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestLocalVariable('a', 'int');
       assertSuggestImportedClass('Object');
       assertNotSuggested('b');
       assertNotSuggested('==');
     });
   }
 
   test_Block() {
     // Block  BlockFunctionBody  MethodDeclaration
     addSource('/testAB.dart', '''
@@ skipping 18 matching lines @@
       import "/testAB.dart";
       import "/testCD.dart" hide D;
       import "/testEEF.dart" show EE;
       import "/testG.dart" as g;
       int T5;
       var _T6;
       Z D2() {int x;}
       class X {a() {var f; {var x;} ^ var r;} void b() { }}
       class Z { }''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
 
       assertSuggestLocalClass('X');
       assertSuggestLocalClass('Z');
       assertLocalSuggestMethod('a', 'X', null);
       assertLocalSuggestMethod('b', 'X', 'void');
       assertSuggestLocalVariable('f', null);
       // Don't suggest locals out of scope
       assertNotSuggested('r');
       assertNotSuggested('x');
 
@@ skipping 34 matching lines @@
     addSource('/testB.dart', '''
       lib B;
       class F { var f1; f2() { } }
       class E extends F { var e1; e2() { } }
       class I { int i1; i2() { } }
       class M { var m1; int m2() { } }''');
     addTestSource('''
       import "/testB.dart";
       class A extends E implements I with M {a() {^}}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestImportedGetter('e1', null);
       assertSuggestImportedGetter('f1', null);
       assertSuggestImportedGetter('i1', 'int');
       assertSuggestImportedGetter('m1', null);
       //TODO (danrubel) include declared type in suggestion
       assertSuggestImportedMethod('e2', null, null);
       assertSuggestImportedMethod('f2', null, null);
       assertSuggestImportedMethod('i2', null, null);
       //assertSuggestImportedMethod('m2', null, null);
       assertNotSuggested('==');
     });
   }
 
   test_Block_inherited_local() {
     // Block  BlockFunctionBody  MethodDeclaration  ClassDeclaration
     addTestSource('''
       class F { var f1; f2() { } }
       class E extends F { var e1; e2() { } }
       class I { int i1; i2() { } }
       class M { var m1; int m2() { } }
       class A extends E implements I with M {a() {^}}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestLocalGetter('e1', null);
       assertSuggestLocalGetter('f1', null);
       assertSuggestLocalGetter('i1', 'int');
       assertSuggestLocalGetter('m1', null);
       assertSuggestLocalMethod('e2', 'E', null);
       assertSuggestLocalMethod('f2', 'F', null);
       assertSuggestLocalMethod('i2', 'I', null);
       assertSuggestLocalMethod('m2', 'M', 'int');
     });
   }
 
   test_CascadeExpression_selector1() {
     // PropertyAccess  CascadeExpression  ExpressionStatement  Block
     addSource('/testB.dart', '''
       class B { }''');
     addTestSource('''
       import "/testB.dart";
       class A {var b; X _c;}
       class X{}
       // looks like a cascade to the parser
       // but the user is trying to get completions for a non-cascade
       main() {A a; a.^.z}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestInvocationGetter('b', null);
       assertSuggestInvocationGetter('_c', 'X');
       assertNotSuggested('Object');
       assertNotSuggested('A');
       assertNotSuggested('B');
       assertNotSuggested('X');
       assertNotSuggested('z');
       assertNotSuggested('==');
     });
   }
 
   test_CascadeExpression_selector2() {
     // SimpleIdentifier  PropertyAccess  CascadeExpression  ExpressionStatement
     addSource('/testB.dart', '''
       class B { }''');
     addTestSource('''
       import "/testB.dart";
       class A {var b; X _c;}
       class X{}
       main() {A a; a..^z}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestInvocationGetter('b', null);
       assertSuggestInvocationGetter('_c', 'X');
       assertNotSuggested('Object');
       assertNotSuggested('A');
       assertNotSuggested('B');
       assertNotSuggested('X');
       assertNotSuggested('z');
       assertNotSuggested('==');
     });
   }
 
   test_CascadeExpression_selector2_withTrailingReturn() {
     // PropertyAccess  CascadeExpression  ExpressionStatement  Block
     addSource('/testB.dart', '''
       class B { }''');
     addTestSource('''
       import "/testB.dart";
       class A {var b; X _c;}
       class X{}
       main() {A a; a..^ return}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestInvocationGetter('b', null);
       assertSuggestInvocationGetter('_c', 'X');
       assertNotSuggested('Object');
       assertNotSuggested('A');
       assertNotSuggested('B');
       assertNotSuggested('X');
       assertNotSuggested('z');
       assertNotSuggested('==');
     });
   }
 
   test_CascadeExpression_target() {
     // SimpleIdentifier  CascadeExpression  ExpressionStatement
     addTestSource('''
       class A {var b; X _c;}
       class X{}
       main() {A a; a^..b}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertNotSuggested('b');
       assertNotSuggested('_c');
       assertSuggestLocalVariable('a', 'A');
       assertSuggestLocalClass('A');
       assertSuggestLocalClass('X');
       assertSuggestImportedClass('Object');
       assertNotSuggested('==');
     });
   }
 
   test_CatchClause_typed() {
     // Block  CatchClause  TryStatement
     addTestSource('class A {a() {try{var x;} on E catch (e) {^}}}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestParameter('e', 'E');
       assertSuggestLocalMethod('a', 'A', null);
       assertSuggestImportedClass('Object');
       assertNotSuggested('x');
     });
   }
 
   test_CatchClause_untyped() {
     // Block  CatchClause  TryStatement
     addTestSource('class A {a() {try{var x;} catch (e, s) {^}}}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestParameter('e', null);
       assertSuggestParameter('s', 'StackTrace');
       assertSuggestLocalMethod('a', 'A', null);
       assertSuggestImportedClass('Object');
       assertNotSuggested('x');
     });
   }
 
   test_ClassDeclaration_body() {
     // ClassDeclaration  CompilationUnit
     addSource('/testB.dart', '''
       class B { }''');
     addTestSource('''
       import "testB.dart" as x;
       @deprecated class A {^}
       class _B {}
       A T;''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       CompletionSuggestion suggestionA =
           assertSuggestLocalClass('A', CompletionRelevance.LOW);
       if (suggestionA != null) {
         expect(suggestionA.element.isDeprecated, isTrue);
         expect(suggestionA.element.isPrivate, isFalse);
       }
       CompletionSuggestion suggestionB = assertSuggestLocalClass('_B');
       if (suggestionB != null) {
         expect(suggestionB.element.isDeprecated, isFalse);
         expect(suggestionB.element.isPrivate, isTrue);
@@ skipping 21 matching lines @@
       PB F1() => new PB();
       class PB { }''');
     addSource('/testCD.dart', '''
       class C { }
       class D { }''');
     addTestSource('''
       import "/testAB.dart" hide ^;
       import "/testCD.dart";
       class X {}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertNoSuggestions();
     });
   }
 
   test_Combinator_show() {
     // SimpleIdentifier  HideCombinator  ImportDirective
     addSource('/testAB.dart', '''
       library libAB;
       part '/partAB.dart';
       class A { }
       class B { }''');
     addSource('/partAB.dart', '''
       part of libAB;
       var T1;
       PB F1() => new PB();
       typedef PB2 F2(int blat);
       class Clz = Object with Object;
       class PB { }''');
     addSource('/testCD.dart', '''
       class C { }
       class D { }''');
     addTestSource('''
       import "/testAB.dart" show ^;
       import "/testCD.dart";
       class X {}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertNoSuggestions();
     });
   }
 
   test_ConstructorName_importedClass() {
     // SimpleIdentifier  PrefixedIdentifier  TypeName  ConstructorName
     // InstanceCreationExpression
     addSource('/testB.dart', '''
       lib B;
       int T1;
       F1() { }
       class X {X.c(); X._d(); z() {}}''');
     addTestSource('''
       import "/testB.dart";
       var m;
       main() {new X.^}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestNamedConstructor('c', 'X');
       assertNotSuggested('F1');
       assertNotSuggested('T1');
       assertNotSuggested('_d');
       assertNotSuggested('z');
       assertNotSuggested('m');
     });
   }
 
   test_ConstructorName_localClass() {
     // SimpleIdentifier  PrefixedIdentifier  TypeName  ConstructorName
     // InstanceCreationExpression
     addTestSource('''
       int T1;
       F1() { }
       class X {X.c(); X._d(); z() {}}
       main() {new X.^}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestNamedConstructor('c', 'X');
       assertSuggestNamedConstructor('_d', 'X');
       assertNotSuggested('F1');
       assertNotSuggested('T1');
       assertNotSuggested('z');
       assertNotSuggested('m');
     });
   }
 
   test_ExpressionStatement_identifier() {
     // SimpleIdentifier  ExpressionStatement  Block
     addSource('/testA.dart', '''
       _B F1() { }
       class A {int x;}
       class _B { }''');
     addTestSource('''
       import "/testA.dart";
       typedef int F2(int blat);
       class Clz = Object with Object;
       class C {foo(){O^} void bar() {}}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestImportedClass('A');
       assertSuggestImportedFunction('F1', '_B', false);
       assertSuggestLocalClass('C');
       assertSuggestLocalMethod('foo', 'C', null);
       assertSuggestLocalMethod('bar', 'C', 'void');
       assertSuggestLocalFunctionTypeAlias('F2', 'int');
       assertSuggestLocalClassTypeAlias('Clz');
       assertSuggestLocalClass('C');
       assertNotSuggested('x');
       assertNotSuggested('_B');
     });
   }
 
   test_ExpressionStatement_name() {
     // ExpressionStatement  Block  BlockFunctionBody  MethodDeclaration
     addSource('/testA.dart', '''
       B T1;
       class B{}''');
     addTestSource('''
       import "/testA.dart";
       class C {a() {C ^}}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertNoSuggestions();
     });
   }
 
   test_FieldDeclaration_name_typed() {
     // SimpleIdentifier  VariableDeclaration  VariableDeclarationList
     // FieldDeclaration
     addSource('/testA.dart', 'class A { }');
     addTestSource('''
       import "/testA.dart";
       class C {A ^}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertNoSuggestions();
     });
   }
 
   test_FieldDeclaration_name_var() {
     // SimpleIdentifier  VariableDeclaration  VariableDeclarationList
     // FieldDeclaration
     addSource('/testA.dart', 'class A { }');
     addTestSource('''
       import "/testA.dart";
       class C {var ^}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertNoSuggestions();
     });
   }
 
   test_ForEachStatement_body_typed() {
     // Block  ForEachStatement
     addTestSource('main(args) {for (int foo in bar) {^}}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestLocalVariable('foo', 'int');
       assertSuggestImportedClass('Object');
     });
   }
 
   test_ForEachStatement_body_untyped() {
     // Block  ForEachStatement
     addTestSource('main(args) {for (foo in bar) {^}}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestLocalVariable('foo', null);
       assertSuggestImportedClass('Object');
     });
   }
 
   test_FormalParameterList() {
     // FormalParameterList MethodDeclaration
     addTestSource('''
       foo() { }
       void bar() { }
       class A {a(^) { }}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestLocalFunction('foo', null);
       assertSuggestLocalMethod('a', 'A', null);
       assertSuggestLocalClass('A');
       assertSuggestImportedClass('String');
       assertSuggestImportedFunction('identical', 'bool');
       assertNotSuggested('bar');
     });
   }
 
   test_ForStatement_body() {
     // Block  ForStatement
     addTestSource('main(args) {for (int i; i < 10; ++i) {^}}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestLocalVariable('i', 'int');
       assertSuggestImportedClass('Object');
     });
   }
 
   test_ForStatement_condition() {
     // SimpleIdentifier  ForStatement
     addTestSource('main() {for (int index = 0; i^)}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestLocalVariable('index', 'int');
     });
   }
 
   test_ForStatement_initializer() {
     // SimpleIdentifier  ForStatement
     addTestSource('main() {List a; for (^)}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestLocalVariable('a', 'List');
       assertSuggestImportedClass('Object');
       assertSuggestImportedClass('int');
     });
   }
 
   test_ForStatement_updaters() {
     // SimpleIdentifier  ForStatement
     addTestSource('main() {for (int index = 0; index < 10; i^)}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestLocalVariable('index', 'int');
     });
   }
 
   test_ForStatement_updaters_prefix_expression() {
     // SimpleIdentifier  PrefixExpression  ForStatement
     addTestSource('''
       void bar() { }
       main() {for (int index = 0; index < 10; ++i^)}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestLocalVariable('index', 'int');
       assertSuggestLocalFunction('main', null);
       assertNotSuggested('bar');
     });
   }
 
   test_FunctionExpression_body_function() {
     // Block  BlockFunctionBody  FunctionExpression
     addTestSource('''
       void bar() { }
       String foo(List args) {x.then((R b) {^});}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       var f = assertSuggestLocalFunction('foo', 'String', false);
       if (f != null) {
         expect(f.element.isPrivate, isFalse);
       }
       assertSuggestLocalFunction('bar', 'void');
       assertSuggestParameter('args', 'List');
       assertSuggestParameter('b', 'R');
       assertSuggestImportedClass('Object');
     });
   }
 
   test_IfStatement_condition() {
     // SimpleIdentifier  IfStatement  Block  BlockFunctionBody
     addTestSource('''
       class A {int x; int y() => 0;}
       main(){var a; if (^)}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestLocalVariable('a', null);
       assertSuggestLocalFunction('main', null);
       assertSuggestLocalClass('A');
       assertSuggestImportedClass('Object');
     });
   }
 
   test_ImportDirective_dart() {
     // SimpleStringLiteral  ImportDirective
     addTestSource('''
       import "dart^";
       main() {}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertNoSuggestions();
     });
   }
 
   test_InstanceCreationExpression_imported() {
     // SimpleIdentifier  TypeName  ConstructorName  InstanceCreationExpression
     addSource('/testA.dart', '''
       int T1;
       F1() { }
       class A {int x;}''');
     addTestSource('''
       import "/testA.dart";
       int T2;
       F2() { }
       class B {int x;}
       class C {foo(){var f; {var x;} new ^}}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestImportedClass('Object');
       assertSuggestImportedClass('A');
       assertSuggestLocalClass('B');
       assertSuggestLocalClass('C');
       assertNotSuggested('f');
       assertNotSuggested('x');
       assertNotSuggested('foo');
       assertNotSuggested('F1');
       assertNotSuggested('F2');
       assertNotSuggested('T1');
       assertNotSuggested('T2');
     });
   }
 
   test_InterpolationExpression() {
     // SimpleIdentifier  InterpolationExpression  StringInterpolation
     addTestSource('main() {String name; print("hello \$^");}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestLocalVariable('name', 'String');
       assertSuggestImportedClass('Object');
     });
   }
 
   test_InterpolationExpression_block() {
     // SimpleIdentifier  InterpolationExpression  StringInterpolation
     addTestSource('main() {String name; print("hello \${n^}");}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestLocalVariable('name', 'String');
       assertSuggestImportedClass('Object');
     });
   }
 
   test_InterpolationExpression_prefix_selector() {
     // SimpleIdentifier  PrefixedIdentifier  InterpolationExpression
     addTestSource('main() {String name; print("hello \${name.^}");}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestInvocationGetter('length', 'int');
       assertNotSuggested('name');
       assertNotSuggested('Object');
       assertNotSuggested('==');
     });
   }
 
   test_InterpolationExpression_prefix_target() {
     // SimpleIdentifier  PrefixedIdentifier  InterpolationExpression
     addTestSource('main() {String name; print("hello \${nam^e.length}");}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestLocalVariable('name', 'String');
       assertSuggestImportedClass('Object');
       assertNotSuggested('length');
     });
   }
 
   test_IsExpression() {
     // SimpleIdentifier  TypeName  IsExpression  IfStatement
     addSource('/testB.dart', '''
       lib B;
       foo() { }
       class X {X.c(); X._d(); z() {}}''');
     addTestSource('''
       import "/testB.dart";
       class Y {Y.c(); Y._d(); z() {}}
       main() {var x; if (x is ^) { }}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestImportedClass('X');
       assertSuggestLocalClass('Y');
       assertNotSuggested('x');
       assertNotSuggested('main');
       assertNotSuggested('foo');
     });
   }
 
   test_IsExpression_target() {
     // IfStatement  Block  BlockFunctionBody
     addTestSource('''
       foo() { }
       void bar() { }
       class A {int x; int y() => 0;}
       main(){var a; if (^ is A)}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestLocalVariable('a', null);
       assertSuggestLocalFunction('main', null);
       assertSuggestLocalFunction('foo', null);
       assertNotSuggested('bar');
       assertSuggestLocalClass('A');
       assertSuggestImportedClass('Object');
     });
   }
 
   test_IsExpression_type() {
     // SimpleIdentifier  TypeName  IsExpression  IfStatement
     addTestSource('''
       class A {int x; int y() => 0;}
       main(){var a; if (a is ^)}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertNotSuggested('a');
       assertNotSuggested('main');
       assertSuggestLocalClass('A');
       assertSuggestImportedClass('Object');
     });
   }
 
   test_Literal_string() {
     // SimpleStringLiteral  ExpressionStatement  Block
     addTestSource('class A {a() {"hel^lo"}}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertNoSuggestions();
     });
   }
 
   test_MethodDeclaration_body_getters() {
     // Block  BlockFunctionBody  MethodDeclaration
     addTestSource('class A {@deprecated X get f => 0; Z a() {^} get _g => 1;}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       CompletionSuggestion methodA = assertSuggestLocalMethod('a', 'A', 'Z');
       if (methodA != null) {
         expect(methodA.element.isDeprecated, isFalse);
         expect(methodA.element.isPrivate, isFalse);
       }
       CompletionSuggestion getterF =
           assertSuggestLocalGetter('f', 'X', CompletionRelevance.LOW);
       if (getterF != null) {
         expect(getterF.element.isDeprecated, isTrue);
         expect(getterF.element.isPrivate, isFalse);
       }
       CompletionSuggestion getterG = assertSuggestLocalGetter('_g', null);
       if (getterG != null) {
         expect(getterG.element.isDeprecated, isFalse);
         expect(getterG.element.isPrivate, isTrue);
       }
     });
   }
 
   test_MethodDeclaration_members() {
     // Block  BlockFunctionBody  MethodDeclaration
     addTestSource('class A {@deprecated X f; Z _a() {^} var _g;}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       CompletionSuggestion methodA = assertSuggestLocalMethod('_a', 'A', 'Z');
       if (methodA != null) {
         expect(methodA.element.isDeprecated, isFalse);
         expect(methodA.element.isPrivate, isTrue);
       }
       CompletionSuggestion getterF =
           assertSuggestLocalGetter('f', 'X', CompletionRelevance.LOW);
       if (getterF != null) {
         expect(getterF.element.isDeprecated, isTrue);
         expect(getterF.element.isPrivate, isFalse);
       }
       CompletionSuggestion getterG = assertSuggestLocalGetter('_g', null);
       if (getterG != null) {
         expect(getterG.element.isDeprecated, isFalse);
         expect(getterG.element.isPrivate, isTrue);
       }
       assertSuggestImportedClass('bool');
     });
   }
 
   test_MethodDeclaration_parameters_named() {
     // Block  BlockFunctionBody  MethodDeclaration
     addTestSource('class A {@deprecated Z a(X x, _, b, {y: boo}) {^}}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       CompletionSuggestion methodA =
           assertSuggestLocalMethod('a', 'A', 'Z', CompletionRelevance.LOW);
       if (methodA != null) {
         expect(methodA.element.isDeprecated, isTrue);
         expect(methodA.element.isPrivate, isFalse);
       }
       assertSuggestParameter('x', 'X');
       assertSuggestParameter('y', null);
       assertSuggestParameter('b', null);
       assertSuggestImportedClass('int');
       assertNotSuggested('_');
     });
   }
 
   test_MethodDeclaration_parameters_positional() {
     // Block  BlockFunctionBody  MethodDeclaration
     addTestSource('''
       foo() { }
       void bar() { }
       class A {Z a(X x, [int y=1]) {^}}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestLocalFunction('foo', null);
       assertSuggestLocalFunction('bar', 'void');
       assertSuggestLocalMethod('a', 'A', 'Z');
       assertSuggestParameter('x', 'X');
       assertSuggestParameter('y', 'int');
       assertSuggestImportedClass('String');
     });
   }
 
   test_MethodInvocation_no_semicolon() {
     // MethodInvocation  ExpressionStatement  Block
     addTestSource('''
       main() { }
       class I {X get f => new A();get _g => new A();}
       class A implements I {
         var b; X _c;
         X get d => new A();get _e => new A();
         // no semicolon between completion point and next statement
         set s1(I x) {} set _s2(I x) {x.^ m(null);}
         m(X x) {} I _n(X x) {}}
       class X{}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestInvocationGetter('f', 'X');
       assertSuggestInvocationGetter('_g', null);
       assertNotSuggested('b');
       assertNotSuggested('_c');
       assertNotSuggested('d');
       assertNotSuggested('_e');
       assertNotSuggested('s1');
       assertNotSuggested('_s2');
       assertNotSuggested('m');
       assertNotSuggested('_n');
@@ skipping 20 matching lines @@
         set s1(I x) {} set _s2(I x) {}
         m(X x) {} I _n(X x) {}}
       class X{}''');
     addTestSource('''
       import "/testB.dart";
       class A extends B {
         static const String scA = 'foo';
         w() { }}
       main() {A.^}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestInvocationGetter('scA', 'String');
       assertSuggestInvocationGetter('scB', 'int');
       assertSuggestInvocationGetter('scI', null);
       assertNotSuggested('b');
       assertNotSuggested('_c');
       assertNotSuggested('d');
       assertNotSuggested('_e');
       assertNotSuggested('f');
       assertNotSuggested('_g');
       assertNotSuggested('s1');
@@ skipping 18 matching lines @@
         static const int sc = 12;
         @deprecated var b; X _c;
         X get d => new A();get _e => new A();
         set s1(I x) {} set _s2(I x) {}
         m(X x) {} I _n(X x) {}}
       class X{}''');
     addTestSource('''
       import "/testB.dart";
       main() {A a; a.^}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestInvocationGetter('sc', 'int');
       assertSuggestInvocationGetter('b', null, isDeprecated: true);
       assertNotSuggested('_c');
       assertSuggestInvocationGetter('d', 'X');
       assertNotSuggested('_e');
       assertSuggestInvocationGetter('f', 'X');
       assertNotSuggested('_g');
       assertSuggestInvocationSetter('s1');
       assertNotSuggested('_s2');
       assertSuggestInvocationMethod('m', 'A', null);
@@ skipping 12 matching lines @@
       main() {A a; a.^}
       class I {X get f => new A();get _g => new A();}
       class A implements I {
         static const int sc = 12;
         var b; X _c;
         X get d => new A();get _e => new A();
         set s1(I x) {} set _s2(I x) {}
         m(X x) {} I _n(X x) {}}
       class X{}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestInvocationGetter('sc', 'int');
       assertSuggestInvocationGetter('b', null);
       assertSuggestInvocationGetter('_c', 'X');
       assertSuggestInvocationGetter('d', 'X');
       assertSuggestInvocationGetter('_e', null);
       assertSuggestInvocationGetter('f', 'X');
       assertSuggestInvocationGetter('_g', null);
       assertSuggestInvocationSetter('s1');
       assertSuggestInvocationSetter('_s2');
       assertSuggestInvocationMethod('m', 'A', null);
@@ skipping 12 matching lines @@
       lib B;
       var T1;
       class X { }
       class Y { }''');
     addTestSource('''
       import "/testB.dart" as b;
       var T2;
       class A { }
       main() {b.^}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestInvocationClass('X');
       assertSuggestInvocationClass('Y');
       assertSuggestInvocationTopLevelVar('T1', null);
       assertNotSuggested('T2');
       assertNotSuggested('Object');
       assertNotSuggested('b');
       assertNotSuggested('A');
       assertNotSuggested('==');
     });
   }
 
   test_PrefixedIdentifier_parameter() {
     // SimpleIdentifier  PrefixedIdentifier  ExpressionStatement
     addSource('/testB.dart', '''
       lib B;
       class _W {M y; var _z;}
       class X extends _W {}
       class M{}''');
     addTestSource('''
       import "/testB.dart";
       foo(X x) {x.^}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestInvocationGetter('y', 'M');
       assertNotSuggested('_z');
       assertNotSuggested('==');
     });
   }
 
   test_PrefixedIdentifier_prefix() {
     // SimpleIdentifier  PrefixedIdentifier  ExpressionStatement
     addSource('/testA.dart', '''
       class A {static int bar = 10;}
       _B() {}''');
     addTestSource('''
       import "/testA.dart";
       class X {foo(){A^.bar}}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestImportedClass('A');
       assertSuggestLocalClass('X');
       assertSuggestLocalMethod('foo', 'X', null);
       assertNotSuggested('bar');
       assertNotSuggested('_B');
     });
   }
 
   test_PrefixedIdentifier_propertyAccess() {
     // PrefixedIdentifier  ExpressionStatement  Block  BlockFunctionBody
     addTestSource('class A {String x; int get foo {x.^}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestInvocationGetter('isEmpty', 'bool');
       assertSuggestInvocationMethod('compareTo', 'Comparable', 'int');
     });
   }
 
   test_PropertyAccess_expression() {
     // SimpleIdentifier  MethodInvocation  PropertyAccess  ExpressionStatement
     addTestSource('class A {a() {"hello".to^String().length}}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestInvocationGetter('length', 'int');
       assertNotSuggested('A');
       assertNotSuggested('a');
       assertNotSuggested('Object');
       assertNotSuggested('==');
     });
   }
 
   test_PropertyAccess_selector() {
     // SimpleIdentifier  PropertyAccess  ExpressionStatement  Block
     addTestSource('class A {a() {"hello".length.^}}');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestInvocationGetter('isEven', 'bool');
       assertNotSuggested('A');
       assertNotSuggested('a');
       assertNotSuggested('Object');
       assertNotSuggested('==');
     });
   }
 
   test_TopLevelVariableDeclaration_typed_name() {
     // SimpleIdentifier  VariableDeclaration  VariableDeclarationList
     // TopLevelVariableDeclaration
     addTestSource('class A {} B ^');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertNoSuggestions();
     });
   }
 
   test_TopLevelVariableDeclaration_untyped_name() {
     // SimpleIdentifier  VariableDeclaration  VariableDeclarationList
     // TopLevelVariableDeclaration
     addTestSource('class A {} var ^');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertNoSuggestions();
     });
   }
 
   test_VariableDeclaration_name() {
     // SimpleIdentifier  VariableDeclaration  VariableDeclarationList
     // VariableDeclarationStatement  Block
     addSource('/testB.dart', '''
       lib B;
       foo() { }
       class _B { }
       class X {X.c(); X._d(); z() {}}''');
     addTestSource('''
       import "/testB.dart";
       class Y {Y.c(); Y._d(); z() {}}
       main() {var ^}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertNoSuggestions();
     });
   }
 
   test_VariableDeclarationStatement_RHS() {
     // SimpleIdentifier  VariableDeclaration  VariableDeclarationList
     // VariableDeclarationStatement
     addSource('/testB.dart', '''
       lib B;
       foo() { }
       class _B { }
       class X {X.c(); X._d(); z() {}}''');
     addTestSource('''
       import "/testB.dart";
       class Y {Y.c(); Y._d(); z() {}}
       class C {bar(){var f; {var x;} var e = ^}}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestImportedClass('X');
       assertNotSuggested('_B');
       assertSuggestLocalClass('Y');
       assertSuggestLocalClass('C');
       assertSuggestLocalVariable('f', null);
       assertNotSuggested('x');
       assertNotSuggested('e');
     });
   }
 
   test_VariableDeclarationStatement_RHS_missing_semicolon() {
     // VariableDeclaration  VariableDeclarationList
     // VariableDeclarationStatement
     addSource('/testB.dart', '''
       lib B;
       foo1() { }
       void bar1() { }
       class _B { }
       class X {X.c(); X._d(); z() {}}''');
     addTestSource('''
       import "/testB.dart";
       foo2() { }
       void bar2() { }
       class Y {Y.c(); Y._d(); z() {}}
       class C {bar(){var f; {var x;} var e = ^ var g}}''');
     computeFast();
-    return computeFull(true).then((_) {
+    return computeFull((bool result) {
       assertSuggestImportedClass('X');
       assertSuggestImportedFunction('foo1', null);
       assertNotSuggested('bar1');
       assertSuggestLocalFunction('foo2', null);
       assertNotSuggested('bar2');
       assertNotSuggested('_B');
       assertSuggestLocalClass('Y');
       assertSuggestLocalClass('C');
       assertSuggestLocalVariable('f', null);
       assertNotSuggested('x');
       assertNotSuggested('e');
     });
   }
 }