From 14ae5708d61059d424c9be9822b85a3f4bb392b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Wed, 11 May 2016 17:28:29 +0300
Subject: console, internal/jsre: colorize JavaScript exceptions too

---
 console/console.go      | 15 +++++----------
 console/console_test.go | 12 ++++++++++++
 2 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'console')

diff --git a/console/console.go b/console/console.go
index 37c9f0afa..d10353093 100644
--- a/console/console.go
+++ b/console/console.go
@@ -182,7 +182,11 @@ func (c *Console) init(preload []string) error {
 	// Preload any JavaScript files before starting the console
 	for _, path := range preload {
 		if err := c.jsre.Exec(path); err != nil {
-			return fmt.Errorf("%s: %v", path, jsErrorString(err))
+			failure := err.Error()
+			if ottoErr, ok := err.(*otto.Error); ok {
+				failure = ottoErr.String()
+			}
+			return fmt.Errorf("%s: %v", path, failure)
 		}
 	}
 	// Configure the console's input prompter for scrollback and tab completion
@@ -269,7 +273,6 @@ func (c *Console) Evaluate(statement string) error {
 		}
 	}()
 	if err := c.jsre.Evaluate(statement, c.printer); err != nil {
-		fmt.Fprintf(c.printer, "%v\n", jsErrorString(err))
 		return err
 	}
 	return nil
@@ -359,11 +362,3 @@ func (c *Console) Stop(graceful bool) error {
 	c.jsre.Stop(graceful)
 	return nil
 }
-
-// jsErrorString adds a backtrace to errors generated by otto.
-func jsErrorString(err error) string {
-	if ottoErr, ok := err.(*otto.Error); ok {
-		return ottoErr.String()
-	}
-	return err.Error()
-}
diff --git a/console/console_test.go b/console/console_test.go
index 5d38331e8..72d3a2df6 100644
--- a/console/console_test.go
+++ b/console/console_test.go
@@ -281,3 +281,15 @@ func TestPrettyPrint(t *testing.T) {
 		t.Fatalf("pretty print mismatch: have %s, want %s", output, want)
 	}
 }
+
+// Tests that the JavaScript exceptions are properly formatted and colored.
+func TestPrettyError(t *testing.T) {
+	tester := newTester(t, nil)
+	defer tester.Close(t)
+	tester.console.Evaluate("throw 'hello'")
+
+	want := jsre.ErrorColor("hello") + "\n"
+	if output := string(tester.output.Bytes()); output != want {
+		t.Fatalf("pretty error mismatch: have %s, want %s", output, want)
+	}
+}
-- 
cgit v1.2.3