improve parser recovery for import statements

pkg/analysis_server/lib/src/services/completion/keyword_contributor.dart

Index: pkg/analysis_server/lib/src/services/completion/keyword_contributor.dart
diff --git a/pkg/analysis_server/lib/src/services/completion/keyword_contributor.dart b/pkg/analysis_server/lib/src/services/completion/keyword_contributor.dart
index adc4b603084c9a4a3f9d5b6a63ec90170fbd3576..b979b8ba30bdcde748ba6680d5ee639d174d459d 100644
--- a/pkg/analysis_server/lib/src/services/completion/keyword_contributor.dart
+++ b/pkg/analysis_server/lib/src/services/completion/keyword_contributor.dart
@@ -107,7 +107,8 @@ class _KeywordVisitor extends GeneralizingAstVisitor {
       }
     }
     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);
@@ -143,7 +144,7 @@ class _KeywordVisitor extends GeneralizingAstVisitor {
         _addSuggestion(Keyword.DEFERRED, DART_RELEVANCE_HIGH);
       }
     }
-    if (entity == node.semicolon) {
+    if (entity == node.semicolon || node.combinators.contains(entity)) {
       _addImportDirectiveKeywords(node);
     }
   }