fix keyword completion in class body

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';
 import 'package:unittest/unittest.dart';
 
 import '../../reflective_tests.dart';
 import 'completion_test_util.dart';
 
 main() {
   groupSep = ' | ';
   runReflectiveTests(KeywordComputerTest);
 }
 
 @reflectiveTest
 class KeywordComputerTest extends AbstractCompletionTest {
+  static const List<Keyword> CLASS_BODY_KEYWORDS = const [
+    Keyword.CONST,
+    Keyword.DYNAMIC,
+    Keyword.FACTORY,
+    Keyword.FINAL,
+    Keyword.GET,
+    Keyword.OPERATOR,
+    Keyword.SET,
+    Keyword.STATIC,
+    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 138 matching lines @@
     addTestSource('^ import foo;');
     expect(computeFast(), isTrue);
     assertSuggestKeywords([
       Keyword.EXPORT,
       Keyword.IMPORT,
       Keyword.LIBRARY,
       Keyword.PART
     ], DART_RELEVANCE_HIGH);
   }
 
-  test_class4() {
+  test_class() {
     addTestSource('class A e^ { }');
     expect(computeFast(), isTrue);
     assertSuggestKeywords(
         [Keyword.EXTENDS, Keyword.IMPLEMENTS], DART_RELEVANCE_HIGH);
   }
 
+  test_class_body() {
+    addTestSource('class A {^}');
+    expect(computeFast(), isTrue);
+    assertSuggestKeywords(CLASS_BODY_KEYWORDS);
+  }
+
+  test_class_body_beginning() {
+    addTestSource('class A {^ var foo;}');
+    expect(computeFast(), isTrue);
+    assertSuggestKeywords(CLASS_BODY_KEYWORDS);
+  }
+
+  test_class_body_between() {
+    addTestSource('class A {var bar; ^ var foo;}');
+    expect(computeFast(), isTrue);
+    assertSuggestKeywords(CLASS_BODY_KEYWORDS);
+  }
+
+  test_class_body_end() {
+    addTestSource('class A {var foo; ^}');
+    expect(computeFast(), isTrue);
+    assertSuggestKeywords(CLASS_BODY_KEYWORDS);
+  }
+
   test_class_extends() {
     addTestSource('class A extends foo ^');
     expect(computeFast(), isTrue);
     assertSuggestKeywords(
         [Keyword.IMPLEMENTS, Keyword.WITH], DART_RELEVANCE_HIGH);
   }
 
   test_class_extends2() {
     addTestSource('class A extends foo i^');
     expect(computeFast(), isTrue);
@@ skipping 163 matching lines @@
     expect(computeFast(), isTrue);
     assertSuggestKeywords(IN_BLOCK_NOT_IN_CLASS);
   }
 
   test_function_body_inUnit_afterBlock() {
     addTestSource('main() {{}^}');
     expect(computeFast(), isTrue);
     assertSuggestKeywords(IN_BLOCK_NOT_IN_CLASS);
   }
 
-  test_in_class() {
-    addTestSource('class A {^}');
-    expect(computeFast(), isTrue);
-    assertSuggestKeywords([
-      Keyword.CONST,
-      Keyword.DYNAMIC,
-      Keyword.FACTORY,
-      Keyword.FINAL,
-      Keyword.GET,
-      Keyword.OPERATOR,
-      Keyword.SET,
-      Keyword.STATIC,
-      Keyword.VAR,
-      Keyword.VOID
-    ]);
-  }
-
   test_library() {
     addTestSource('library foo;^');
     expect(computeFast(), isTrue);
     assertSuggestKeywords([
       Keyword.ABSTRACT,
       Keyword.CLASS,
       Keyword.CONST,
       Keyword.EXPORT,
       Keyword.FINAL,
       Keyword.IMPORT,
@@ skipping 76 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;
   }
 }