1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

util: rename setIteratorBraces to getIteratorBraces

Browse Source 
The function is actually a getter, not a setter.

PR-URL: https://github.com/nodejs/node/pull/27342
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
This commit is contained in:
Ruben Bridgewater 2019-04-22 04:21:02 +02:00 committed by Daniel Bevenius
parent 2f1add18a4
commit f0df222e82
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/internal/util/inspect.js
View File

@ -560,15 +560,6 @@ function formatValue(ctx, value, recurseTimes, typedArray) {
return formatRaw(ctx, value, recurseTimes, typedArray); return formatRaw(ctx, value, recurseTimes, typedArray);
} }
function setIteratorBraces(type, tag) {
if (tag !== `${type} Iterator`) {
if (tag !== '')
tag += '] [';
tag += `${type} Iterator`;
}
return [`[${tag}] {`, '}'];
}
function formatRaw(ctx, value, recurseTimes, typedArray) { function formatRaw(ctx, value, recurseTimes, typedArray) {
let keys; let keys;
@ -630,11 +621,11 @@ function formatRaw(ctx, value, recurseTimes, typedArray) {
extrasType = kArrayExtrasType; extrasType = kArrayExtrasType;
} else if (isMapIterator(value)) { } else if (isMapIterator(value)) {
keys = getKeys(value, ctx.showHidden); keys = getKeys(value, ctx.showHidden);
braces = setIteratorBraces('Map', tag); braces = getIteratorBraces('Map', tag);
formatter = formatIterator; formatter = formatIterator;
} else if (isSetIterator(value)) { } else if (isSetIterator(value)) {
keys = getKeys(value, ctx.showHidden); keys = getKeys(value, ctx.showHidden);
braces = setIteratorBraces('Set', tag); braces = getIteratorBraces('Set', tag);
formatter = formatIterator; formatter = formatIterator;
} else { } else {
noIterator = true; noIterator = true;
@ -754,10 +745,10 @@ function formatRaw(ctx, value, recurseTimes, typedArray) {
} }
} }
if (isMapIterator(value)) { if (isMapIterator(value)) {
braces = setIteratorBraces('Map', tag); braces = getIteratorBraces('Map', tag);
formatter = formatIterator; formatter = formatIterator;
} else if (isSetIterator(value)) { } else if (isSetIterator(value)) {
braces = setIteratorBraces('Set', tag); braces = getIteratorBraces('Set', tag);
formatter = formatIterator; formatter = formatIterator;
// Handle other regular objects again. // Handle other regular objects again.
} else if (keys.length === 0) { } else if (keys.length === 0) {
@ -818,6 +809,15 @@ function formatRaw(ctx, value, recurseTimes, typedArray) {
return res; return res;
} }
function getIteratorBraces(type, tag) {
if (tag !== `${type} Iterator`) {
if (tag !== '')
tag += '] [';
tag += `${type} Iterator`;
}
return [`[${tag}] {`, '}'];
}
function formatError(err, constructor, tag, ctx) { function formatError(err, constructor, tag, ctx) {
// TODO(BridgeAR): Always show the error code if present. // TODO(BridgeAR): Always show the error code if present.
let stack = err.stack || ErrorPrototype.toString(err); let stack = err.stack || ErrorPrototype.toString(err);