languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-11-02 12:24:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

update statement completion for fasta scanner

Browse source 
R=brianwilkerson@google.com

Review-Url: https://codereview.chromium.org/2936143002 .
This commit is contained in:
Dan Rubel 2017-06-14 11:15:44 -04:00
parent 8925c68a71
commit 305f358fa4
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkg/analysis_server/lib/src/services/completion/statement/statement_completion.dart
View file

@ -328,7 +328,8 @@ class StatementCompletionProcessor {
_removeError(ScannerErrorCode.UNTERMINATED_STRING_LITERAL);
_addInsertEdit(loc, delimiter);
}
expr = errorMatching(ParserErrorCode.EXPECTED_TOKEN, partialMatch: "']'");
expr = errorMatching(ParserErrorCode.EXPECTED_TOKEN, partialMatch: "']'") ??
errorMatching(ScannerErrorCode.EXPECTED_TOKEN, partialMatch: "']'");
if (expr != null) {
expr = expr.getAncestor((n) => n is ListLiteral);
if (expr != null) {
@ -343,6 +344,7 @@ class StatementCompletionProcessor {
_addInsertEdit(loc, ']');
}
_removeError(ParserErrorCode.EXPECTED_TOKEN, partialMatch: "']'");
_removeError(ScannerErrorCode.EXPECTED_TOKEN, partialMatch: "']'");
var ms =
_findError(ParserErrorCode.EXPECTED_TOKEN, partialMatch: "';'");
if (ms != null) {
@ -425,7 +427,10 @@ class StatementCompletionProcessor {
_findError(ParserErrorCode.EXPECTED_TOKEN, partialMatch: "';'");
if (error != null) {
int insertOffset;
if (expr == null || expr.isSynthetic) {
// Fasta scanner reports unterminated string literal errors
// and generates a synthetic string token with non-zero length.
// Because of this, check for length == 0 rather than isSynthetic.
if (expr == null || expr.length == 0) {
if (node is ReturnStatement) {
insertOffset = (node as ReturnStatement).returnKeyword.end;
} else if (node is ExpressionStatement) {
@ -828,7 +833,8 @@ class StatementCompletionProcessor {
bool _complete_methodCall() {
var parenError =
_findError(ParserErrorCode.EXPECTED_TOKEN, partialMatch: "')'");
_findError(ParserErrorCode.EXPECTED_TOKEN, partialMatch: "')'") ??
_findError(ScannerErrorCode.EXPECTED_TOKEN, partialMatch: "')'");
if (parenError == null) {
return false;
}

5
pkg/analyzer/lib/src/dart/ast/utilities.dart
View file

@ -3977,7 +3977,10 @@ class NodeLocator extends UnifyingAstVisitor<Object> {
Token endToken = node.endToken;
// Don't include synthetic tokens.
while (endToken != beginToken) {
if (endToken.type == TokenType.EOF || !endToken.isSynthetic) {
// Fasta scanner reports unterminated string literal errors
// and generates a synthetic string token with non-zero length.
// Because of this, check for length > 0 rather than !isSynthetic.
if (endToken.type == TokenType.EOF || endToken.length > 0) {
break;
}
endToken = endToken.previous;