Skip to content

repl: use better uncaught exceptions indicator #29676

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
BridgeAR wants to merge 2 commits into from
Closed

repl: use better uncaught exceptions indicator #29676

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a7de34
repl: add colors for uncaught exceptions and use a better indicator
BridgeAR Sep 23, 2019
ea09aa5
fixup: remove colors
BridgeAR Nov 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fixup: remove colors
  • Loading branch information
@BridgeAR
BridgeAR committed Nov 26, 2019
commit ea09aa51ca7add34a9b42b25f9fe49dc7c4214e8
4 changes: 1 addition & 3 deletions lib/internal/util/inspect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,6 @@ ObjectDefineProperty(inspect, 'defaultOptions', {
}
});

// TODO(BridgeAR): Add further color codes.
// http://en.wikipedia.org/wiki/ANSI_escape_code#graphics
inspect.colors = ObjectAssign(ObjectCreate(null), {
bold: [1, 22],
Expand All @@ -272,8 +271,7 @@ inspect.colors = ObjectAssign(ObjectCreate(null), {
green: [32, 39],
magenta: [35, 39],
red: [31, 39],
yellow: [33, 39],
brightRed: [91, 39]
yellow: [33, 39]
});

// Don't use 'blue' not visible on cmd.exe
Expand Down
15 changes: 2 additions & 13 deletions lib/repl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,14 +550,9 @@ function REPLServer(prompt,
errStack = self.writer(e);
}
const lines = errStack.split(/(?<=\n)/);
let colors = '';
if (options.useColors) {
colors = `\u001b[${inspect.colors.brightRed[0]}m` +
`\u001b[${inspect.colors.bold[0]}m`;
}
let matched = false;

errStack = colors;
errStack = '';
for (const line of lines) {
if (!matched && /^\[?([A-Z][a-z0-9_]*)*Error/.test(line)) {
errStack += writer.options.breakLength >= line.length ?
Expand All @@ -570,16 +565,10 @@ function REPLServer(prompt,
}
if (!matched) {
const ln = lines.length === 1 ? ' ' : ':\n';
// eslint-disable-next-line no-control-regex
errStack = errStack.replace(/\u001b\[[0-9]{1,3}m/g, '');
errStack = `${colors}Uncaught${ln}${errStack}`;
errStack = `Uncaught${ln}${errStack}`;
}
// Normalize line endings.
errStack += errStack.endsWith('\n') ? '' : '\n';
if (options.useColors) {
errStack += `\u001b[${inspect.colors.brightRed[1]}m` +
`\u001b[${inspect.colors.bold[1]}m`;
}
top.outputStream.write(errStack);
top.clearBufferedCommand();
top.lines.level = [];
Expand Down
5 changes: 2 additions & 3 deletions test/parallel/test-repl-pretty-stack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,8 @@ const tests = [
{
command: '(() => { const err = Error(\'Whoops!\'); ' +
'err.foo = \'bar\'; throw err; })()',
expected: '\u001b[91m\u001b[1m' +
'Uncaught Error: Whoops!\n at repl:*:* {\n foo: ' +
"\u001b[32m'bar'\u001b[39m\n}\n\u001b[39m\u001b[22m",
expected: 'Uncaught Error: Whoops!\n at repl:*:* {\n foo: ' +
"\u001b[32m'bar'\u001b[39m\n}\n",
useColors: true
},
{
Expand Down
8 changes: 2 additions & 6 deletions test/parallel/test-repl-uncaught-exception.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,12 @@ const tests = [
{
useColors: true,
command: 'x',
expected: '\u001b[91m\u001b[1m' +
'Uncaught ReferenceError: x is not defined\n' +
'\u001b[39m\u001b[22m'
expected: 'Uncaught ReferenceError: x is not defined\n'
},
{
useColors: true,
command: 'throw { foo: "test" }',
expected: '\u001b[91m\u001b[1m' +
"Uncaught { foo: 'test' }\n" +
'\u001b[39m\u001b[22m'
expected: "Uncaught { foo: \x1B[32m'test'\x1B[39m }\n"
},
{
command: 'process.on("uncaughtException", () => console.log("Foobar"));\n',
Expand Down