Update dart2js to use diagnostic kinds.

dart/lib/compiler/implementation/source_file.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('source_file');
 
 #import('colors.dart', prefix: 'colors');
 
 /**
  * Represents a file of source code.
@@ skipping 35 matching lines @@
   }
 
   int getColumn(int line, int position) {
     return position - lineStarts[line];
   }
 
   /**
    * Create a pretty string representation from a character position
    * in the file.
    */
-  String getLocationMessage(String message, int start,
-      [int end, bool includeText = false]) {
+  String getLocationMessage(String message, int start, int end,
+                            bool includeText, String color(String x)) {
     var line = getLine(start);
     var column = getColumn(line, start);
 
     var buf = new StringBuffer(
         '${filename}:${line + 1}:${column + 1}: $message');
     if (includeText) {
       buf.add('\n');
       var textLine;
       // +1 for 0-indexing, +1 again to avoid the last line of the file
       if ((line + 2) < _lineStarts.length) {
         textLine = text.substring(_lineStarts[line], _lineStarts[line+1]);
       } else {
         textLine = '${text.substring(_lineStarts[line])}\n';
       }
 
       int toColumn = Math.min(column + (end-start), textLine.length);
-      if (colors.enabled) {
-        buf.add(textLine.substring(0, column));
-        buf.add(colors.RED_COLOR);
-        buf.add(textLine.substring(column, toColumn));
-        buf.add(colors.NO_COLOR);
-        buf.add(textLine.substring(toColumn));
-      } else {
-        buf.add(textLine);
-      }
+      buf.add(textLine.substring(0, column));
+      buf.add(color(textLine.substring(column, toColumn)));
+      buf.add(textLine.substring(toColumn));
 
       int i = 0;
       for (; i < column; i++) {
         buf.add(' ');
       }
 
-      if (colors.enabled) buf.add(colors.RED_COLOR);
       for (; i < toColumn; i++) {
-        buf.add('^');
+        buf.add(color('^'));
       }
-      if (colors.enabled) buf.add(colors.NO_COLOR);
     }
 
     return buf.toString();
   }
 }