Move scanner out of generated and clean up imports

pkg/analysis_server/test/services/completion/dart/keyword_contributor_test.dart

Index: pkg/analysis_server/test/services/completion/dart/keyword_contributor_test.dart
diff --git a/pkg/analysis_server/test/services/completion/dart/keyword_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/keyword_contributor_test.dart
index 167e3abf236632b5b03f85caa47c86778938b844..73642ea431a600340bb9ba08d72cd2c6cfc713b8 100644
--- a/pkg/analysis_server/test/services/completion/dart/keyword_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/keyword_contributor_test.dart
@@ -7,7 +7,7 @@ library test.services.completion.dart.keyword;
 import 'package:analysis_server/plugin/protocol/protocol.dart';
 import 'package:analysis_server/src/provisional/completion/dart/completion_dart.dart';
 import 'package:analysis_server/src/services/completion/dart/keyword_contributor.dart';
-import 'package:analyzer/src/generated/scanner.dart';
+import 'package:analyzer/dart/ast/token.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 import 'package:unittest/unittest.dart';
 
@@ -269,6 +269,11 @@ class KeywordContributorTest extends DartCompletionContributorTest {
     }
   }
 
+  @override
+  DartCompletionContributor createContributor() {
+    return new KeywordContributor();
+  }
+
   fail_import_partial() async {
     addTestSource('imp^ import "package:foo/foo.dart"; import "bar.dart";');
     await computeSuggestions();
@@ -298,11 +303,6 @@ class KeywordContributorTest extends DartCompletionContributorTest {
     assertNotSuggested('class');
   }
 
-  @override
-  DartCompletionContributor createContributor() {
-    return new KeywordContributor();
-  }
-
   test_after_class() async {
     addTestSource('class A {} ^');
     await computeSuggestions();
@@ -1238,13 +1238,6 @@ class A {
     assertSuggestKeywords(STMT_START_IN_CLASS, pseudoKeywords: ['await']);
   }
 
-  test_method_body_async_star() async {
-    addTestSource('class A { foo() async* {^}}');
-    await computeSuggestions();
-    assertSuggestKeywords(STMT_START_IN_CLASS,
-        pseudoKeywords: ['await', 'yield', 'yield*']);
-  }
-
   test_method_body_async2() async {
     addTestSource('class A { foo() async => ^}');
     await computeSuggestions();
@@ -1263,6 +1256,13 @@ class A {
     assertSuggestKeywords(EXPRESSION_START_INSTANCE, pseudoKeywords: ['await']);
   }
 
+  test_method_body_async_star() async {
+    addTestSource('class A { foo() async* {^}}');
+    await computeSuggestions();
+    assertSuggestKeywords(STMT_START_IN_CLASS,
+        pseudoKeywords: ['await', 'yield', 'yield*']);
+  }
+
   test_method_body_expression1() async {
     addTestSource('class A { foo() {return b == true ? ^}}');
     await computeSuggestions();