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

util: improve inspect() compact number mode

Browse Source 
This fixes a proportion calculation for lots of short array entries
with at least one bigger one that alone makes up for more than one
fifth of all other entries together.

PR-URL: https://github.com/nodejs/node/pull/26984
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
This commit is contained in:
Ruben Bridgewater 2019-03-29 14:15:01 +01:00
parent 75007d64c0
commit 14b2db0145
No known key found for this signature in database
GPG Key ID: F07496B3EB3C1762
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -878,6 +878,7 @@ function groupArrayElements(ctx, output) {
let totalLength = 0; let totalLength = 0;
let maxLength = 0; let maxLength = 0;
let i = 0; let i = 0;
const separatorSpace = 2; // Add 1 for the space and 1 for the separator.
const dataLen = new Array(output.length); const dataLen = new Array(output.length);
// Calculate the total length of all output entries and the individual max // Calculate the total length of all output entries and the individual max
// entries length of all output entries. We have to remove colors first, // entries length of all output entries. We have to remove colors first,
@ -885,19 +886,19 @@ function groupArrayElements(ctx, output) {
for (; i < output.length; i++) { for (; i < output.length; i++) {
const len = ctx.colors ? removeColors(output[i]).length : output[i].length; const len = ctx.colors ? removeColors(output[i]).length : output[i].length;
dataLen[i] = len; dataLen[i] = len;
totalLength += len; totalLength += len + separatorSpace;
if (maxLength < len) if (maxLength < len)
maxLength = len; maxLength = len;
} }
// Add two to `maxLength` as we add a single whitespace character plus a comma // Add two to `maxLength` as we add a single whitespace character plus a comma
// in-between two entries. // in-between two entries.
const actualMax = maxLength + 2; const actualMax = maxLength + separatorSpace;
// Check if at least three entries fit next to each other and prevent grouping // Check if at least three entries fit next to each other and prevent grouping
// of arrays that contains entries of very different length (i.e., if a single // of arrays that contains entries of very different length (i.e., if a single
// entry is longer than 1/5 of all other entries combined). Otherwise the // entry is longer than 1/5 of all other entries combined). Otherwise the
// space in-between small entries would be enormous. // space in-between small entries would be enormous.
if (actualMax * 3 + ctx.indentationLvl < ctx.breakLength && if (actualMax * 3 + ctx.indentationLvl < ctx.breakLength &&
(totalLength / maxLength > 5 || maxLength <= 6)) { (totalLength / actualMax > 5 || maxLength <= 6)) {
const approxCharHeights = 2.5; const approxCharHeights = 2.5;
const bias = 1; const bias = 1;

24
test/parallel/test-util-inspect.js
View File

@ -2121,6 +2121,30 @@ assert.strictEqual(
assert.strictEqual(out, expected); assert.strictEqual(out, expected);
obj = [
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 123456789
];
out = util.inspect(obj, { compact: 3 });
expected = [
'[',
' 1, 1, 1,',
' 1, 1, 1,',
' 1, 1, 1,',
' 1, 1, 1,',
' 1, 1, 1,',
' 1, 1, 1,',
' 1, 1, 1,',
' 1, 1, 1,',
' 1, 1, 123456789',
']'
].join('\n');
assert.strictEqual(out, expected);
// Verify that array grouping and line consolidation does not happen together. // Verify that array grouping and line consolidation does not happen together.
obj = { obj = {
a: { a: {