Fix shift in source map positions.

pkg/compiler/lib/src/io/line_column_provider.dart

Index: pkg/compiler/lib/src/io/line_column_provider.dart
diff --git a/pkg/compiler/lib/src/io/line_column_provider.dart b/pkg/compiler/lib/src/io/line_column_provider.dart
index 5aa700cca4a738e5a909b00bf1e7e1c7070a678a..4d17583fb9f5b972cf93b2dbf67c7811e4b4faa9 100644
--- a/pkg/compiler/lib/src/io/line_column_provider.dart
+++ b/pkg/compiler/lib/src/io/line_column_provider.dart
@@ -18,20 +18,19 @@ abstract class LineColumnProvider {
 /// [CodeOutputListener] that collects line information.
 class LineColumnCollector extends CodeOutputListener
     implements LineColumnProvider {
-  int lastLineStart = 0;
+  int length = 0;
   List<int> lineStarts = <int>[0];
 
   void _collect(String text) {
-    int offset = lastLineStart;
     int index = 0;
     while (index < text.length) {
       // Unix uses '\n' and Windows uses '\r\n', so this algorithm works for
       // both platforms.
       index = text.indexOf('\n', index) + 1;
       if (index <= 0) break;
-      lastLineStart = offset + index;
-      lineStarts.add(lastLineStart);
+      lineStarts.add(length + index);
     }
+    length += text.length;
   }
 
   @override
@@ -43,7 +42,7 @@ class LineColumnCollector extends CodeOutputListener
   int getLine(int offset) {
     List<int> starts = lineStarts;
     if (offset < 0 || starts.last <= offset) {
-      throw 'bad position #$offset in buffer with length ${lineStarts.last}.';
+      throw 'bad position #$offset in buffer with length ${length}.';
     }
     int first = 0;
     int count = starts.length;
@@ -68,6 +67,11 @@ class LineColumnCollector extends CodeOutputListener
 
   @override
   void onDone(int length) {
-    lineStarts.add(length);
+    lineStarts.add(length + 1);
+    this.length = length;
+  }
+
+  String toString() {

[floitsch, 2015/02/02 10:17:57]

keep?

[Johnni Winther, 2015/02/02 10:49:25]

Nice for debugging and used by the test in case of error.

+    return 'lineStarts=$lineStarts,length=$length';
   }
 }