repl: use object writer for thrown errors

addaleax · BridgeAR · commit 4c254d62942e · 2019-03-04T15:33:01.000+01:00
This makes us use the defaults that were set for the REPL, i.e. aligns with the printing of expression completion values, and in particular enables color support. PR-URL: #26361 Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Anto Aravinth <anto.aravinth.cse@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/lib/repl.js b/lib/repl.js
@@ -416,7 +416,7 @@ function REPLServer(prompt,
                                       (_, pre, line) => pre + (line - 1));
           }
         }
-        errStack = util.inspect(e);
+        errStack = self.writer(e);
 
         // Remove one line error braces to keep the old style in place.
         if (errStack[errStack.length - 1] === ']') {
@@ -426,7 +426,7 @@ function REPLServer(prompt,
     }
 
     if (errStack === '') {
-      errStack = `Thrown: ${util.inspect(e)}\n`;
+      errStack = `Thrown: ${self.writer(e)}\n`;
     } else {
       const ln = errStack.endsWith('\n') ? '' : '\n';
       errStack = `Thrown:\n${errStack}${ln}`;
diff --git a/test/parallel/test-repl-pretty-stack.js b/test/parallel/test-repl-pretty-stack.js
@@ -6,7 +6,7 @@ const assert = require('assert');
 const repl = require('repl');
 
 
-function run({ command, expected }) {
+function run({ command, expected, ...extraREPLOptions }) {
   let accum = '';
 
   const inputStream = new ArrayStream();
@@ -19,7 +19,8 @@ function run({ command, expected }) {
     input: inputStream,
     output: outputStream,
     terminal: false,
-    useColors: false
+    useColors: false,
+    ...extraREPLOptions
   });
 
   r.write(`${command}\n`);
@@ -44,6 +45,18 @@ const tests = [
     command: 'throw new Error(\'Whoops!\')',
     expected: 'Thrown:\nError: Whoops!\n'
   },
+  {
+    command: '(() => { const err = Error(\'Whoops!\'); ' +
+             'err.foo = \'bar\'; throw err; })()',
+    expected: 'Thrown:\n{ Error: Whoops!\n    at repl:1:22 foo: \'bar\' }\n',
+  },
+  {
+    command: '(() => { const err = Error(\'Whoops!\'); ' +
+             'err.foo = \'bar\'; throw err; })()',
+    expected: 'Thrown:\n{ Error: Whoops!\n    at repl:1:22 foo: ' +
+              "\u001b[32m'bar'\u001b[39m }\n",
+    useColors: true
+  },
   {
     command: 'foo = bar;',
     expected: 'Thrown:\nReferenceError: bar is not defined\n'

Original file line number	Diff line number	Diff line change
`@@ -416,7 +416,7 @@ function REPLServer(prompt,`
`416`	`416`	`(_, pre, line) => pre + (line - 1));`
`417`	`417`	`}`
`418`	`418`	`}`
`419`		`- errStack = util.inspect(e);`
	`419`	`+ errStack = self.writer(e);`
`420`	`420`
`421`	`421`	`// Remove one line error braces to keep the old style in place.`
`422`	`422`	`if (errStack[errStack.length - 1] === ']') {`
`@@ -426,7 +426,7 @@ function REPLServer(prompt,`
`426`	`426`	`}`
`427`	`427`
`428`	`428`	`if (errStack === '') {`
`429`		- errStack = `Thrown: ${util.inspect(e)}\n`;
	`429`	+ errStack = `Thrown: ${self.writer(e)}\n`;
`430`	`430`	`} else {`
`431`	`431`	`const ln = errStack.endsWith('\n') ? '' : '\n';`
`432`	`432`	errStack = `Thrown:\n${errStack}${ln}`;