Improve detection of compile-time errors.

pkg/front_end/lib/src/fasta/kernel/body_builder.dart

 // Copyright (c) 2016, 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 fasta.body_builder;
 
 import '../parser/parser.dart' show FormalParameterType, optional;
 
 import '../parser/error_kind.dart' show ErrorKind;
 
 import '../parser/identifier_context.dart' show IdentifierContext;
 
 import 'package:kernel/ast.dart';
 
 import 'package:kernel/clone.dart' show CloneVisitor;
 
 import 'package:kernel/transformations/flags.dart' show TransformerFlag;
 
 import 'package:kernel/class_hierarchy.dart' show ClassHierarchy;
 
 import 'package:kernel/core_types.dart' show CoreTypes;
 
 import '../parser/dart_vm_native.dart' show skipNativeClause;
 
 import '../scanner/token.dart'
     show BeginGroupToken, Token, isBinaryOperator, isMinusOperator;
 
-import '../errors.dart' show internalError, printUnexpected;
+import '../errors.dart' show formatUnexpected, internalError;
 
 import '../source/scope_listener.dart'
     show JumpTargetKind, NullValue, ScopeListener;
 
 import '../builder/scope.dart' show AccessErrorBuilder, AmbiguousBuilder, Scope;
 
 import '../source/outline_builder.dart' show asyncMarkerFromTokens;
 
 import 'builder_accessors.dart';
 
@@ skipping 66 matching lines @@
 
   final bool isDartLibrary;
 
   @override
   final Uri uri;
 
   Scope formalParameterScope;
 
   bool isFirstIdentifier = false;
 
-  bool hasParserError = false;
-
   bool inInitializer = false;
 
   bool inCatchClause = false;
 
   int functionNestingLevel = 0;
 
   Statement compileTimeErrorInTry;
 
   Statement compileTimeErrorInLoopOrSwitch;
 
   Scope switchScope;
 
   CloneVisitor cloner;
 
   BodyBuilder(
       KernelLibraryBuilder library,
       this.member,
       Scope scope,
       this.formalParameterScope,
       this.hierarchy,
       this.coreTypes,
       this.classBuilder,
       this.isInstanceMember,
       this.uri)
       : enclosingScope = scope,
         library = library,
         isDartLibrary = library.uri.scheme == "dart",
         super(scope);
 
+  bool get hasParserError => recoverableErrors.isNotEmpty;
+
   bool get inConstructor {
     return functionNestingLevel == 0 && member is KernelConstructorBuilder;
   }
 
   bool get isInstanceContext {
     return isInstanceMember || member is KernelConstructorBuilder;
   }
 
   @override
   void push(Object node) {
@@ skipping 2041 matching lines @@
 
   @override
   void handleModifiers(int count) {
     debugEvent("Modifiers");
     // TODO(ahe): Copied from outline_builder.dart.
     push(popList(count) ?? NullValue.Modifiers);
   }
 
   @override
   void handleRecoverableError(Token token, ErrorKind kind, Map arguments) {
+    bool silent = hasParserError;
     super.handleRecoverableError(token, kind, arguments);
-    if (!hasParserError) {
-      printUnexpected(uri, recoverableErrors.last.beginOffset,
-          '${recoverableErrors.last.kind}');
-    }
-    hasParserError = true;
+    addCompileTimeError(recoverableErrors.last.beginOffset,
+        '${recoverableErrors.last.kind} $arguments',
+        silent: silent);
   }
 
   @override
   Token handleUnrecoverableError(Token token, ErrorKind kind, Map arguments) {
     if (isDartLibrary && kind == ErrorKind.ExpectedFunctionBody) {
       Token recover = skipNativeClause(token);
       if (recover != null) return recover;
     } else if (kind == ErrorKind.UnexpectedToken) {
       String expected = arguments["expected"];
       const List<String> trailing = const <String>[")", "}", ";", ","];
       if (trailing.contains(token.stringValue) && trailing.contains(expected)) {
         arguments.putIfAbsent("actual", () => token.value);
         handleRecoverableError(token, ErrorKind.ExpectedButGot, arguments);
         return newSyntheticToken(token);
       }
     }
     return super.handleUnrecoverableError(token, kind, arguments);
   }
 
   @override
   Expression buildCompileTimeError(error, [int charOffset = -1]) {
-    String message = printUnexpected(uri, charOffset, error);
+    addCompileTimeError(charOffset, error);
+    String message = formatUnexpected(uri, charOffset, error);
     Builder constructor = library.loader.getCompileTimeError();
     return new Throw(buildStaticInvocation(constructor.target,
         new Arguments(<Expression>[new StringLiteral(message)]),
         isConst: false)); // TODO(ahe): Make this const.
   }
 
   Statement buildCompileTimeErrorStatement(error, [int charOffset = -1]) {
     return new ExpressionStatement(buildCompileTimeError(error, charOffset));
   }
 
@@ skipping 18 matching lines @@
   void handleOperator(Token token) {
     debugEvent("Operator");
     push(new Operator(token.stringValue)..fileOffset = token.charOffset);
   }
 
   @override
   void handleSymbolVoid(Token token) {
     logEvent("SymbolVoid");
   }
 
-  dynamic addCompileTimeError(int charOffset, String message) {
-    return library.addCompileTimeError(charOffset, message, uri);
+  dynamic addCompileTimeError(int charOffset, String message,
+      {bool silent: false}) {
+    return library.addCompileTimeError(charOffset, message, fileUri: uri);
   }
 
   @override
   void handleInvalidFunctionBody(Token token) {
     if (member.isNative) {
       push(NullValue.FunctionBody);
     } else {
       push(new Block(<Statement>[new InvalidStatement()]));
     }
   }
@@ skipping 438 matching lines @@
   } else if (node is PrefixBuilder) {
     return node.name;
   } else if (node is ThisAccessor) {
     return node.isSuper ? "super" : "this";
   } else if (node is BuilderAccessor) {
     return node.plainNameForRead;
   } else {
     return internalError("Unhandled: ${node.runtimeType}");
   }
 }