improve method invocation and string interpolation 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;
@@ skipping 492 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);
     }
   }
 
-  test_AsExpression_target() {
-    // IfStatement  Block  BlockFunctionBody
-    addTestSource('''
-      class A {int x; int y() => 0;}
-      main(){var a; if (^ is A)}''');
+  test_AssignmentExpression_name() {
+    // SimpleIdentifier  VariableDeclaration  VariableDeclarationList
+    // VariableDeclarationStatement  Block
+    addTestSource('class A {} main() {int a; int ^b = 1;}');
     computeFast();
     return computeFull(true).then((_) {
-      assertSuggestLocalVariable('a', null);
-      assertSuggestLocalFunction('main', null);
-      assertSuggestLocalClass('A');
-      assertSuggestImportedClass('Object');
+      assertNoSuggestions();
     });
   }
 
-  test_AsExpression_type() {
-    // SimpleIdentifier  TypeName  IsExpression  IfStatement
-    addTestSource('''
-      class A {int x; int y() => 0;}
-      main(){var a; if (a is ^)}''');
-    computeFast();
-    return computeFull(true).then((_) {
-      assertNotSuggested('a');
-      assertNotSuggested('main');
-      assertSuggestLocalClass('A');
-      assertSuggestImportedClass('Object');
-    });
-  }
-
   test_AssignmentExpression_RHS() {
     // SimpleIdentifier  VariableDeclaration  VariableDeclarationList
     // VariableDeclarationStatement  Block
     addTestSource('class A {} main() {int a; int b = ^}');
     computeFast();
     return computeFull(true).then((_) {
       assertSuggestLocalVariable('a', 'int');
       assertSuggestLocalFunction('main', null);
       assertSuggestLocalClass('A');
       assertSuggestImportedClass('Object');
     });
   }
 
-  test_AssignmentExpression_name() {
-    // SimpleIdentifier  VariableDeclaration  VariableDeclarationList
-    // VariableDeclarationStatement  Block
-    addTestSource('class A {} main() {int a; int ^b = 1;}');
-    computeFast();
-    return computeFull(true).then((_) {
-      assertNoSuggestions();
-    });
-  }
-
   test_AssignmentExpression_type() {
     // SimpleIdentifier  TypeName  VariableDeclarationList
     // VariableDeclarationStatement  Block
     addTestSource('class A {} main() {int a; int^ b = 1;}');
     computeFast();
     return computeFull(true).then((_) {
       assertSuggestLocalClass('A');
       assertSuggestImportedClass('int');
       assertNotSuggested('a');
       assertNotSuggested('main');
@@ skipping 524 matching lines @@
       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((_) {
-//      assertSuggestLocalVariable('name', 'String');
-//      assertSuggestImportedClass('Object');
-//    });
-//  }
+  test_InterpolationExpression() {
+    // SimpleIdentifier  InterpolationExpression  StringInterpolation
+    addTestSource('main() {String name; print("hello \$^");}');
+    computeFast();
+    return computeFull(true).then((_) {
+      assertSuggestLocalVariable('name', 'String');
+      assertSuggestImportedClass('Object');
+    });
+  }
 
-//  test_InterpolationExpression_block() {
-//    // SimpleIdentifier  InterpolationExpression  StringInterpolation
-//    addTestSource('main() {String name; print("hello \${n^}");}');
-//    computeFast();
-//    return computeFull(true).then((_) {
-//      assertSuggestLocalVariable('name', 'String');
-//      assertSuggestImportedClass('Object');
-//    });
-//  }
+  test_InterpolationExpression_block() {
+    // SimpleIdentifier  InterpolationExpression  StringInterpolation
+    addTestSource('main() {String name; print("hello \${n^}");}');
+    computeFast();
+    return computeFull(true).then((_) {
+      assertSuggestLocalVariable('name', 'String');
+      assertSuggestImportedClass('Object');
+    });
+  }
 
   test_InterpolationExpression_prefix_selector() {
     // SimpleIdentifier  PrefixedIdentifier  InterpolationExpression
     addTestSource('main() {String name; print("hello \${name.^}");}');
     computeFast();
     return computeFull(true).then((_) {
       assertSuggestInvocationGetter('length', 'int');
       assertNotSuggested('name');
       assertNotSuggested('Object');
     });
   }
 
-//  test_InterpolationExpression_prefix_target() {
-//    // SimpleIdentifier  PrefixedIdentifier  InterpolationExpression
-//    addTestSource('main() {String name; print("hello \${nam^e.length}");}');
-//    computeFast();
-//    return computeFull(true).then((_) {
-//      assertSuggestLocalVariable('name', 'String');
-//      assertSuggestImportedClass('Object');
-//      assertNotSuggested('length');
-//    });
-//  }
+  test_InterpolationExpression_prefix_target() {
+    // SimpleIdentifier  PrefixedIdentifier  InterpolationExpression
+    addTestSource('main() {String name; print("hello \${nam^e.length}");}');
+    computeFast();
+    return computeFull(true).then((_) {
+      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((_) {
       assertSuggestImportedClass('X');
       assertSuggestLocalClass('Y');
       assertNotSuggested('x');
       assertNotSuggested('main');
       assertNotSuggested('foo');
     });
   }
 
+  test_IsExpression_target() {
+    // IfStatement  Block  BlockFunctionBody
+    addTestSource('''
+      class A {int x; int y() => 0;}
+      main(){var a; if (^ is A)}''');
+    computeFast();
+    return computeFull(true).then((_) {
+      assertSuggestLocalVariable('a', null);
+      assertSuggestLocalFunction('main', null);
+      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((_) {
+      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((_) {
       assertNoSuggestions();
     });
   }
 
   test_MethodDeclaration_body_getters() {
@@ skipping 186 matching lines @@
     computeFast();
     return computeFull(true).then((_) {
       assertSuggestImportedClass('A');
       assertSuggestLocalClass('X');
       assertSuggestLocalMethod('foo', 'X', null);
       assertNotSuggested('bar');
       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('A');
+      assertNotSuggested('a');
+      assertNotSuggested('Object');
+    });
+  }
+
+  test_PropertyAccess_selector() {
+    // SimpleIdentifier  PropertyAccess  ExpressionStatement  Block
+    addTestSource('class A {a() {"hello".length.^}}');
+    computeFast();
+    return computeFull(true).then((_) {
+      assertSuggestInvocationGetter('isEven', 'bool');
+      assertNotSuggested('A');
+      assertNotSuggested('a');
+      assertNotSuggested('Object');
+    });
+  }
+
   test_TopLevelVariableDeclaration_typed_name() {
     // SimpleIdentifier  VariableDeclaration  VariableDeclarationList
     // TopLevelVariableDeclaration
     addTestSource('class A {} B ^');
     computeFast();
     return computeFull(true).then((_) {
       assertNoSuggestions();
     });
   }
 
   test_TopLevelVariableDeclaration_untyped_name() {
     // SimpleIdentifier  VariableDeclaration  VariableDeclarationList
     // TopLevelVariableDeclaration
     addTestSource('class A {} var ^');
     computeFast();
     return computeFull(true).then((_) {
       assertNoSuggestions();
     });
   }
 
-  test_VariableDeclarationStatement_RHS() {
+  test_VariableDeclaration_name() {
     // SimpleIdentifier  VariableDeclaration  VariableDeclarationList
-    // VariableDeclarationStatement
+    // 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() {}}
-      class C {bar(){var f; {var x;} var e = ^}}''');
+      main() {var ^}''');
     computeFast();
     return computeFull(true).then((_) {
-      assertSuggestImportedClass('X');
-      assertNotSuggested('_B');
-      assertSuggestLocalClass('Y');
-      assertSuggestLocalClass('C');
-      assertSuggestLocalVariable('f', null);
-      assertNotSuggested('x');
-      assertNotSuggested('e');
+      assertNoSuggestions();
     });
   }
 
-  test_VariableDeclarationStatement_RHS_missing_semicolon() {
-    // VariableDeclaration  VariableDeclarationList
+  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 = ^ var g}}''');
+      class C {bar(){var f; {var x;} var e = ^}}''');
     computeFast();
     return computeFull(true).then((_) {
       assertSuggestImportedClass('X');
       assertNotSuggested('_B');
       assertSuggestLocalClass('Y');
       assertSuggestLocalClass('C');
       assertSuggestLocalVariable('f', null);
       assertNotSuggested('x');
       assertNotSuggested('e');
     });
   }
 
-  test_VariableDeclaration_name() {
-    // SimpleIdentifier  VariableDeclaration  VariableDeclarationList
-    // VariableDeclarationStatement  Block
+  test_VariableDeclarationStatement_RHS_missing_semicolon() {
+    // 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() {}}
-      main() {var ^}''');
+      class C {bar(){var f; {var x;} var e = ^ var g}}''');
     computeFast();
     return computeFull(true).then((_) {
-      assertNoSuggestions();
+      assertSuggestImportedClass('X');
+      assertNotSuggested('_B');
+      assertSuggestLocalClass('Y');
+      assertSuggestLocalClass('C');
+      assertSuggestLocalVariable('f', null);
+      assertNotSuggested('x');
+      assertNotSuggested('e');
     });
   }
-
-//  test_ConditionalExpression() {
-//    fail('not implemented yet');
-//  }
-//
-//  test_FunctionExpression() {
-//    fail('not implemented yet');
-//  }
-//
-//  test_FunctionExpressionInvocation() {
-//    fail('not implemented yet');
-//  }
-//
-//  test_Identifier() {
-//    fail('not implemented yet');
-//  }
-//
-//  test_IndexExpression() {
-//    fail('not implemented yet');
-//  }
-//
-//  test_InstanceCreationExpression() {
-//    fail('not implemented yet');
-//  }
-//
-//  test_Literal() {
-//    fail('not implemented yet');
-//  }
-//
-//  test_MethodInvocation() {
-//    fail('not implemented yet');
-//  }
-//
-//  test_NamedExpression() {
-//    fail('not implemented yet');
-//  }
-//
-//  test_ParenthesizedExpression() {
-//    fail('not implemented yet');
-//  }
-//
-//  test_PostfixExpression() {
-//    fail('not implemented yet');
-//  }
-//
-//  test_PrefixedIdentifier() {
-//    fail('not implemented yet');
-//  }
-//
-//  test_PrefixedExpression() {
-//    fail('not implemented yet');
-//  }
-//
-//  test_PropertyAccess() {
-//    fail('not implemented yet');
-//  }
-//
-//  test_RethrowExpression() {
-//    fail('not implemented yet');
-//  }
-//
-//  test_SuperExpression() {
-//    fail('not implemented yet');
-//  }
-//
-//  test_ThisExpression() {
-//    fail('not implemented yet');
-//  }
-//
-//  test_ThrowExpression() {
-//    fail('not implemented yet');
-//  }
 }