From bf7bb540d8e08616e76115271ac5fcfa6aefdfe2 Mon Sep 17 00:00:00 2001
From: An Ko <an@cyan.io>
Date: Sat, 26 Sep 2015 21:30:09 +0200
Subject: [PATCH] Mark error positions with colour

And for contexts where colour doesn't show up, show the line number and
offset also.

Significantly improves #9.
---
 package.json |  1 +
 src/cli.ls   | 38 +++++++++++++++++++++++++++++---------
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index e692d3f..b549993 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
     "tmp": "0.0.27"
   },
   "dependencies": {
+    "chalk": "^1.1.1",
     "concat-stream": "^1.4.7",
     "escodegen": "^1.4.1",
     "esutils": "^2.0.2",
diff --git a/src/cli.ls b/src/cli.ls
index 678630e..df8eb49 100644
--- a/src/cli.ls
+++ b/src/cli.ls
@@ -2,7 +2,7 @@ concat  = require \concat-stream
 { zip } = require \prelude-ls
 spawn   = (require \child_process).spawn
 esl     = require \./index
-require! <[ fs path nopt ]>
+require! <[ fs path nopt chalk ]>
 
 { InvalidAstError } = require \esvalid
 
@@ -72,10 +72,15 @@ compile-and-show = (code) ->
     console.log esl code, compiler-opts
   catch err
     if err instanceof InvalidAstError
-      console.error "[Error]" err.message
+      console.error (chalk.red "[Error]") + " " + err.message
       point-at-problem code, err.node
     else throw err
 
+string-splice = (string, start, end, inserted-text="") ->
+    (string.slice 0, start) +
+      inserted-text +
+      (string.slice end, string.length)
+
 # Use the node's location data (if present) to show the lines on which the
 # problem occurred.
 point-at-problem = (input, problematic-node) ->
@@ -86,17 +91,32 @@ point-at-problem = (input, problematic-node) ->
       problematic-node
       (k, v) -> if k is \location then undefined else v
     console.error "  #stringified-node"
-    console.error "  [ #location ]"
+    console.error chalk.yellow "  [ #location ]"
   | \Object =>
     { start, end } = location
-    line = input
+    lines = input
       .split "\n"
       .slice (start.line - 1), end.line
       .join "\n"
-    underline = " " * (start.offset - 1) +
-                "^" * (end.offset - start.offset)
-    console.error "  " + line
-    console.error "  " + underline
+
+    # Subtract 1 from both offsets because of open-paren that's implicitly
+    # added to the input
+    # inputs.
+    start-offset = start.offset - 1
+    end-offset   = end.offset   - 1
+
+    highlighted-part = chalk.black.bg-yellow (lines.slice start-offset, end-offset)
+
+    highlighted-lines = string-splice do
+      lines
+      start-offset
+      end-offset
+      highlighted-part
+
+    console.error "At line #{chalk.green start.line}, \
+                   offset #{chalk.green start-offset}:"
+    console.error "\n#highlighted-lines\n"
+
   | _ => throw Error "Internal error: unexpected location type"
 
 if target-path
@@ -130,7 +150,7 @@ else
           |> callback null, _
         catch err
           if err instanceof InvalidAstError
-            console.error "[Error]" err.message
+            console.error (chalk.red "[Error]") + " " + err.message
             point-at-problem cmd, err.node
             callback null
           else throw err