Introduce span with line context

lib/src/span_mixin.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.span_mixin;
 
+import 'dart:math' as math;
 import 'package:path/path.dart' as p;
 
 import 'colors.dart' as colors;
 import 'span.dart';
+import 'span_context.dart';
 import 'utils.dart';
 
 /// A mixin for easily implementing [SourceSpan].
 ///
 /// This implements the [SourceSpan] methods in terms of [start], [end], and
 /// [text]. This assumes that [start] and [end] have the same source URL, that
 /// [start] comes before [end], and that [text] has a number of characters equal
 /// to the distance between [start] and [end].
 abstract class SourceSpanMixin implements SourceSpan {
   Uri get sourceUrl => start.sourceUrl;
@@ skipping 21 matching lines @@
 
     var text = beginSpan.text +
         endSpan.text.substring(beginSpan.end.distance(endSpan.start));
     return new SourceSpan(start, end, text);
   }
 
   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}');
+    buffer.write('line ${line + 1}, column ${column + 1}');
     if (sourceUrl != null) buffer.write(' of ${p.prettyUri(sourceUrl)}');
     buffer.write(': $message');
-    if (length == 0) return buffer.toString();
 
+    var textLine;

[Siggi Cherem (dart-lang), 2015/03/21 00:19:59]

this condition is the only new part, the rest of the code is basically what we
had in file_span.message

+    if (this is SourceSpanContext) {
+      textLine = this.contextLine;
+      column = math.min(column, textLine.length - 1);
+    } else {
+      textLine = text.split("\n").first;
+      column = 0;
+    }
+
+    if (length == 0 && textLine.isEmpty) return buffer.toString();
     buffer.write("\n");
-    var textLine = text.split("\n").first;
+
+    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(textLine);
-    buffer.write("\n");
-    buffer.write('^' * textLine.length);
+    buffer.write('^' * math.max(toColumn - column, 1));
     if (color != null) buffer.write(colors.NONE);
     return buffer.toString();
   }
 
   bool operator ==(other) => other is SourceSpan &&
       start == other.start && end == other.end;
 
   int get hashCode => start.hashCode + (31 * end.hashCode);
 
   String toString() => '<$runtimeType: from $start to $end "$text">';
 }