combinator suggestion fix and more common tests

pkg/analysis_server/test/services/completion/imported_computer_test.dart

Index: pkg/analysis_server/test/services/completion/imported_computer_test.dart
diff --git a/pkg/analysis_server/test/services/completion/imported_computer_test.dart b/pkg/analysis_server/test/services/completion/imported_computer_test.dart
index 0c258f03f371d76e2458e1b96561385e2a880c3f..abd53364ecb67bbf58666f4fea8ec0bd02a6ac4a 100644
--- a/pkg/analysis_server/test/services/completion/imported_computer_test.dart
+++ b/pkg/analysis_server/test/services/completion/imported_computer_test.dart
@@ -73,6 +73,7 @@ class ImportedTypeComputerTest extends AbstractSelectorSuggestionTest {
   test_ExpressionStatement_class() {
     // SimpleIdentifier  ExpressionStatement  Block
     addSource('/testA.dart', '''
+      _B F1() { }
       class A {int x;}
       class _B { }''');
     addTestSource('''
@@ -80,6 +81,7 @@ class ImportedTypeComputerTest extends AbstractSelectorSuggestionTest {
       class C {foo(){O^}}''');
     return computeFull().then((_) {
       assertSuggestClass('A');
+      assertSuggestFunction('F1', '_B', false);
       assertNotSuggested('x');
       assertNotSuggested('_B');
       // Should not suggest compilation unit elements
@@ -125,33 +127,6 @@ class ImportedTypeComputerTest extends AbstractSelectorSuggestionTest {
     });
   }
 
-  test_HideCombinator_class() {
-    // SimpleIdentifier  HideCombinator  ImportDirective
-    addSource('/testAB.dart', '''
-      library libAB;
-      part '/partAB.dart';
-      class A { }
-      class B { }''');
-    addSource('/partAB.dart', '''
-      part of libAB;
-      class PB { }''');
-    addSource('/testCD.dart', '''
-      class C { }
-      class D { }''');
-    addTestSource('''
-      import "/testAB.dart" hide ^;
-      import "/testCD.dart";
-      class X {}''');
-    return computeFull().then((_) {
-      assertSuggestClass('A');
-      assertSuggestClass('B');
-      assertSuggestClass('PB');
-      assertNotSuggested('C');
-      assertNotSuggested('D');
-      assertNotSuggested('Object');
-    });
-  }
-
   test_ImportDirective_dart() {
     // SimpleStringLiteral  ImportDirective
     addTestSource('''
@@ -161,25 +136,4 @@ class ImportedTypeComputerTest extends AbstractSelectorSuggestionTest {
       assertNotSuggested('Object');
     });
   }
-
-  test_ShowCombinator_class() {
-    // SimpleIdentifier  ShowCombinator  ImportDirective
-    addSource('/testAB.dart', '''
-      class A { }
-      class B { }''');
-    addSource('/testCD.dart', '''
-      class C { }
-      class D { }''');
-    addTestSource('''
-      import "/testAB.dart" show ^;
-      import "/testCD.dart";
-      class X {}''');
-    return computeFull().then((_) {
-      assertSuggestClass('A');
-      assertSuggestClass('B');
-      assertNotSuggested('C');
-      assertNotSuggested('D');
-      assertNotSuggested('Object');
-    });
-  }
 }