frog: life is better with colors :)

frog/source.dart

 // Copyright (c) 2011, 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.
 
 // TODO(jimhug): This should be an interface to work better with tools.
 /**
  * Represents a file of source code.
  */
 class SourceFile implements Comparable {
   // TODO(terry): This filename for in memory buffer.  May need to rework if
@@ skipping 54 matching lines @@
   }
 
   int getColumn(int line, int position) {
     return position - lineStarts[line];
   }
 
   /**
    * Create a pretty string representation from a character position
    * in the file.
    */
-  String getLocationMessage(String message, int start, [int end, bool includeText=false]) {
+  String getLocationMessage(String message, int start,
+      [int end, bool includeText=false]) {
     var line = getLine(start);
     var column = getColumn(line, start);
 
-    var buf = new StringBuffer(
-        '${filename}:${line + 1}:${column + 1}: $message');
+    var buf = new StringBuffer('${filename}:${line + 1}:${column + 1}: $message');

[Jennifer Messerly, 2011/12/06 22:50:03]

long line

[Siggi Cherem (dart-lang), 2011/12/06 23:37:38]

Done.

     if (includeText) {
       buf.add('\n');
       var textLine;
       // +1 for 0-indexing, +1 again to avoid the last line of the file
       if ((line + 2) < _lineStarts.length) {
         textLine = text.substring(_lineStarts[line], _lineStarts[line+1]);
       } else {
         textLine = text.substring(_lineStarts[line]) + '\n';
       }
-      buf.add(textLine);
-      int i = 0;
-      for (; i < column; i++) {
-        buf.add(' ');
-      }
 
       int toColumn = Math.min(column + (end-start), textLine.length);
+      if (options.useColors) {
+        buf.add(textLine.substring(0, column));
+        buf.add(_RED_COLOR);
+        buf.add(textLine.substring(column, toColumn));
+        buf.add(_NO_COLOR);
+        buf.add(textLine.substring(toColumn));
+      } else {
+        buf.add(textLine);
+        int i = 0;
+        for (; i < column; i++) {
+          buf.add(' ');
+        }
 
-      for (; i < toColumn; i++) {
-        buf.add('^');
+        for (; i < toColumn; i++) {

[Jennifer Messerly, 2011/12/06 22:50:03]

Would it be nice to display the arrows even in color mode? I'm thinking if I get
a log file some day from a dumb terminal or something. But I'm not sure.

[Bob Nystrom, 2011/12/06 23:12:46]

+1 for always showing ^^^^

[Siggi Cherem (dart-lang), 2011/12/06 23:37:38]

I added them back, but with colors too. 

I was not convinced of this, because in these cases we shouldn't use colors at
all (use the --no_colors option). Otherwise, the color-escape chars are visible
on plain text. For instance,

code code\033[31merror error\033[0m...
         ^^^^^^^

I made the ^^ colored, so that it aligns well with the error:
code code\033[31merror error\033[0m...
         \033[31m^^^^^^^^^^^\033[0m

+          buf.add('^');
+        }
       }
     }
 
     return buf.toString();
   }
 
   /** Compares two source files. */
   int compareTo(SourceFile other) {
     if (orderInLibrary != null && other.orderInLibrary != null) {
       return orderInLibrary - other.orderInLibrary;
@@ skipping 21 matching lines @@
   final int end;
 
   SourceSpan(this.file, this.start, this.end);
 
   /** Returns the source text corresponding to this [Span]. */
   String get text() {
     return file.text.substring(start, end);
   }
 
   toMessageString(String message) {
-    return file.getLocationMessage(message, start, end, true);
+    return file.getLocationMessage(message, start, end: end, includeText: true);
   }
 
   String get locationText() {
     var line = file.getLine(start);
     var column = file.getColumn(line, start);
     return '${file.filename}:${line + 1}:${column + 1}';
   }
 
   /** Compares two source spans by file and position. Handles nulls. */
   int compareTo(SourceSpan other) {
     if (file == other.file) {
       int d = start - other.start;
       return d == 0 ? (end - other.end) : d;
     }
     return file.compareTo(other.file);
   }
 }