suggest dynamic and void when defining new compilation unit members

pkg/analysis_server/test/services/completion/keyword_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.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_computer.dart';
 import 'package:analyzer/src/generated/scanner.dart';
@@ skipping 15 matching lines @@
     Keyword.FACTORY,
     Keyword.FINAL,
     Keyword.GET,
     Keyword.OPERATOR,
     Keyword.SET,
     Keyword.STATIC,
     Keyword.VAR,
     Keyword.VOID
   ];
 
+  static const List<Keyword> DECLARATION_KEYWORDS = const [
+    Keyword.ABSTRACT,
+    Keyword.CLASS,
+    Keyword.CONST,
+    Keyword.DYNAMIC,
+    Keyword.FINAL,
+    Keyword.TYPEDEF,
+    Keyword.VAR,
+    Keyword.VOID
+  ];
+
+  static const List<Keyword> DIRECTIVE_AND_DECLARATION_KEYWORDS = const [
+    Keyword.ABSTRACT,
+    Keyword.CLASS,
+    Keyword.CONST,
+    Keyword.DYNAMIC,
+    Keyword.EXPORT,
+    Keyword.FINAL,
+    Keyword.IMPORT,
+    Keyword.PART,
+    Keyword.TYPEDEF,
+    Keyword.VAR,
+    Keyword.VOID
+  ];
+
+  static const List<Keyword> DIRECTIVE_DECLARATION_AND_LIBRARY_KEYWORDS =
+      const [
+    Keyword.ABSTRACT,
+    Keyword.CLASS,
+    Keyword.CONST,
+    Keyword.DYNAMIC,
+    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 [
     Keyword.ASSERT,
     Keyword.CASE,
     Keyword.CONTINUE,
     Keyword.DO,
     Keyword.FINAL,
     Keyword.FOR,
     Keyword.IF,
     Keyword.NEW,
     Keyword.RETHROW,
@@ skipping 34 matching lines @@
       if (s.kind == CompletionSuggestionKind.KEYWORD) {
         Keyword k = Keyword.keywords[s.completion];
         if (k == null) {
           fail('Invalid keyword suggested: ${s.completion}');
         } else {
           if (!actualKeywords.add(k)) {
             fail('Duplicate keyword suggested: ${s.completion}');
           }
         }
       }
-    };
+    }
     if (expectedKeywords.any((k) => k is String)) {
       StringBuffer msg = new StringBuffer();
       msg.writeln('Expected set should be:');
       expectedKeywords.forEach((n) {
         Keyword k = Keyword.keywords[n];
         msg.writeln('  Keyword.${k.name},');
       });
       fail(msg.toString());
     }
     if (!_equalSets(expectedKeywords, actualKeywords)) {
       StringBuffer msg = new StringBuffer();
       msg.writeln('Expected:');
       _appendKeywords(msg, expectedKeywords);
       msg.writeln('but found:');
       _appendKeywords(msg, actualKeywords);
       fail(msg.toString());
     }
     for (CompletionSuggestion s in request.suggestions) {
       if (s.kind == CompletionSuggestionKind.KEYWORD) {
         Keyword k = Keyword.keywords[s.completion];
         expect(s.relevance, equals(relevance), reason: k.toString());
         expect(s.selectionOffset, equals(s.completion.length));
         expect(s.selectionLength, equals(0));
         expect(s.isDeprecated, equals(false));
         expect(s.isPotential, equals(false));
       }
-    };
+    }
   }
 
   @override
   void setUpComputer() {
     computer = new KeywordComputer();
   }
 
   test_after_class() {
     addTestSource('class A {} ^');
     expect(computeFast(), isTrue);
-    assertSuggestKeywords([
-      Keyword.ABSTRACT,
-      Keyword.CLASS,
-      Keyword.CONST,
-      Keyword.FINAL,
-      Keyword.TYPEDEF,
-      Keyword.VAR
-    ], DART_RELEVANCE_HIGH);
+    assertSuggestKeywords(DECLARATION_KEYWORDS, DART_RELEVANCE_HIGH);
   }
 
   test_after_class2() {
     addTestSource('class A {} c^');
     expect(computeFast(), isTrue);
-    assertSuggestKeywords([
-      Keyword.ABSTRACT,
-      Keyword.CLASS,
-      Keyword.CONST,
-      Keyword.FINAL,
-      Keyword.TYPEDEF,
-      Keyword.VAR
-    ], DART_RELEVANCE_HIGH);
+    assertSuggestKeywords(DECLARATION_KEYWORDS, DART_RELEVANCE_HIGH);
   }
 
   test_after_import() {
     addTestSource('import foo; ^');
     expect(computeFast(), isTrue);
-    assertSuggestKeywords([
-      Keyword.ABSTRACT,
-      Keyword.CLASS,
-      Keyword.CONST,
-      Keyword.EXPORT,
-      Keyword.FINAL,
-      Keyword.IMPORT,
-      Keyword.PART,
-      Keyword.TYPEDEF,
-      Keyword.VAR
-    ], DART_RELEVANCE_HIGH);
+    assertSuggestKeywords(
+        DIRECTIVE_AND_DECLARATION_KEYWORDS, DART_RELEVANCE_HIGH);
   }
 
   test_after_import2() {
     addTestSource('import foo; c^');
     expect(computeFast(), isTrue);
-    assertSuggestKeywords([
-      Keyword.ABSTRACT,
-      Keyword.CLASS,
-      Keyword.CONST,
-      Keyword.EXPORT,
-      Keyword.FINAL,
-      Keyword.IMPORT,
-      Keyword.PART,
-      Keyword.TYPEDEF,
-      Keyword.VAR
-    ], DART_RELEVANCE_HIGH);
+    assertSuggestKeywords(
+        DIRECTIVE_AND_DECLARATION_KEYWORDS, DART_RELEVANCE_HIGH);
   }
 
   test_before_import() {
     addTestSource('^ import foo;');
     expect(computeFast(), isTrue);
     assertSuggestKeywords([
       Keyword.EXPORT,
       Keyword.IMPORT,
       Keyword.LIBRARY,
       Keyword.PART
@@ skipping 133 matching lines @@
 
   test_class_with_name() {
     addTestSource('class A extends foo with ^');
     expect(computeFast(), isTrue);
     assertSuggestKeywords([]);
   }
 
   test_empty() {
     addTestSource('^');
     expect(computeFast(), isTrue);
-    assertSuggestKeywords([
-      Keyword.ABSTRACT,
-      Keyword.CLASS,
-      Keyword.CONST,
-      Keyword.EXPORT,
-      Keyword.FINAL,
-      Keyword.IMPORT,
-      Keyword.LIBRARY,
-      Keyword.PART,
-      Keyword.TYPEDEF,
-      Keyword.VAR
-    ], DART_RELEVANCE_HIGH);
+    assertSuggestKeywords(
+        DIRECTIVE_DECLARATION_AND_LIBRARY_KEYWORDS, DART_RELEVANCE_HIGH);
   }
 
   test_function_body_inClass_constructorInitializer() {
     addTestSource(r'''
 foo(p) {}
 class A {
   final f;
   A() : f = foo(() {^});
 }
 ''');
@@ skipping 45 matching lines @@
 
   test_function_body_inUnit_afterBlock() {
     addTestSource('main() {{}^}');
     expect(computeFast(), isTrue);
     assertSuggestKeywords(IN_BLOCK_NOT_IN_CLASS);
   }
 
   test_library() {
     addTestSource('library foo;^');
     expect(computeFast(), isTrue);
-    assertSuggestKeywords([
-      Keyword.ABSTRACT,
-      Keyword.CLASS,
-      Keyword.CONST,
-      Keyword.EXPORT,
-      Keyword.FINAL,
-      Keyword.IMPORT,
-      Keyword.PART,
-      Keyword.TYPEDEF,
-      Keyword.VAR
-    ], DART_RELEVANCE_HIGH);
+    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);
   }
 
   test_named_constructor_invocation() {
     addTestSource('void main() {new Future.^}');
     expect(computeFast(), isTrue);
     assertSuggestKeywords([]);
   }
 
   test_part_of() {
     addTestSource('part of foo;^');
     expect(computeFast(), isTrue);
-    assertSuggestKeywords([
-      Keyword.ABSTRACT,
-      Keyword.CLASS,
-      Keyword.CONST,
-      Keyword.EXPORT,
-      Keyword.FINAL,
-      Keyword.IMPORT,
-      Keyword.PART,
-      Keyword.TYPEDEF,
-      Keyword.VAR
-    ], DART_RELEVANCE_HIGH);
+    assertSuggestKeywords(
+        DIRECTIVE_AND_DECLARATION_KEYWORDS, DART_RELEVANCE_HIGH);
   }
 
   test_partial_class() {
     addTestSource('cl^');
     expect(computeFast(), isTrue);
-    assertSuggestKeywords([
-      Keyword.ABSTRACT,
-      Keyword.CLASS,
-      Keyword.CONST,
-      Keyword.EXPORT,
-      Keyword.FINAL,
-      Keyword.IMPORT,
-      Keyword.LIBRARY,
-      Keyword.PART,
-      Keyword.TYPEDEF,
-      Keyword.VAR
-    ], DART_RELEVANCE_HIGH);
+    assertSuggestKeywords(
+        DIRECTIVE_DECLARATION_AND_LIBRARY_KEYWORDS, DART_RELEVANCE_HIGH);
   }
 
   test_partial_class2() {
     addTestSource('library a; cl^');
     expect(computeFast(), isTrue);
-    assertSuggestKeywords([
-      Keyword.ABSTRACT,
-      Keyword.CLASS,
-      Keyword.CONST,
-      Keyword.EXPORT,
-      Keyword.FINAL,
-      Keyword.IMPORT,
-      Keyword.PART,
-      Keyword.TYPEDEF,
-      Keyword.VAR
-    ], DART_RELEVANCE_HIGH);
+    assertSuggestKeywords(
+        DIRECTIVE_AND_DECLARATION_KEYWORDS, DART_RELEVANCE_HIGH);
   }
 
   void _appendKeywords(StringBuffer msg, Iterable<Keyword> keywords) {
     List<Keyword> sorted = keywords.toList();
     sorted.sort((k1, k2) => k1.name.compareTo(k2.name));
     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;
   }
 }