lib: add internal removeColors helper

Instead of having three times the same RegExp, just use a helper.

PR-URL: https://github.com/nodejs/node/pull/17615
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
This commit is contained in:
Ruben Bridgewater 2017-12-11 06:32:59 -02:00
parent 2d9e87695e
commit 19bff313be
No known key found for this signature in database
GPG Key ID: F07496B3EB3C1762
3 changed files with 12 additions and 6 deletions

View File

@ -6,7 +6,7 @@ const {
isHexTable
} = require('internal/querystring');
const { getConstructorOf } = require('internal/util');
const { getConstructorOf, removeColors } = require('internal/util');
const errors = require('internal/errors');
const querystring = require('querystring');
@ -181,9 +181,8 @@ class URLSearchParams {
for (var i = 0; i < list.length; i += 2)
output.push(`${innerInspect(list[i])} => ${innerInspect(list[i + 1])}`);
var colorRe = /\u001b\[\d\d?m/g;
var length = output.reduce(
(prev, cur) => prev + cur.replace(colorRe, '').length + separator.length,
(prev, cur) => prev + removeColors(cur).length + separator.length,
-separator.length
);
if (length > ctx.breakLength) {

View File

@ -18,6 +18,12 @@ const noCrypto = !process.versions.openssl;
const experimentalWarnings = new Set();
const colorRegExp = /\u001b\[\d\d?m/g;
function removeColors(str) {
return str.replace(colorRegExp, '');
}
function isError(e) {
return objectToString(e) === '[object Error]' || e instanceof Error;
}
@ -362,6 +368,7 @@ module.exports = {
objectToString,
promisify,
spliceOne,
removeColors,
// Symbol used to customize promisify conversion
customPromisifyArgs: kCustomPromisifyArgsSymbol,

View File

@ -59,7 +59,8 @@ const {
getIdentificationOf,
isError,
promisify,
join
join,
removeColors
} = require('internal/util');
const inspectDefaultOptions = Object.seal({
@ -85,7 +86,6 @@ const strEscapeSequencesRegExp = /[\x00-\x1f\x27\x5c]/;
const strEscapeSequencesReplacer = /[\x00-\x1f\x27\x5c]/g;
/* eslint-enable */
const keyStrRegExp = /^[a-zA-Z_][a-zA-Z_0-9]*$/;
const colorRegExp = /\u001b\[\d\d?m/g;
const numberRegExp = /^(0|[1-9][0-9]*)$/;
const readableRegExps = {};
@ -905,7 +905,7 @@ function reduceToSingleString(ctx, output, base, braces, addLn) {
var length = 0;
for (; i < output.length && length <= breakLength; i++) {
if (ctx.colors) {
length += output[i].replace(colorRegExp, '').length + 1;
length += removeColors(output[i]).length + 1;
} else {
length += output[i].length + 1;
}