Support static field access in analyzer2dart.

sdk/lib/_internal/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 'dart:math';
 import 'dart:convert' show UTF8;
 
 /**
  * Represents a file of source code. The content can be either a [String] or
  * a UTF-8 encoded [List<int>] of bytes.
  */
 abstract class SourceFile {
 
   /** The name of the file. */
-  final String filename;
-
-  SourceFile(this.filename);
+  String get filename;
 
   /** The text content of the file represented as a String. */
   String slowText();
 
   /** The content of the file represented as a UTF-8 encoded [List<int>]. */
   List<int> slowUtf8Bytes();
 
   /**
    * The length of the string representation of this source file, i.e.,
    * equivalent to [:slowText().length:], but faster.
@@ skipping 73 matching lines @@
    * Returns the column number for the offset [position] in the string
    * representation of this source file.
    */
   int getColumn(int line, int position) {
     return position - lineStarts[line];
   }
 
   String slowSubstring(int start, int end);
 
   /**
-   * Create a pretty string representation from a character position
-   * in the file.
+   * Create a pretty string representation for [message] from a character
+   * range `[start, end]` in this file.
+   *
+   * If [includeSourceLine] is `true` the first source line code line that
+   * contains the range will be included as well as marker characters ('^')
+   * underlining the range.
+   *
+   * Use [colorize] to wrap source code text and marker characters in color
+   * escape codes.
    */
   String getLocationMessage(String message, int start, int end,
-                            bool includeText, String color(String x)) {
+                            {bool includeSourceLine: true,
+                             String colorize(String text)}) {
+    if (colorize == null) {
+      colorize = (text) => text;
+    }
     var line = getLine(start);
     var column = getColumn(line, start);
 
     var buf = new StringBuffer('${filename}:');
     if (start != end || start != 0) {
       // Line/column info is relevant.
       buf.write('${line + 1}:${column + 1}:');
     }
     buf.write('\n$message\n');
 
-    if (start != end && includeText) {
+    if (start != end && includeSourceLine) {
       String textLine;
       // +1 for 0-indexing, +1 again to avoid the last line of the file
       if ((line + 2) < lineStarts.length) {
         textLine = slowSubstring(lineStarts[line], lineStarts[line+1]);
       } else {
         textLine = '${slowSubstring(lineStarts[line], length)}\n';
       }
 
       int toColumn = min(column + (end-start), textLine.length);
       buf.write(textLine.substring(0, column));
-      buf.write(color(textLine.substring(column, toColumn)));
+      buf.write(colorize(textLine.substring(column, toColumn)));
       buf.write(textLine.substring(toColumn));
 
       int i = 0;
       for (; i < column; i++) {
         buf.write(' ');
       }
 
       for (; i < toColumn; i++) {
-        buf.write(color('^'));
+        buf.write(colorize('^'));
       }
     }
 
     return buf.toString();
   }
 }
 
 class Utf8BytesSourceFile extends SourceFile {
+  final String filename;
 
   /** The UTF-8 encoded content of the source file. */
   final List<int> content;
 
-  Utf8BytesSourceFile(String filename, this.content) : super(filename);
+  Utf8BytesSourceFile(this.filename, this.content);
 
   String slowText() => UTF8.decode(content);
 
   List<int> slowUtf8Bytes() => content;
 
   String slowSubstring(int start, int end) {
     // TODO(lry): to make this faster, the scanner could record the UTF-8 slack
     // for all positions of the source text. We could use [:content.sublist:].
     return slowText().substring(start, end);
   }
@@ skipping 17 matching lines @@
 
   String slowText() {
     if (cachedText == null) {
       cachedText = super.slowText();
     }
     return cachedText;
   }
 }
 
 class StringSourceFile extends SourceFile {
-
+  final String filename;
   final String text;
 
-  StringSourceFile(String filename, this.text) : super(filename);
+  StringSourceFile(this.filename, this.text);
 
   int get length => text.length;
   set length(int v) { }
 
   String slowText() => text;
 
   List<int> slowUtf8Bytes() => UTF8.encode(text);
 
   String slowSubstring(int start, int end) => text.substring(start, end);
 }