Make lines and columns one-based in SourceLocation.

pkg/compiler/lib/src/io/source_information.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.
 
 library dart2js.source_information;
 
 import 'package:kernel/ast.dart' show Location;
 import '../common.dart';
 import '../elements/elements.dart'
     show
@@ skipping 145 matching lines @@
 /// A location in a source file.
 abstract class SourceLocation {
   const SourceLocation();
 
   /// The absolute URI of the source file of this source location.
   Uri get sourceUri;
 
   /// The character offset of the this source location into the source file.
   int get offset;
 
-  /// The 0-based line number of the [offset].
+  /// The 1-based line number of the [offset].
   int get line;
 
-  /// The 0-base column number of the [offset] with its line.
+  /// The 1-based column number of the [offset] with its line.
   int get column;
 
   /// The name associated with this source location, if any.
   String get sourceName;
 
   /// `true` if the offset within the length of the source file.
   bool get isValid;
 
   int get hashCode {
     return sourceUri.hashCode * 17 +
         offset.hashCode * 17 +
         sourceName.hashCode * 23;
   }
 
   bool operator ==(other) {
     if (identical(this, other)) return true;
     if (other is! SourceLocation) return false;
     return sourceUri == other.sourceUri &&
         offset == other.offset &&
         sourceName == other.sourceName;
   }
 
-  String get shortText {
-    // Use 1-based line/column info to match usual dart tool output.
-    return '${sourceUri.pathSegments.last}:[${line + 1},${column + 1}]';
-  }
+  String get shortText => '${sourceUri.pathSegments.last}:[$line,$column]';
 
-  String toString() {
-    // Use 1-based line/column info to match usual dart tool output.
-    return '${sourceUri}:[${line + 1},${column + 1}]';
-  }
+  String toString() => '${sourceUri}:[${line},${column}]';
 }
 
 /// A location in a source file.
 abstract class AbstractSourceLocation extends SourceLocation {
   final SourceFile _sourceFile;
   Location _location;
 
   AbstractSourceLocation(this._sourceFile) {
     assert(invariant(new SourceSpan(sourceUri, 0, 0), isValid,
         message: "Invalid source location in ${sourceUri}: "
             "offset=$offset, length=${_sourceFile.length}."));
   }
 
   /// The absolute URI of the source file of this source location.
   Uri get sourceUri => _sourceFile.uri;
 
   /// The character offset of the this source location into the source file.
   int get offset;
 
-  /// The 0-based line number of the [offset].
-  int get line {
-    _location ??= _sourceFile.getLocation(offset);
-    return _location.line - 1;
-  }
+  /// The 1-based line number of the [offset].
+  int get line => (_location ??= _sourceFile.getLocation(offset)).line;
 
-  /// The 0-base column number of the [offset] with its line.
-  int get column {
-    _location ??= _sourceFile.getLocation(offset);
-    return _location.column - 1;
-  }
+  /// The 1-based column number of the [offset] with its line.
+  int get column => (_location ??= _sourceFile.getLocation(offset)).column;
 
   /// The name associated with this source location, if any.
   String get sourceName;
 
   /// `true` if the offset within the length of the source file.
   bool get isValid => offset < _sourceFile.length;
 
-  String get shortText {
-    // Use 1-based line/column info to match usual dart tool output.
-    return '${sourceUri.pathSegments.last}:[${line + 1},${column + 1}]';
-  }
+  String get shortText => '${sourceUri.pathSegments.last}:[$line,$column]';
 
-  String toString() {
-    // Use 1-based line/column info to match usual dart tool output.
-    return '${sourceUri}:[${line + 1},${column + 1}]';
-  }
+  String toString() => '${sourceUri}:[$line,$column]';
 }
 
 class OffsetSourceLocation extends AbstractSourceLocation {
   final int offset;
   final String sourceName;
 
   OffsetSourceLocation(SourceFile sourceFile, this.offset, this.sourceName)
       : super(sourceFile);
 
-  String get shortText {
-    return '${super.shortText}:$sourceName';
-  }
+  String get shortText => '${super.shortText}:$sourceName';
 
-  String toString() {
-    return '${super.toString()}:$sourceName';
-  }
+  String toString() => '${super.toString()}:$sourceName';
 }
 
 /// Compute the source map name for [element].
 String computeElementNameForSourceMaps(AstElement element) {
   if (element.isClosure) {
     return computeElementNameForSourceMaps(element.enclosingElement);
   } else if (element.isClass) {
     return element.name;
   } else if (element.isConstructor || element.isGenerativeConstructorBody) {
     String className = element.enclosingClass.name;
@@ skipping 65 matching lines @@
   @override
   int get line => null;
 
   @override
   int get offset => null;
 
   String get shortName => '<no-location>';
 
   String toString() => '<no-location>';
 }