From a0866b6b0c209c771672517d6d91b64905f2e597 Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Wed, 5 Jul 2017 09:21:40 -0700 Subject: [PATCH] lib: remove excess indentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In anticipation of stricter linting for indentation, remove instances of extra indentation that will be flagged by the new rules. PR-URL: https://github.com/nodejs/node/pull/14090 Reviewed-By: Benjamin Gruenbaum Reviewed-By: Tobias Nießen Reviewed-By: Luigi Pinca --- lib/_tls_legacy.js | 2 +- lib/_tls_wrap.js | 2 +- lib/async_hooks.js | 7 +++---- lib/buffer.js | 2 +- lib/child_process.js | 8 ++++---- lib/crypto.js | 2 +- lib/fs.js | 31 ++++++++++++++++--------------- lib/inspector.js | 6 +++--- lib/internal/bootstrap_node.js | 2 +- lib/internal/child_process.js | 8 ++++---- lib/internal/readline.js | 7 +++++-- lib/readline.js | 8 ++++---- lib/timers.js | 2 +- lib/tls.js | 2 +- lib/url.js | 7 +++---- lib/util.js | 4 ++-- 16 files changed, 51 insertions(+), 49 deletions(-) diff --git a/lib/_tls_legacy.js b/lib/_tls_legacy.js index c00e15a1b7ec24..39138a15fca5fa 100644 --- a/lib/_tls_legacy.js +++ b/lib/_tls_legacy.js @@ -384,7 +384,7 @@ Object.defineProperty(CryptoStream.prototype, 'bytesWritten', { CryptoStream.prototype.getPeerCertificate = function(detailed) { if (this.pair.ssl) { return common.translatePeerCertificate( - this.pair.ssl.getPeerCertificate(detailed)); + this.pair.ssl.getPeerCertificate(detailed)); } return null; diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js index 87b060f57aa59c..8215d92c8be3d0 100644 --- a/lib/_tls_wrap.js +++ b/lib/_tls_wrap.js @@ -659,7 +659,7 @@ TLSSocket.prototype.setSession = function(session) { TLSSocket.prototype.getPeerCertificate = function(detailed) { if (this._handle) { return common.translatePeerCertificate( - this._handle.getPeerCertificate(detailed)); + this._handle.getPeerCertificate(detailed)); } return null; diff --git a/lib/async_hooks.js b/lib/async_hooks.js index ebbd284c0032d1..a730738c0f9144 100644 --- a/lib/async_hooks.js +++ b/lib/async_hooks.js @@ -71,8 +71,7 @@ function fatalError(e) { Error.captureStackTrace(o, fatalError); process._rawDebug(o.stack); } - if (process.execArgv.some( - (e) => /^--abort[_-]on[_-]uncaught[_-]exception$/.test(e))) { + if (process.execArgv.some((e) => /^--abort[_-]on[_-]uncaught[_-]exception$/.test(e))) { process.abort(); } process.exit(1); @@ -434,8 +433,8 @@ function init(asyncId, type, triggerAsyncId, resource) { for (var i = 0; i < active_hooks_array.length; i++) { if (typeof active_hooks_array[i][init_symbol] === 'function') { active_hooks_array[i][init_symbol]( - asyncId, type, triggerAsyncId, - resource + asyncId, type, triggerAsyncId, + resource ); } } diff --git a/lib/buffer.js b/lib/buffer.js index a6fedf3807f112..5af10f5f30f6aa 100644 --- a/lib/buffer.js +++ b/lib/buffer.js @@ -762,7 +762,7 @@ function slowIndexOf(buffer, val, byteOffset, encoding, dir) { case 'ascii': case 'hex': return binding.indexOfBuffer( - buffer, Buffer.from(val, encoding), byteOffset, encoding, dir); + buffer, Buffer.from(val, encoding), byteOffset, encoding, dir); default: if (loweredCase) { diff --git a/lib/child_process.js b/lib/child_process.js index b2aa85b9cd2fce..3c907469bf496f 100644 --- a/lib/child_process.js +++ b/lib/child_process.js @@ -89,7 +89,7 @@ exports.fork = function(modulePath /*, args, options*/) { // Use a separate fd=3 for the IPC channel. Inherit stdin, stdout, // and stderr from the parent if silent isn't set. options.stdio = options.silent ? stdioStringToArray('pipe') : - stdioStringToArray('inherit'); + stdioStringToArray('inherit'); } else if (options.stdio.indexOf('ipc') === -1) { throw new TypeError('Forked processes must have an IPC channel'); } @@ -543,9 +543,9 @@ function spawnSync(/*file, args, options*/) { pipe.input = Buffer.from(input, options.encoding); } else { throw new TypeError(util.format( - 'stdio[%d] should be Buffer, Uint8Array or string not %s', - i, - typeof input)); + 'stdio[%d] should be Buffer, Uint8Array or string not %s', + i, + typeof input)); } } } diff --git a/lib/crypto.js b/lib/crypto.js index 8893aa742519ea..56795e23f24af9 100644 --- a/lib/crypto.js +++ b/lib/crypto.js @@ -633,7 +633,7 @@ function pbkdf2(password, salt, iterations, keylen, digest, callback) { if (digest === undefined) { throw new TypeError( - 'The "digest" argument is required and must not be undefined'); + 'The "digest" argument is required and must not be undefined'); } password = toBuf(password); diff --git a/lib/fs.js b/lib/fs.js index 5bbd9f49466bd1..91489f816652c9 100644 --- a/lib/fs.js +++ b/lib/fs.js @@ -172,20 +172,21 @@ function isFd(path) { // Constructor for file stats. function Stats( - dev, - mode, - nlink, - uid, - gid, - rdev, - blksize, - ino, - size, - blocks, - atim_msec, - mtim_msec, - ctim_msec, - birthtim_msec) { + dev, + mode, + nlink, + uid, + gid, + rdev, + blksize, + ino, + size, + blocks, + atim_msec, + mtim_msec, + ctim_msec, + birthtim_msec +) { this.dev = dev; this.mode = mode; this.nlink = nlink; @@ -1285,7 +1286,7 @@ fs.writeFile = function(path, data, options, callback) { function writeFd(fd, isUserFd) { var buffer = isUint8Array(data) ? - data : Buffer.from('' + data, options.encoding || 'utf8'); + data : Buffer.from('' + data, options.encoding || 'utf8'); var position = /a/.test(flag) ? null : 0; writeAll(fd, isUserFd, buffer, 0, buffer.length, position, callback); diff --git a/lib/inspector.js b/lib/inspector.js index d73d8a23491854..6a80c36d528a1d 100644 --- a/lib/inspector.js +++ b/lib/inspector.js @@ -43,7 +43,7 @@ class Session extends EventEmitter { post(method, params, callback) { if (typeof method !== 'string') { throw new TypeError( - `"method" must be a string, got ${typeof method} instead`); + `"method" must be a string, got ${typeof method} instead`); } if (!callback && util.isFunction(params)) { callback = params; @@ -51,11 +51,11 @@ class Session extends EventEmitter { } if (params && typeof params !== 'object') { throw new TypeError( - `"params" must be an object, got ${typeof params} instead`); + `"params" must be an object, got ${typeof params} instead`); } if (callback && typeof callback !== 'function') { throw new TypeError( - `"callback" must be a function, got ${typeof callback} instead`); + `"callback" must be a function, got ${typeof callback} instead`); } if (!this[connectionSymbol]) { diff --git a/lib/internal/bootstrap_node.js b/lib/internal/bootstrap_node.js index efc66b1b232baf..0c82e5e36d6f43 100644 --- a/lib/internal/bootstrap_node.js +++ b/lib/internal/bootstrap_node.js @@ -348,7 +348,7 @@ if (async_hook_fields[kAfter] > 0) { do { NativeModule.require('async_hooks').emitAfter( - async_uid_fields[kCurrentAsyncId]); + async_uid_fields[kCurrentAsyncId]); // popAsyncIds() returns true if there are more ids on the stack. } while (popAsyncIds(async_uid_fields[kCurrentAsyncId])); // Or completely empty the id stack. diff --git a/lib/internal/child_process.js b/lib/internal/child_process.js index e33712f5a11599..50075e78f5c971 100644 --- a/lib/internal/child_process.js +++ b/lib/internal/child_process.js @@ -340,7 +340,7 @@ ChildProcess.prototype.spawn = function(options) { // when i === 0 - we're dealing with stdin // (which is the only one writable pipe) stream.socket = createSocket(this.pid !== 0 ? - stream.handle : null, i > 0); + stream.handle : null, i > 0); if (i > 0 && this.pid !== 0) { this._closesNeeded++; @@ -352,11 +352,11 @@ ChildProcess.prototype.spawn = function(options) { } this.stdin = stdio.length >= 1 && stdio[0].socket !== undefined ? - stdio[0].socket : null; + stdio[0].socket : null; this.stdout = stdio.length >= 2 && stdio[1].socket !== undefined ? - stdio[1].socket : null; + stdio[1].socket : null; this.stderr = stdio.length >= 3 && stdio[2].socket !== undefined ? - stdio[2].socket : null; + stdio[2].socket : null; this.stdio = []; diff --git a/lib/internal/readline.js b/lib/internal/readline.js index 96da5cc82f2af5..b15ed4972ef7f2 100644 --- a/lib/internal/readline.js +++ b/lib/internal/readline.js @@ -84,7 +84,8 @@ if (process.binding('config').hasIntl) { // Code points are derived from: // http://www.unicode.org/Public/UNIDATA/EastAsianWidth.txt - if (code >= 0x1100 && ( + if ( + code >= 0x1100 && ( code <= 0x115f || // Hangul Jamo 0x2329 === code || // LEFT-POINTING ANGLE BRACKET 0x232a === code || // RIGHT-POINTING ANGLE BRACKET @@ -112,7 +113,9 @@ if (process.binding('config').hasIntl) { // Enclosed Ideographic Supplement 0x1f200 <= code && code <= 0x1f251 || // CJK Unified Ideographs Extension B .. Tertiary Ideographic Plane - 0x20000 <= code && code <= 0x3fffd)) { + 0x20000 <= code && code <= 0x3fffd + ) + ) { return true; } diff --git a/lib/readline.js b/lib/readline.js index 419371b8ee097b..88462891237e7d 100644 --- a/lib/readline.js +++ b/lib/readline.js @@ -725,12 +725,12 @@ Interface.prototype._moveCursor = function(dx) { var diffWidth; if (diffCursor < 0) { diffWidth = -getStringWidth( - this.line.substring(this.cursor, oldcursor) - ); + this.line.substring(this.cursor, oldcursor) + ); } else if (diffCursor > 0) { diffWidth = getStringWidth( - this.line.substring(this.cursor, oldcursor) - ); + this.line.substring(this.cursor, oldcursor) + ); } moveCursor(this.output, diffWidth, 0); this.prevRows = newPos.rows; diff --git a/lib/timers.js b/lib/timers.js index caa31459fb58b3..38d83f8c17bd8f 100644 --- a/lib/timers.js +++ b/lib/timers.js @@ -296,7 +296,7 @@ function listOnTimeout() { function tryOnTimeout(timer, list) { timer._called = true; const timerAsyncId = (typeof timer[async_id_symbol] === 'number') ? - timer[async_id_symbol] : null; + timer[async_id_symbol] : null; var threw = true; if (timerAsyncId !== null) emitBefore(timerAsyncId, timer[trigger_id_symbol]); diff --git a/lib/tls.js b/lib/tls.js index 5a03c3c30f8b24..d89f241383d2e5 100644 --- a/lib/tls.js +++ b/lib/tls.js @@ -220,7 +220,7 @@ exports.checkServerIdentity = function checkServerIdentity(host, cert) { if (!valid) { const err = new Error( - `Hostname/IP doesn't match certificate's altnames: "${reason}"`); + `Hostname/IP doesn't match certificate's altnames: "${reason}"`); err.reason = reason; err.host = host; err.cert = cert; diff --git a/lib/url.js b/lib/url.js index 707d167e11ca9a..bc59b8827a1dc0 100644 --- a/lib/url.js +++ b/lib/url.js @@ -758,8 +758,7 @@ Url.prototype.resolveObject = function resolveObject(relative) { var isSourceAbs = (result.pathname && result.pathname.charAt(0) === '/'); var isRelAbs = ( - relative.host || - relative.pathname && relative.pathname.charAt(0) === '/' + relative.host || relative.pathname && relative.pathname.charAt(0) === '/' ); var mustEndAbs = (isRelAbs || isSourceAbs || (result.host && relative.pathname)); @@ -863,8 +862,8 @@ Url.prototype.resolveObject = function resolveObject(relative) { // then it must NOT get a trailing slash. var last = srcPath.slice(-1)[0]; var hasTrailingSlash = ( - (result.host || relative.host || srcPath.length > 1) && - (last === '.' || last === '..') || last === ''); + (result.host || relative.host || srcPath.length > 1) && + (last === '.' || last === '..') || last === ''); // strip single dots, resolve double dots to parent dir // if the path tries to go above the root, `up` ends up > 0 diff --git a/lib/util.js b/lib/util.js index 54084d4bfbfeb7..6238ff44bf6e15 100644 --- a/lib/util.js +++ b/lib/util.js @@ -398,7 +398,7 @@ function formatValue(ctx, value, recurseTimes) { if (typeof value === 'function') { const ctorName = constructor ? constructor.name : 'Function'; return ctx.stylize( - `[${ctorName}${value.name ? `: ${value.name}` : ''}]`, 'special'); + `[${ctorName}${value.name ? `: ${value.name}` : ''}]`, 'special'); } if (isRegExp(value)) { return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp'); @@ -693,7 +693,7 @@ function formatTypedArray(ctx, value, recurseTimes, visibleKeys, keys) { for (const key of keys) { if (typeof key === 'symbol' || !numbersOnlyRE.test(key)) { output.push( - formatProperty(ctx, value, recurseTimes, visibleKeys, key, true)); + formatProperty(ctx, value, recurseTimes, visibleKeys, key, true)); } } return output;