Skip to content

[v10.x] Backport util PRs #23039

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
targos wants to merge 7 commits into from
Closed

[v10.x] Backport util PRs #23039

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3f0e52e
util: remove outdated TODO
BridgeAR Aug 24, 2018
0560cd0
benchmark: refactor util benchmarks
BridgeAR Aug 13, 2018
15b0c80
util: improve inspect performance
BridgeAR Aug 12, 2018
8513b45
util: fix indentationLvl when exceeding max call stack size
BridgeAR Sep 10, 2018
cc9898b
util: use a shared symbol for util.inspect.custom
chocolateboy May 20, 2018
c3ea927
util: add order option to `.inspect()`
BridgeAR Sep 10, 2018
2b3af24
doc,test: fix inspect's sorted compare function
targos Sep 21, 2018
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
Next Next commit
util: fix indentationLvl when exceeding max call stack size 
The inspection indentation level was not always reset to it's former
value in case the maximum call stack size was exceeded.

PR-URL: #22787
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
@BridgeAR @targos
BridgeAR authored and targos committed Sep 23, 2018
commit 8513b45890591c907494265204e057767bf63b90
6 changes: 4 additions & 2 deletions lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,7 @@ function formatRaw(ctx, value, recurseTimes) {

ctx.seen.push(value);
let output;
const indentationLvl = ctx.indentationLvl;
try {
output = formatter(ctx, value, recurseTimes, keys);
if (skip === false) {
Expand All @@ -841,16 +842,17 @@ function formatRaw(ctx, value, recurseTimes) {
}
}
} catch (err) {
return handleMaxCallStackSize(ctx, err, constructor, tag);
return handleMaxCallStackSize(ctx, err, constructor, tag, indentationLvl);
}
ctx.seen.pop();

return reduceToSingleString(ctx, output, base, braces);
}

function handleMaxCallStackSize(ctx, err, constructor, tag) {
function handleMaxCallStackSize(ctx, err, constructor, tag, indentationLvl) {
if (errors.isStackOverflowError(err)) {
ctx.seen.pop();
ctx.indentationLvl = indentationLvl;
return ctx.stylize(
`[${constructor || tag || 'Object'}: Inspection interrupted ` +
'prematurely. Maximum call stack size exceeded.]',
Expand Down