Introduce span with line context

lib/src/file.dart

 // Copyright (c) 2014, 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_span.file;
 
 import 'dart:math' as math;
 import 'dart:typed_data';
 
 import 'package:path/path.dart' as p;
@@ skipping 30 matching lines @@
 
   /// The length of the file in characters.
   int get length => _decodedChars.length;
 
   /// The number of lines in the file.
   int get lines => _lineStarts.length;
 
   /// Creates a new source file from [text].
   ///
   /// [url] may be either a [String], a [Uri], or `null`.
-  SourceFile(String text, {url})
-      : this.decoded(text.runes, url: url);
+  SourceFile(String text, {url}) : this.decoded(text.runes, url: url);
 
   /// Creates a new source file from a list of decoded characters.
   ///
   /// [url] may be either a [String], a [Uri], or `null`.
   SourceFile.decoded(Iterable<int> decodedChars, {url})
       : url = url is String ? Uri.parse(url) : url,
         _decodedChars = new Uint32List.fromList(decodedChars.toList()) {
     for (var i = 0; i < _decodedChars.length; i++) {
       var c = _decodedChars[i];
       if (c == _CR) {
@@ skipping 94 matching lines @@
 ///
 /// A [FileLocation] can be created using [SourceFile.location].
 class FileLocation extends SourceLocation {
   /// The [file] that [this] belongs to.
   final SourceFile file;
 
   Uri get sourceUrl => file.url;
   int get line => file.getLine(offset);
   int get column => file.getColumn(offset);
 
-  FileLocation._(this.file, int offset)
-      : super(offset) {
+  FileLocation._(this.file, int offset) : super(offset) {
     if (offset > file.length) {
       throw new RangeError("Offset $offset must not be greater than the number "
           "of characters in the file, ${file.length}.");
     }
   }
 
   FileSpan pointSpan() => new FileSpan._(file, offset, offset);
 }
 
 /// A [SourceSpan] within a [SourceFile].
 ///
 /// Unlike the base [SourceSpan], [FileSpan] lazily computes its line and column
 /// values based on its offset and the contents of [file]. [FileSpan.message] is
 /// also able to provide more context then [SourceSpan.message], and
 /// [FileSpan.union] will return a [FileSpan] if possible.
 ///
 /// A [FileSpan] can be created using [SourceFile.span].
-class FileSpan extends SourceSpanMixin {
+class FileSpan extends SourceSpanMixin implements SourceSpanWithContext {
   /// The [file] that [this] belongs to.
   final SourceFile file;
 
   /// The offset of the beginning of the span.
   ///
   /// [start] is lazily generated from this to avoid allocating unnecessary
   /// objects.
   final int _start;
 
   /// The offset of the end of the span.
   ///
   /// [end] is lazily generated from this to avoid allocating unnecessary
   /// objects.
   final int _end;
 
   Uri get sourceUrl => file.url;
   int get length => _end - _start;
   FileLocation get start => new FileLocation._(file, _start);
   FileLocation get end => new FileLocation._(file, _end);
   String get text => file.getText(_start, _end);
 
+  String get context {
+    var line = start.line;
+    return file.getText(file.getOffset(line),
+        line == file.lines - 1 ? null : file.getOffset(line + 1));
+  }
+
   FileSpan._(this.file, this._start, this._end) {
     if (_end < _start) {
       throw new ArgumentError('End $_end must come after start $_start.');
     } else if (_end > file.length) {
       throw new RangeError("End $_end must not be greater than the number "
           "of characters in the file, ${file.length}.");
     } else if (_start < 0) {
       throw new RangeError("Start may not be negative, was $_start.");
     }
   }
@@ skipping 15 matching lines @@
 
     if (beginSpan._end < endSpan._start) {
       throw new ArgumentError("Spans $this and $other are disjoint.");
     }
 
     return span;
   }
 
   bool operator ==(other) {
     if (other is! FileSpan) return super == other;
-    return _start == other._start && _end == other._end &&
+    return _start == other._start &&
+        _end == other._end &&
         sourceUrl == other.sourceUrl;
   }
 
-  int get hashCode => _start.hashCode + 5 * _end.hashCode +
-      7 * sourceUrl.hashCode;
+  int get hashCode =>
+      _start.hashCode + 5 * _end.hashCode + 7 * sourceUrl.hashCode;
 
   /// Returns a new span that covers both [this] and [other].
   ///
   /// Unlike [union], [other] may be disjoint from [this]. If it is, the text
   /// between the two will be covered by the returned span.
   FileSpan expand(FileSpan other) {
     if (sourceUrl != other.sourceUrl) {
       throw new ArgumentError("Source URLs \"${sourceUrl}\" and "
           " \"${other.sourceUrl}\" don't match.");
     }
 
     var start = math.min(this._start, other._start);
     var end = math.max(this._end, other._end);
     return new FileSpan._(file, start, end);
   }
-
-  String message(String message, {color}) {
-    if (color == true) color = colors.RED;
-    if (color == false) color = null;
-
-    var line = start.line;
-    var column = start.column;
-
-    var buffer = new StringBuffer();
-    buffer.write('line ${start.line + 1}, column ${start.column + 1}');
-    if (sourceUrl != null) buffer.write(' of ${p.prettyUri(sourceUrl)}');
-    buffer.write(': $message\n');
-
-    var textLine = file.getText(file.getOffset(line),
-        line == file.lines - 1 ? null : file.getOffset(line + 1));
-
-    column = math.min(column, textLine.length - 1);
-    var toColumn =
-        math.min(column + end.offset - start.offset, textLine.length);
-
-    if (color != null) {
-      buffer.write(textLine.substring(0, column));
-      buffer.write(color);
-      buffer.write(textLine.substring(column, toColumn));
-      buffer.write(colors.NONE);
-      buffer.write(textLine.substring(toColumn));
-    } else {
-      buffer.write(textLine);
-    }
-    if (!textLine.endsWith('\n')) buffer.write('\n');
-
-    buffer.write(' ' * column);
-    if (color != null) buffer.write(color);
-    buffer.write('^' * math.max(toColumn - column, 1));
-    if (color != null) buffer.write(colors.NONE);
-    return buffer.toString();
-  }
 }