Pass through context information in error messages

lib/src/summary.dart

 // Copyright (c) 2015, 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.
 
 /// Summary of error messages produced by a `SummaryReporter`.
 library dev_compiler.src.summary;
 
 import 'package:source_span/source_span.dart';
 
 /// Summary information computed by the DDC checker.
@@ skipping 134 matching lines @@
   final SourceSpan span;
   final String message;
 
   MessageSummary(this.kind, this.level, this.span, this.message);
 
   Map toJsonMap() => {
     'kind': kind,
     'level': level,
     'message': message,
     'url': '${span.sourceUrl}',
-    'start': span.start.offset,
-    'end': span.end.offset,
+    'start': [span.start.offset, span.start.line, span.start.column],
+    'end': [span.end.offset, span.end.line, span.end.column],
     'text': span.text,
+    'contextLine': span is SourceSpanContext
+        ? (span as SourceSpanContext).contextLine

[Siggi Cherem (dart-lang), 2015/03/23 22:01:44]

it's frustrating that here we are required to put a cast to avoid the static
warning from the spec. Even though `span` is a final field and could be treated
like a local variable in terms of mutation here.

[vsm, 2015/03/23 22:11:34]

You could file a type promo bug on this.  

[Siggi Cherem (dart-lang), 2015/03/26 22:20:18]

We chatted offline: turns out this is a legitimate case. A subclass could
override a final field with a getter, which in turn could return a different
value every time. Oh well.

+        : null,
   };
 
   void accept(SummaryVisitor visitor) => visitor.visitMessage(this);
 
   static MessageSummary parse(Map json) {
-    var start = new SourceLocation(json['start'], sourceUrl: json['url']);
-    var end = new SourceLocation(json['end'], sourceUrl: json['url']);
-    var span = new SourceSpanBase(start, end, json['text']);
+    var start = new SourceLocation(json['start'][0],
+        sourceUrl: json['url'],
+        line: json['start'][1],
+        column: json['start'][2]);
+    var end = new SourceLocation(json['end'][0],
+        sourceUrl: json['url'], line: json['end'][1], column: json['end'][2]);
+    var context = json['contextLine'];
+    var span = context != null
+        ? new SourceSpanWithContext(start, end, json['text'], context)
+        : new SourceSpanBase(start, end, json['text']);
     return new MessageSummary(
         json['kind'], json['level'], span, json['message']);
   }
 }
 
 /// A visitor of the [Summary] hierarchy.
 abstract class SummaryVisitor {
   void visitGlobal(GlobalSummary global);
   void visitPackage(PackageSummary package);
   void visitLibrary(LibrarySummary lib);
@@ skipping 27 matching lines @@
     }
   }
 
   void visitHtml(HtmlSummary html) {
     for (var msg in html.messages) {
       msg.accept(this);
     }
   }
   void visitMessage(MessageSummary message) {}
 }