console, internal/jsre: colorize JavaScript exceptions too

1 files changed, 5 insertions, 10 deletions

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()
-}