improve keyword suggestions

pkg/analysis_server/test/services/completion/keyword_contributor_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.dart.keyword;
 
 import 'package:analysis_server/src/protocol.dart';
 import 'package:analysis_server/src/services/completion/dart_completion_manager.dart';
 import 'package:analysis_server/src/services/completion/keyword_contributor.dart';
 import 'package:analyzer/src/generated/scanner.dart';
@@ skipping 56 matching lines @@
     Keyword.EXPORT,
     Keyword.FINAL,
     Keyword.IMPORT,
     Keyword.LIBRARY,
     Keyword.PART,
     Keyword.TYPEDEF,
     Keyword.VAR,
     Keyword.VOID
   ];
 
-  static const List<Keyword> IN_BLOCK_IN_CLASS = const [
+  static const List<Keyword> STMT_START_IN_CLASS = const [
     Keyword.ASSERT,
     Keyword.CASE,
     Keyword.CONTINUE,
     Keyword.DO,
     Keyword.FINAL,
     Keyword.FOR,
     Keyword.IF,
     Keyword.NEW,
     Keyword.RETHROW,
     Keyword.RETURN,
     Keyword.SUPER,
     Keyword.SWITCH,
     Keyword.THIS,
     Keyword.THROW,
     Keyword.TRY,
     Keyword.VAR,
     Keyword.VOID,
     Keyword.WHILE
   ];
 
-  static const List<Keyword> IN_BLOCK_NOT_IN_CLASS = const [
+  static const List<Keyword> STMT_START_OUTSIDE_CLASS = const [
     Keyword.ASSERT,
     Keyword.CASE,
     Keyword.CONTINUE,
     Keyword.DO,
     Keyword.FINAL,
     Keyword.FOR,
     Keyword.IF,
     Keyword.NEW,
     Keyword.RETHROW,
     Keyword.RETURN,
@@ skipping 237 matching lines @@
 
   test_function_body_inClass_constructorInitializer() {
     addTestSource(r'''
 foo(p) {}
 class A {
   final f;
   A() : f = foo(() {^});
 }
 ''');
     expect(computeFast(), isTrue);
-    assertSuggestKeywords(IN_BLOCK_NOT_IN_CLASS);
+    assertSuggestKeywords(STMT_START_OUTSIDE_CLASS);
   }
 
   test_function_body_inClass_field() {
     addTestSource(r'''
 class A {
   var f = () {^};
 }
 ''');
     expect(computeFast(), isTrue);
-    assertSuggestKeywords(IN_BLOCK_NOT_IN_CLASS);
+    assertSuggestKeywords(STMT_START_OUTSIDE_CLASS);
   }
 
   test_function_body_inClass_methodBody() {
     addTestSource(r'''
 class A {
   m() {
     f() {^};
   }
 }
 ''');
     expect(computeFast(), isTrue);
-    assertSuggestKeywords(IN_BLOCK_IN_CLASS);
+    assertSuggestKeywords(STMT_START_IN_CLASS);
   }
 
   test_function_body_inClass_methodBody_inFunction() {
     addTestSource(r'''
 class A {
   m() {
     f() {
       f2() {^};
     };
   }
 }
 ''');
     expect(computeFast(), isTrue);
-    assertSuggestKeywords(IN_BLOCK_IN_CLASS);
+    assertSuggestKeywords(STMT_START_IN_CLASS);
   }
 
   test_function_body_inUnit() {
     addTestSource('main() {^}');
     expect(computeFast(), isTrue);
-    assertSuggestKeywords(IN_BLOCK_NOT_IN_CLASS);
+    assertSuggestKeywords(STMT_START_OUTSIDE_CLASS);
   }
 
   test_function_body_inUnit_afterBlock() {
     addTestSource('main() {{}^}');
     expect(computeFast(), isTrue);
-    assertSuggestKeywords(IN_BLOCK_NOT_IN_CLASS);
+    assertSuggestKeywords(STMT_START_OUTSIDE_CLASS);
+  }
+
+  test_if_in_class() {
+    addTestSource('class A {foo() {if (true) ^}}');
+    expect(computeFast(), isTrue);
+    assertSuggestKeywords(STMT_START_IN_CLASS, DART_RELEVANCE_KEYWORD);
+  }
+
+  test_if_in_class2() {
+    addTestSource('class A {foo() {if (true) ^;}}');
+    expect(computeFast(), isTrue);
+    assertSuggestKeywords(STMT_START_IN_CLASS, DART_RELEVANCE_KEYWORD);
+  }
+
+  test_if_in_class3() {
+    addTestSource('class A {foo() {if (true) r^;}}');
+    expect(computeFast(), isTrue);
+    assertSuggestKeywords(STMT_START_IN_CLASS, DART_RELEVANCE_KEYWORD);
+  }
+
+  test_if_in_class4() {
+    addTestSource('class A {foo() {if (true) ^ go();}}');
+    expect(computeFast(), isTrue);
+    assertSuggestKeywords(STMT_START_IN_CLASS, DART_RELEVANCE_KEYWORD);
+  }
+
+  test_if_outside_class() {
+    addTestSource('foo() {if (true) ^}');
+    expect(computeFast(), isTrue);
+    assertSuggestKeywords(STMT_START_OUTSIDE_CLASS, DART_RELEVANCE_KEYWORD);
+  }
+
+  test_if_outside_class2() {
+    addTestSource('foo() {if (true) ^;}');
+    expect(computeFast(), isTrue);
+    assertSuggestKeywords(STMT_START_OUTSIDE_CLASS, DART_RELEVANCE_KEYWORD);
+  }
+
+  test_if_outside_class3() {
+    addTestSource('foo() {if (true) r^;}');
+    expect(computeFast(), isTrue);
+    assertSuggestKeywords(STMT_START_OUTSIDE_CLASS, DART_RELEVANCE_KEYWORD);
+  }
+
+  test_if_outside_class4() {
+    addTestSource('foo() {if (true) ^ go();}');
+    expect(computeFast(), isTrue);
+    assertSuggestKeywords(STMT_START_OUTSIDE_CLASS, DART_RELEVANCE_KEYWORD);
   }
 
   test_import() {
     addTestSource('import "foo" deferred as foo ^;');
     expect(computeFast(), isTrue);
     assertSuggestKeywords([], DART_RELEVANCE_HIGH);
   }
 
   test_import_as() {
     addTestSource('import "foo" deferred ^;');
@@ skipping 42 matching lines @@
     expect(computeFast(), isTrue);
     assertSuggestKeywords([Keyword.AS, Keyword.DEFERRED], DART_RELEVANCE_HIGH);
   }
 
   test_import_deferred6() {
     addTestSource('import "foo" d^ import');
     expect(computeFast(), isTrue);
     assertSuggestKeywords([Keyword.AS, Keyword.DEFERRED], DART_RELEVANCE_HIGH);
   }
 
-  test_import_deferred_not() {
-    addTestSource('import "foo" as foo ^;');
-    expect(computeFast(), isTrue);
-    assertSuggestKeywords([], DART_RELEVANCE_HIGH);
-  }
-
   test_import_deferred_as() {
     addTestSource('import "foo" ^;');
     expect(computeFast(), isTrue);
     assertSuggestKeywords([Keyword.AS, Keyword.DEFERRED], DART_RELEVANCE_HIGH);
   }
 
   test_import_deferred_as2() {
     addTestSource('import "foo" d^;');
     expect(computeFast(), isTrue);
     assertSuggestKeywords([Keyword.AS, Keyword.DEFERRED], DART_RELEVANCE_HIGH);
   }
 
   test_import_deferred_as3() {
     addTestSource('import "foo" ^');
     expect(computeFast(), isTrue);
     assertSuggestKeywords([Keyword.AS, Keyword.DEFERRED], DART_RELEVANCE_HIGH);
   }
 
   test_import_deferred_as4() {
     addTestSource('import "foo" d^');
     expect(computeFast(), isTrue);
     assertSuggestKeywords([Keyword.AS, Keyword.DEFERRED], DART_RELEVANCE_HIGH);
   }
 
+  test_import_deferred_not() {
+    addTestSource('import "foo" as foo ^;');
+    expect(computeFast(), isTrue);
+    assertSuggestKeywords([], DART_RELEVANCE_HIGH);
+  }
+
   test_library() {
     addTestSource('library foo;^');
     expect(computeFast(), isTrue);
     assertSuggestKeywords(
         DIRECTIVE_AND_DECLARATION_KEYWORDS, DART_RELEVANCE_HIGH);
   }
 
   test_library_name() {
     addTestSource('library ^');
     expect(computeFast(), isTrue);
     assertSuggestKeywords([]);
   }
 
   test_method_body() {
     addTestSource('class A { foo() {^}}');
     expect(computeFast(), isTrue);
-    assertSuggestKeywords(IN_BLOCK_IN_CLASS);
+    assertSuggestKeywords(STMT_START_IN_CLASS);
   }
 
   test_named_constructor_invocation() {
     addTestSource('void main() {new Future.^}');
     expect(computeFast(), isTrue);
     assertSuggestKeywords([]);
   }
 
   test_part_of() {
     addTestSource('part of foo;^');
@@ skipping 22 matching lines @@
     sorted.forEach((k) => msg.writeln('  Keyword.${k.name},'));
   }
 
   bool _equalSets(Iterable<Keyword> iter1, Iterable<Keyword> iter2) {
     if (iter1.length != iter2.length) return false;
     if (iter1.any((k) => !iter2.contains(k))) return false;
     if (iter2.any((k) => !iter1.contains(k))) return false;
     return true;
   }
 }