Update dart2js to use diagnostic kinds.

dart/lib/compiler/implementation/dart2js.dart

 // Copyright (c) 2012, 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('dart2js');
 
 #import('dart:io');
 #import('dart:uri');
 #import('dart:utf');
 
@@ skipping 57 matching lines @@
   Uri cwd = getCurrentDirectory();
   bool throwOnError = false;
   bool showWarnings = true;
   bool verbose = false;
   Uri libraryRoot = cwd;
   Uri out = cwd.resolve('out.js');
   Uri packageRoot = null;
   List<String> options = new List<String>();
   bool explicitOut = false;
   bool wantHelp = false;
+  bool enableColors = true;
 
   passThrough(String argument) => options.add(argument);
 
   setLibraryRoot(String argument) {
     libraryRoot = cwd.resolve(extractPath(argument));
   }
 
   setPackageRoot(String argument) {
     packageRoot = cwd.resolve(extractPath(argument));
   }
@@ skipping 27 matching lines @@
   List<OptionHandler> handlers = <OptionHandler>[
     new OptionHandler('-[chv?]+', handleShortOptions),
     new OptionHandler('--throw-on-error', (_) => throwOnError = true),
     new OptionHandler('--suppress-warnings', (_) => showWarnings = false),
     new OptionHandler('--output-type=dart|--output-type=js', passThrough),
     new OptionHandler('--verbose', (_) => verbose = true),
     new OptionHandler('--library-root=.+', setLibraryRoot),
     new OptionHandler('--out=.+|-o.+', setOutput),
     new OptionHandler('--allow-mock-compilation', passThrough),
     new OptionHandler('--unparse-validation', passThrough),
-    new OptionHandler('--no-colors', (_) => colors.enabled = false),
+    new OptionHandler('--no-colors', (_) => enableColors = false),
     new OptionHandler('--enable[_-]checked[_-]mode|--checked',
                       (_) => passThrough('--enable-checked-mode')),
     new OptionHandler(@'--help|/\?|/h', (_) => wantHelp = true),
     new OptionHandler(@'--package-root=.+|-p.+', setPackageRoot),
     // The following two options must come last.
     new OptionHandler('-.*', (String argument) {
       helpAndFail('Error: Unknown option "$argument".');
     }),
     new OptionHandler('.*', (String argument) {
       arguments.add(nativeToUriPath(argument));
@@ skipping 24 matching lines @@
       source = readAll(uriPathToNative(uri.path));
     } catch (FileIOException ex) {
       throw 'Error: Cannot read "${relativize(cwd, uri)}" (${ex.osError}).';
     }
     dartBytesRead += source.length;
     sourceFiles[uri.toString()] =
       new SourceFile(relativize(cwd, uri), source);
     return new Future.immediate(source);
   }
 
-  void info(var message) {
-    if (verbose) print('${colors.green("info:")} $message');
+  void info(var message, [api.Diagnostic kind = api.Diagnostic.VERBOSE_INFO]) {
+    if (!verbose && kind === api.Diagnostic.VERBOSE_INFO) return;
+    print('${colors.green("info:")} $message');
   }
 
   bool isAborting = false;
 
-  void handler(Uri uri, int begin, int end, String message, bool fatal) {
+  final int FATAL = api.Diagnostic.CRASH.ordinal | api.Diagnostic.ERROR.ordinal;
+  final int INFO =
+      api.Diagnostic.INFO.ordinal | api.Diagnostic.VERBOSE_INFO.ordinal;
+
+  void handler(Uri uri, int begin, int end, String message,
+               api.Diagnostic kind) {
     if (isAborting) return;
-    if (uri === null && !fatal) {
-      info(message);
+    isAborting = kind === api.Diagnostic.CRASH;
+    bool fatal = (kind.ordinal & FATAL) != 0;
+    bool isInfo = (kind.ordinal & INFO) != 0;
+    if (isInfo) {
+      assert(uri === null);
+      info(message, kind);
       return;
     }
+    var color;
+    if (!enableColors) {
+      color = (x) => x;
+    } else if (kind === api.Diagnostic.ERROR) {
+      color = colors.red;
+    } else if (kind === api.Diagnostic.WARNING) {
+      color = colors.magenta;
+    } else if (kind === api.Diagnostic.LINT) {
+      color = colors.magenta;
+    } else if (kind === api.Diagnostic.CRASH) {
+      color = colors.red;
+    } else {
+      throw 'Unknown kind: $kind (${kind.ordinal})';
+    }
     if (uri === null) {
       assert(fatal);
-      print(message);
+      print(color(message));
     } else if (fatal || showWarnings) {
       SourceFile file = sourceFiles[uri.toString()];
-      print(file.getLocationMessage(message, begin, end, true));
+      print(file.getLocationMessage(color(message), begin, end, true,
+                                    color));
     }
     if (fatal && throwOnError) {
       isAborting = true;
       throw new AbortLeg(message);
     }
   }
 
   Uri uri = cwd.resolve(arguments[0]);
   if (packageRoot === null) {
     packageRoot = uri.resolve('./packages/');
@@ skipping 140 matching lines @@
     } catch (var ignored) {
       print('Internal error: error while printing exception');
     }
     try {
       print(trace);
     } finally {
       exit(253); // 253 is recognized as a crash by our test scripts.
     }
   }
 }