Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(445)

Unified Diff: pkg/front_end/lib/src/fasta/source/outline_builder.dart

Issue 2725973004: Correctly recover from incorrect imports, etc. (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/front_end/lib/src/fasta/source/outline_builder.dart
diff --git a/pkg/front_end/lib/src/fasta/source/outline_builder.dart b/pkg/front_end/lib/src/fasta/source/outline_builder.dart
index 460ccfa44ecde1f3403f150722ee28d80aaf6585..2f9304c0b798e1312876328322e154cd43b8bf54 100644
--- a/pkg/front_end/lib/src/fasta/source/outline_builder.dart
+++ b/pkg/front_end/lib/src/fasta/source/outline_builder.dart
@@ -121,8 +121,10 @@ class OutlineBuilder extends UnhandledListener {
Unhandled conditionalUris = pop();
String uri = pop();
List<MetadataBuilder> metadata = pop();
- library.addExport(
- metadata, uri, conditionalUris, combinators, exportKeyword.charOffset);
+ if (uri != null) {
+ library.addExport(metadata, uri, conditionalUris, combinators,
+ exportKeyword.charOffset);
+ }
checkEmpty(exportKeyword.charOffset);
}
@@ -135,24 +137,34 @@ class OutlineBuilder extends UnhandledListener {
Unhandled conditionalUris = pop();
String uri = pop();
List<MetadataBuilder> metadata = pop();
- library.addImport(
- metadata,
- uri,
- conditionalUris,
- prefix,
- combinators,
- deferredKeyword != null,
- importKeyword.charOffset,
- asKeyword?.next?.charOffset ?? -1);
+ if (uri != null) {
+ library.addImport(
+ metadata,
+ uri,
+ conditionalUris,
+ prefix,
+ combinators,
+ deferredKeyword != null,
+ importKeyword.charOffset,
+ asKeyword?.next?.charOffset ?? -1);
+ }
checkEmpty(importKeyword.charOffset);
}
@override
+ void handleRecoverExpression(Token token) {
+ debugEvent("RecoverExpression");
+ push(NullValue.Expression);
+ }
+
+ @override
void endPart(Token partKeyword, Token semicolon) {
debugEvent("Part");
String uri = pop();
List<MetadataBuilder> metadata = pop();
- library.addPart(metadata, uri);
+ if (uri != null) {
+ library.addPart(metadata, uri);
+ }
checkEmpty(partKeyword.charOffset);
}
« no previous file with comments | « pkg/front_end/lib/src/fasta/parser/parser.dart ('k') | pkg/front_end/lib/src/fasta/source/stack_listener.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698