combinator suggestion fix and more common tests

pkg/analysis_server/test/services/completion/imported_computer_test.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.toplevel;
 
 import 'package:analysis_server/src/protocol.dart';
 import 'package:analysis_server/src/services/completion/imported_computer.dart';
 import 'package:unittest/unittest.dart';
 
@@ skipping 55 matching lines @@
       assertNotSuggested('_T4');
       // LocalComputer provides local suggestions
       assertNotSuggested('C');
       assertNotSuggested('foo');
     });
   }
 
   test_ExpressionStatement_class() {
     // SimpleIdentifier  ExpressionStatement  Block
     addSource('/testA.dart', '''
+      _B F1() { }
       class A {int x;}
       class _B { }''');
     addTestSource('''
       import "/testA.dart";
       class C {foo(){O^}}''');
     return computeFull().then((_) {
       assertSuggestClass('A');
+      assertSuggestFunction('F1', '_B', false);
       assertNotSuggested('x');
       assertNotSuggested('_B');
       // Should not suggest compilation unit elements
       // which are returned by the LocalComputer
       assertNotSuggested('C');
     });
   }
 
   test_ExpressionStatement_name() {
     // ExpressionStatement  Block  BlockFunctionBody  MethodDeclaration
@@ skipping 25 matching lines @@
     // FieldDeclaration
     addSource('/testA.dart', 'class A { }');
     addTestSource('''
       import "/testA.dart";
       class C {var ^}''');
     return computeFull().then((_) {
       assertNotSuggested('A');
     });
   }
 
-  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('''
       import "dart^";
       main() {}''');
     return computeFull().then((_) {
       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');
-    });
-  }
 }