repl: use better uncaught exceptions indicator

This switches "Thrown:" with "Uncaught" to outline clearer that the
thrown error is not caught.
PR-URL: #29676
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: James M Snell <jasnell@gmail.com>

Author: BridgeAR

lib/repl.js

@@ -567,11 +567,28 @@ function REPLServer(prompt,
 });
 }else{
 if(errStack===''){
-errStack=`Thrown: ${self.writer(e)}\n`;
-}else{
-constln=errStack.endsWith('\n') ? '' : '\n';
-errStack=`Thrown:\n${errStack}${ln}`;
+errStack=self.writer(e);
+}
+constlines=errStack.split(/(?<=\n)/);
+letmatched=false;
+
+errStack='';
+for(constlineoflines){
+if(!matched&&/^\[?([A-Z][a-z0-9_]*)*Error/.test(line)){
+errStack+=writer.options.breakLength>=line.length ?
+`Uncaught ${line}` :
+`Uncaught:\n${line}`;
+matched=true;
+}else{
+errStack+=line;
+}
+}
+if(!matched){
+constln=lines.length===1 ? ' ' : ':\n';
+errStack=`Uncaught${ln}${errStack}`;
 }
+// Normalize line endings.
+errStack+=errStack.endsWith('\n') ? '' : '\n';
 top.outputStream.write(errStack);
 top.clearBufferedCommand();
 top.lines.level=[];

test/parallel/test-repl-harmony.js

@@ -30,7 +30,7 @@ const child = spawn(process.execPath, args);
 constinput='(function(){"use strict"; const y=1;y=2})()\n';
 // This message will vary based on JavaScript engine, so don't check the message
 // contents beyond confirming that the `Error` is a `TypeError`.
-constexpectOut=/>Thrown:\nTypeError:/;
+constexpectOut=/>UncaughtTypeError:/;
 
 child.stderr.setEncoding('utf8');
 child.stderr.on('data',(d)=>{

test/parallel/test-repl-null-thrown.js

@@ -20,5 +20,5 @@ replserver.emit('line', '.exit');
 
 setTimeout(()=>{
 console.log(text);
-assert(text.includes('Thrown: null'));
+assert(text.includes('Uncaught null'));
 },0);

test/parallel/test-repl-pretty-custom-stack.js

@@ -48,26 +48,26 @@ const tests = [
 {
 // test .load for a file that throws
 command: `.load ${fixtures.path('repl-pretty-stack.js')}`,
-expected: 'Thrown:\nError: Whoops!--->\nrepl:*:*--->\nd (repl:*:*)'+
+expected: 'Uncaught Error: Whoops!--->\nrepl:*:*--->\nd (repl:*:*)'+
 '--->\nc (repl:*:*)--->\nb (repl:*:*)--->\na (repl:*:*)\n'
 },
 {
 command: 'let x y;',
-expected: 'Thrown:\n'+
-'let x y;\n ^\n\nSyntaxError: Unexpected identifier\n'
+expected: 'let x y;\n ^\n\n'+
+'Uncaught SyntaxError: Unexpected identifier\n'
 },
 {
 command: 'throw new Error(\'Whoops!\')',
-expected: 'Thrown:\nError: Whoops!\n'
+expected: 'Uncaught Error: Whoops!\n'
 },
 {
 command: 'foo = bar;',
-expected: 'Thrown:\nReferenceError: bar is not defined\n'
+expected: 'Uncaught ReferenceError: bar is not defined\n'
 },
 // test anonymous IIFE
 {
 command: '(function() { throw new Error(\'Whoops!\'); })()',
-expected: 'Thrown:\nError: Whoops!--->\nrepl:*:*\n'
+expected: 'Uncaught Error: Whoops!--->\nrepl:*:*\n'
 }
 ];
 

test/parallel/test-repl-pretty-stack.js

@@ -7,7 +7,7 @@ const repl = require('repl');
 
 conststackRegExp=/(at.*repl:)[0-9]+:[0-9]+/g;
 
-functionrun({ command, expected, ...extraREPLOptions}){
+functionrun({ command, expected, ...extraREPLOptions},i){
 letaccum='';
 
 constinputStream=newArrayStream();
@@ -25,6 +25,7 @@ function run({ command, expected, ...extraREPLOptions }) {
 });
 
 r.write(`${command}\n`);
+console.log(i);
 assert.strictEqual(
 accum.replace(stackRegExp,'$1*:*'),
 expected.replace(stackRegExp,'$1*:*')
@@ -36,39 +37,39 @@ const tests = [
 {
 // Test .load for a file that throws.
 command: `.load ${fixtures.path('repl-pretty-stack.js')}`,
-expected: 'Thrown:\nError: Whoops!\n at repl:*:*\n'+
+expected: 'Uncaught Error: Whoops!\n at repl:*:*\n'+
 ' at d (repl:*:*)\n at c (repl:*:*)\n'+
 ' at b (repl:*:*)\n at a (repl:*:*)\n'
 },
 {
 command: 'let x y;',
-expected: 'Thrown:\n'+
-'let x y;\n ^\n\nSyntaxError: Unexpected identifier\n'
+expected: 'let x y;\n ^\n\n'+
+'Uncaught SyntaxError: Unexpected identifier\n'
 },
 {
 command: 'throw new Error(\'Whoops!\')',
-expected: 'Thrown:\nError: Whoops!\n'
+expected: 'Uncaught Error: Whoops!\n'
 },
 {
 command: '(() => { const err = Error(\'Whoops!\'); '+
 'err.foo = \'bar\'; throw err; })()',
-expected: "Thrown:\nError: Whoops!\n at repl:*:* {\n foo: 'bar'\n}\n",
+expected: "Uncaught Error: Whoops!\n at repl:*:* {\n foo: 'bar'\n}\n",
 },
 {
 command: '(() => { const err = Error(\'Whoops!\'); '+
 'err.foo = \'bar\'; throw err; })()',
-expected: 'Thrown:\nError: Whoops!\n at repl:*:* {\n foo: '+
+expected: 'Uncaught Error: Whoops!\n at repl:*:* {\n foo: '+
 "\u001b[32m'bar'\u001b[39m\n}\n",
 useColors: true
 },
 {
 command: 'foo = bar;',
-expected: 'Thrown:\nReferenceError: bar is not defined\n'
+expected: 'Uncaught ReferenceError: bar is not defined\n'
 },
 // Test anonymous IIFE.
 {
 command: '(function() { throw new Error(\'Whoops!\'); })()',
-expected: 'Thrown:\nError: Whoops!\n at repl:*:*\n'
+expected: 'Uncaught Error: Whoops!\n at repl:*:*\n'
 }
 ];
 

test/parallel/test-repl-top-level-await.js

@@ -118,15 +118,15 @@ async function ordinaryTests() {
 ['if (await true) { function bar() {}; }','undefined'],
 ['bar','[Function: bar]'],
 ['if (await true) { class Bar {}; }','undefined'],
-['Bar','ReferenceError: Bar is not defined',{line: 1}],
+['Bar','Uncaught ReferenceError: Bar is not defined'],
 ['await 0; function* gen(){}','undefined'],
 ['for (var i = 0; i < 10; ++i) { await i; }','undefined'],
 ['i','10'],
 ['for (let j = 0; j < 5; ++j) { await j; }','undefined'],
-['j','ReferenceError: j is not defined',{line: 1}],
+['j','Uncaught ReferenceError: j is not defined'],
 ['gen','[GeneratorFunction: gen]'],
-['return 42; await 5;','SyntaxError: Illegal return statement',
-{line: 4}],
+['return 42; await 5;','Uncaught SyntaxError: Illegal return statement',
+{line: 3}],
 ['let o = await 1, p','undefined'],
 ['p','undefined'],
 ['let q = 1, s = await 2','undefined'],
@@ -160,7 +160,7 @@ async function ctrlCTest() {
 {ctrl: true,name: 'c'}
 ]),[
 'await timeout(100000)\r',
-'Thrown:',
+'Uncaught:',
 '[Error [ERR_SCRIPT_EXECUTION_INTERRUPTED]: '+
 'Script execution was interrupted by `SIGINT`] {',
 " code: 'ERR_SCRIPT_EXECUTION_INTERRUPTED'",

test/parallel/test-repl-uncaught-exception-standalone.js

@@ -18,8 +18,7 @@ child.on('exit', common.mustCall(() => {
 [
 'Type ".help" for more information.',
 // x\n
-'> Thrown:',
-'ReferenceError: x is not defined',
+'> Uncaught ReferenceError: x is not defined',
 // Added `uncaughtException` listener.
 '> short',
 'undefined',

test/parallel/test-repl-uncaught-exception.js

@@ -6,7 +6,7 @@ const repl = require('repl');
 
 letcount=0;
 
-functionrun({ command, expected }){
+functionrun({ command, expected, useColors =false}){
 letaccum='';
 
 constoutput=newArrayStream();
@@ -17,7 +17,7 @@ function run({ command, expected }) {
 input: newArrayStream(),
  output,
 terminal: false,
-useColors: false
+ useColors
 });
 
 r.write(`${command}\n`);
@@ -30,35 +30,40 @@ function run({ command, expected }) {
 // Verify that the repl is still working as expected.
 accum='';
 r.write('1 + 1\n');
-assert.strictEqual(accum,'2\n');
+// eslint-disable-next-line no-control-regex
+assert.strictEqual(accum.replace(/\u001b\[[0-9]+m/g,''),'2\n');
 r.close();
 count++;
 }
 
 consttests=[
 {
+useColors: true,
 command: 'x',
-expected: 'Thrown:\n'+
-'ReferenceError: x is not defined\n'
+expected: 'Uncaught ReferenceError: x is not defined\n'
+},
+{
+useColors: true,
+command: 'throw { foo: "test" }',
+expected: "Uncaught { foo: \x1B[32m'test'\x1B[39m }\n"
 },
 {
 command: 'process.on("uncaughtException", () => console.log("Foobar"));\n',
-expected: /^Thrown:\nTypeError\[ERR_INVALID_REPL_INPUT]:Listenersfor`/
+expected: /^Uncaught:\nTypeError\[ERR_INVALID_REPL_INPUT]:Listenersfor`/
 },
 {
 command: 'x;\n',
-expected: 'Thrown:\n'+
-'ReferenceError: x is not defined\n'
+expected: 'Uncaught ReferenceError: x is not defined\n'
 },
 {
 command: 'process.on("uncaughtException", () => console.log("Foobar"));'+
 'console.log("Baz");\n',
-expected: /^Thrown:\nTypeError\[ERR_INVALID_REPL_INPUT]:Listenersfor`/
+expected: /^Uncaught:\nTypeError\[ERR_INVALID_REPL_INPUT]:Listenersfor`/
 },
 {
 command: 'console.log("Baz");'+
 'process.on("uncaughtException", () => console.log("Foobar"));\n',
-expected: /^Baz\nThrown:\nTypeError\[ERR_INVALID_REPL_INPUT]:.*uncaughtException/
+expected: /^Baz\nUncaught:\nTypeError\[ERR_INVALID_REPL_INPUT]:.*uncaughtException/
 }
 ];
 

test/parallel/test-repl-underscore.js

@@ -173,13 +173,11 @@ function testError() {
 'undefined',
 
 // The error, both from the original throw and the `_error` echo.
-'Thrown:',
-'Error: foo',
+'Uncaught Error: foo',
 '[Error: foo]',
 
 // The sync error, with individual property echoes
-'Thrown:',
-/^Error:ENOENT:nosuchfileordirectory,scandir'.*nonexistent\?'/,
+/^UncaughtError:ENOENT:nosuchfileordirectory,scandir'.*nonexistent\?'/,
 /Object\.readdirSync/,
 /^errno:-(2|4058),$/,
 " syscall: 'scandir',",
@@ -194,8 +192,7 @@ function testError() {
 'undefined',
 
 // The message from the original throw
-'Thrown:',
-'Error: baz',
+'Uncaught Error: baz',
 ];
 for(constlineoflines){
 constexpected=expectedLines.shift();
@@ -218,8 +215,7 @@ function testError() {
 "'baz'",
 'Expression assignment to _error now disabled.',
 '0',
-'Thrown:',
-'Error: quux',
+'Uncaught Error: quux',
 '0'
 ]);
 });