move import combinator suggestions into a separate computer

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;
@@ skipping 1050 matching lines @@
       class PB { }''');
     addSource('/testCD.dart', '''
       class C { }
       class D { }''');
     addTestSource('''
       import "/testAB.dart" hide ^;
       import "/testCD.dart";
       class X {}''');
     computeFast();
     return computeFull(true).then((_) {
-      assertSuggestImportedClass(
-          'A',
-          CompletionRelevance.DEFAULT,
-          CompletionSuggestionKind.IDENTIFIER);
-      assertSuggestImportedClass(
-          'B',
-          CompletionRelevance.DEFAULT,
-          CompletionSuggestionKind.IDENTIFIER);
-      assertSuggestImportedClass(
-          'PB',
-          CompletionRelevance.DEFAULT,
-          CompletionSuggestionKind.IDENTIFIER);
-      assertSuggestImportedTopLevelVar(
-          'T1',
-          null,
-          CompletionRelevance.DEFAULT,
-          CompletionSuggestionKind.IDENTIFIER);
-      assertSuggestImportedFunction(
-          'F1',
-          'PB',
-          false,
-          CompletionRelevance.DEFAULT,
-          CompletionSuggestionKind.IDENTIFIER);
-      assertNotSuggested('C');
-      assertNotSuggested('D');
-      assertNotSuggested('X');
-      assertNotSuggested('Object');
+      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((_) {
-      assertSuggestImportedClass(
-          'A',
-          CompletionRelevance.DEFAULT,
-          CompletionSuggestionKind.IDENTIFIER);
-      assertSuggestImportedClass(
-          'B',
-          CompletionRelevance.DEFAULT,
-          CompletionSuggestionKind.IDENTIFIER);
-      assertSuggestImportedClass(
-          'PB',
-          CompletionRelevance.DEFAULT,
-          CompletionSuggestionKind.IDENTIFIER);
-      assertSuggestImportedTopLevelVar(
-          'T1',
-          null,
-          CompletionRelevance.DEFAULT,
-          CompletionSuggestionKind.IDENTIFIER);
-      assertSuggestImportedFunction(
-          'F1',
-          'PB',
-          false,
-          CompletionRelevance.DEFAULT,
-          CompletionSuggestionKind.IDENTIFIER);
-      assertSuggestImportedClass(
-          'Clz',
-          CompletionRelevance.DEFAULT,
-          CompletionSuggestionKind.IDENTIFIER);
-      assertSuggestImportedFunctionTypeAlias(
-          'F2',
-          null,
-          false,
-          CompletionRelevance.DEFAULT,
-          CompletionSuggestionKind.IDENTIFIER);
-      assertNotSuggested('C');
-      assertNotSuggested('D');
-      assertNotSuggested('X');
-      assertNotSuggested('Object');
+      assertNoSuggestions();
     });
   }
 
   test_ConstructorName_importedClass() {
     // SimpleIdentifier  PrefixedIdentifier  TypeName  ConstructorName
     // InstanceCreationExpression
     addSource('/testB.dart', '''
       lib B;
       int T1;
       F1() { }
@@ skipping 111 matching lines @@
   test_ForEachStatement_body_untyped() {
     // Block  ForEachStatement
     addTestSource('main(args) {for (foo in bar) {^}}');
     computeFast();
     return computeFull(true).then((_) {
       assertSuggestLocalVariable('foo', null);
       assertSuggestImportedClass('Object');
     });
   }
 
+  test_FormalParameterList() {
+    // FormalParameterList MethodDeclaration
+    addTestSource('''
+      foo() { }
+      void bar() { }
+      class A {a(^) { }}''');
+    computeFast();
+    return computeFull(true).then((_) {
+      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((_) {
       assertSuggestLocalVariable('i', 'int');
       assertSuggestImportedClass('Object');
     });
   }
 
@@ skipping 292 matching lines @@
     return computeFull(true).then((_) {
       assertSuggestLocalFunction('foo', null);
       assertSuggestLocalFunction('bar', 'void');
       assertSuggestLocalMethod('a', 'A', 'Z');
       assertSuggestParameter('x', 'X');
       assertSuggestParameter('y', 'int');
       assertSuggestImportedClass('String');
     });
   }
 
-  test_FormalParameterList() {
-    // FormalParameterList MethodDeclaration
-    addTestSource('''
-      foo() { }
-      void bar() { }
-      class A {a(^) { }}''');
-    computeFast();
-    return computeFull(true).then((_) {
-      assertSuggestLocalFunction('foo', null);
-      assertSuggestLocalMethod('a', 'A', null);
-      assertSuggestLocalClass('A');
-      assertSuggestImportedClass('String');
-      assertSuggestImportedFunction('identical', 'bool');
-      assertNotSuggested('bar');
-    });
-  }
-
   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);}
@@ skipping 316 matching lines @@
       assertNotSuggested('bar2');
       assertNotSuggested('_B');
       assertSuggestLocalClass('Y');
       assertSuggestLocalClass('C');
       assertSuggestLocalVariable('f', null);
       assertNotSuggested('x');
       assertNotSuggested('e');
     });
   }
 }