filter void methods when suggesting expression

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 944 matching lines @@
   }
 
   test_ExpressionStatement_identifier() {
     // SimpleIdentifier  ExpressionStatement  Block
     addSource('/testA.dart', '''
       _B F1() { }
       class A {int x;}
       class _B { }''');
     addTestSource('''
       import "/testA.dart";
-      class C {foo(){O^}}''');
+      class C {foo(){O^} void bar() {}}''');
     computeFast();
     return computeFull(true).then((_) {
       assertSuggestImportedClass('A');
       assertSuggestImportedFunction('F1', '_B', false);
       assertSuggestLocalClass('C');
+      assertSuggestLocalMethod('foo', 'C', null);
+      assertSuggestLocalMethod('bar', 'C', 'void');
+      assertSuggestLocalClass('C');
       assertNotSuggested('x');
       assertNotSuggested('_B');
     });
   }
 
   test_ExpressionStatement_name() {
     // ExpressionStatement  Block  BlockFunctionBody  MethodDeclaration
     addSource('/testA.dart', '''
       B T1;
       class B{}''');
@@ skipping 86 matching lines @@
     // SimpleIdentifier  ForStatement
     addTestSource('main() {for (int index = 0; index < 10; i^)}');
     computeFast();
     return computeFull(true).then((_) {
       assertSuggestLocalVariable('index', 'int');
     });
   }
 
   test_ForStatement_updaters_prefix_expression() {
     // SimpleIdentifier  PrefixExpression  ForStatement
-    addTestSource('main() {for (int index = 0; index < 10; ++i^)}');
+    addTestSource('''
+      void bar() { }
+      main() {for (int index = 0; index < 10; ++i^)}''');
     computeFast();
     return computeFull(true).then((_) {
       assertSuggestLocalVariable('index', 'int');
+      assertSuggestLocalFunction('main', null);
+      assertNotSuggested('bar');
     });
   }
 
   test_FunctionExpression_body_function() {
     // Block  BlockFunctionBody  FunctionExpression
-    addTestSource('String foo(List args) {x.then((R b) {^});}');
+    addTestSource('''
+      void bar() { }
+      String foo(List args) {x.then((R b) {^});}''');
     computeFast();
     return computeFull(true).then((_) {
       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;}
@@ skipping 105 matching lines @@
       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((_) {
       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 ^)}''');
@@ skipping 73 matching lines @@
         expect(methodA.element.isPrivate, isFalse);
       }
       assertSuggestParameter('x', 'X');
       assertSuggestParameter('y', null);
       assertSuggestImportedClass('int');
     });
   }
 
   test_MethodDeclaration_parameters_positional() {
     // Block  BlockFunctionBody  MethodDeclaration
-    addTestSource('class A {Z a(X x, [int y=1]) {^}}');
+    addTestSource('''
+      foo() { }
+      void bar() { }
+      class A {Z a(X x, [int y=1]) {^}}''');
     computeFast();
     return computeFull(true).then((_) {
+      assertSuggestLocalFunction('foo', null);
+      assertSuggestLocalFunction('bar', 'void');
       assertSuggestLocalMethod('a', 'A', 'Z');
       assertSuggestParameter('x', 'X');
       assertSuggestParameter('y', 'int');
       assertSuggestImportedClass('String');
     });
   }
 
   test_PrefixedIdentifier_class_imported() {
     // SimpleIdentifier  PrefixedIdentifier  ExpressionStatement
     addSource('/testB.dart', '''
@@ skipping 119 matching lines @@
       assertNotSuggested('_B');
     });
   }
 
   test_PropertyAccess_expression() {
     // SimpleIdentifier  MethodInvocation  PropertyAccess  ExpressionStatement
     addTestSource('class A {a() {"hello".to^String().length}}');
     computeFast();
     return computeFull(true).then((_) {
       assertSuggestInvocationGetter('length', 'int');
-      assertNotSuggested('==');
       assertNotSuggested('A');
       assertNotSuggested('a');
       assertNotSuggested('Object');
       assertNotSuggested('==');
     });
   }
 
   test_PropertyAccess_selector() {
     // SimpleIdentifier  PropertyAccess  ExpressionStatement  Block
     addTestSource('class A {a() {"hello".length.^}}');
@@ skipping 67 matching lines @@
       assertNotSuggested('x');
       assertNotSuggested('e');
     });
   }
 
   test_VariableDeclarationStatement_RHS_missing_semicolon() {
     // VariableDeclaration  VariableDeclarationList
     // VariableDeclarationStatement
     addSource('/testB.dart', '''
       lib B;
-      foo() { }
+      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((_) {
       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');
     });
   }
 }