Ignore ErrorToken when locating previous n tokens for completion ranking

lambdabaa · commit-bot@chromium.org · commit 81569e5fe360 · 2019-08-12T16:20:25.000Z
Bug: #37798 Change-Id: I65b2b57d874ccf8e748841f3d0742e883a91ec46 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/112702 Commit-Queue: Ari Aye <ariaye@google.com> Reviewed-by: Dan Rubel <danrubel@google.com> Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/completion_ranking_internal.dart b/pkg/analysis_server/lib/src/services/completion/dart/completion_ranking_internal.dart
@@ -8,6 +8,7 @@ import 'package:analysis_server/src/provisional/completion/dart/completion_dart.
 import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
+import 'package:front_end/src/fasta/scanner.dart';
 
 /// Constructs a [CompletionSuggestion] object.
 CompletionSuggestion createCompletionSuggestion(
@@ -160,7 +161,7 @@ List<String> constructQuery(DartCompletionRequest request, int n) {
 
   final result = List<String>();
   for (var size = 0; size < n && !token.isEof; token = token.previous) {
-    if (!token.isSynthetic) {
+    if (!token.isSynthetic && token is! ErrorToken) {
       result.add(token.lexeme);
       size += 1;
     }
