improve parser recovery for import statements

pkg/analysis_server/lib/src/services/completion/keyword_contributor.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 services.completion.contributor.dart.keyword;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/protocol.dart';
 import 'package:analysis_server/src/services/completion/dart_completion_manager.dart';
@@ skipping 89 matching lines @@
     if (previousMember is ClassDeclaration) {
       if (previousMember.leftBracket == null ||
           previousMember.leftBracket.isSynthetic) {
         // If the prior member is an unfinished class declaration
         // then the user is probably finishing that
         _addClassDeclarationKeywords(previousMember);
         return;
       }
     }
     if (previousMember is ImportDirective) {
-      if (previousMember.semicolon == null || previousMember.semicolon.isSynthetic) {
+      if (previousMember.semicolon == null ||
+          previousMember.semicolon.isSynthetic) {
         // If the prior member is an unfinished import directive
         // then the user is probably finishing that
         _addImportDirectiveKeywords(previousMember);
         return;
       }
     }
     if (previousMember == null || previousMember is Directive) {
       if (previousMember == null &&
           !node.directives.any((d) => d is LibraryDirective)) {
         _addSuggestions([Keyword.LIBRARY], DART_RELEVANCE_HIGH);
@@ skipping 15 matching lines @@
     }
   }
 
   @override
   visitImportDirective(ImportDirective node) {
     if (entity == node.asKeyword) {
       if (node.deferredKeyword == null) {
         _addSuggestion(Keyword.DEFERRED, DART_RELEVANCE_HIGH);
       }
     }
-    if (entity == node.semicolon) {
+    if (entity == node.semicolon || node.combinators.contains(entity)) {
       _addImportDirectiveKeywords(node);
     }
   }
 
   void _addImportDirectiveKeywords(ImportDirective node) {
     if (node.asKeyword == null) {
       _addSuggestion(Keyword.AS, DART_RELEVANCE_HIGH);
       if (node.deferredKeyword == null) {
         _addSuggestion(Keyword.DEFERRED, DART_RELEVANCE_HIGH);
       }
@@ skipping 35 matching lines @@
         return false;
       }
       AstNode parent = body.parent;
       if (parent is ConstructorDeclaration || parent is MethodDeclaration) {
         return true;
       }
       node = parent;
     }
   }
 }