mirror of
https://github.com/nodejs/node.git
synced 2024-11-21 10:59:27 +00:00
lib: use consistent indentation for ternaries
In anticipation of stricter linting for indentation issues, modify ternary operators in lib that do not conform with the expected ESLint settings. PR-URL: https://github.com/nodejs/node/pull/14078 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
This commit is contained in:
parent
8f3dab4b63
commit
85dacd63f0
@ -949,9 +949,7 @@ function fromListPartial(n, list, hasStrings) {
|
||||
ret = list.shift();
|
||||
} else {
|
||||
// result spans more than one buffer
|
||||
ret = (hasStrings ?
|
||||
copyFromBufferString(n, list) :
|
||||
copyFromBuffer(n, list));
|
||||
ret = hasStrings ? copyFromBufferString(n, list) : copyFromBuffer(n, list);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
@ -21,6 +21,5 @@
|
||||
|
||||
'use strict';
|
||||
|
||||
module.exports = ('NODE_UNIQUE_ID' in process.env) ?
|
||||
require('internal/cluster/child') :
|
||||
require('internal/cluster/master');
|
||||
const childOrMaster = 'NODE_UNIQUE_ID' in process.env ? 'child' : 'master';
|
||||
module.exports = require(`internal/cluster/${childOrMaster}`);
|
||||
|
@ -1357,9 +1357,8 @@ function FSWatcher() {
|
||||
if (status < 0) {
|
||||
self._handle.close();
|
||||
const error = !filename ?
|
||||
errnoException(status, 'Error watching file for changes:') :
|
||||
errnoException(status,
|
||||
`Error watching file ${filename} for changes:`);
|
||||
errnoException(status, 'Error watching file for changes:') :
|
||||
errnoException(status, `Error watching file ${filename} for changes:`);
|
||||
error.filename = filename;
|
||||
self.emit('error', error);
|
||||
} else {
|
||||
|
6
lib/internal/bootstrap_node.js
vendored
6
lib/internal/bootstrap_node.js
vendored
@ -275,9 +275,9 @@
|
||||
enumerable: true,
|
||||
get: function() {
|
||||
if (!console) {
|
||||
console = originalConsole === undefined ?
|
||||
NativeModule.require('console') :
|
||||
installInspectorConsole(originalConsole);
|
||||
console = (originalConsole === undefined) ?
|
||||
NativeModule.require('console') :
|
||||
installInspectorConsole(originalConsole);
|
||||
}
|
||||
return console;
|
||||
}
|
||||
|
@ -883,8 +883,8 @@ function _validateStdio(stdio, sync) {
|
||||
} else if (getHandleWrapType(stdio) || getHandleWrapType(stdio.handle) ||
|
||||
getHandleWrapType(stdio._handle)) {
|
||||
var handle = getHandleWrapType(stdio) ?
|
||||
stdio :
|
||||
getHandleWrapType(stdio.handle) ? stdio.handle : stdio._handle;
|
||||
stdio :
|
||||
getHandleWrapType(stdio.handle) ? stdio.handle : stdio._handle;
|
||||
|
||||
acc.push({
|
||||
type: 'wrap',
|
||||
|
13
lib/url.js
13
lib/url.js
@ -395,10 +395,9 @@ Url.prototype.parse = function parse(url, parseQueryString, slashesDenoteHost) {
|
||||
this.query = Object.create(null);
|
||||
}
|
||||
|
||||
var firstIdx = (questionIdx !== -1 &&
|
||||
(hashIdx === -1 || questionIdx < hashIdx) ?
|
||||
questionIdx :
|
||||
hashIdx);
|
||||
const useQuestionIdx =
|
||||
questionIdx !== -1 && (hashIdx === -1 || questionIdx < hashIdx);
|
||||
const firstIdx = useQuestionIdx ? questionIdx : hashIdx;
|
||||
if (firstIdx === -1) {
|
||||
if (rest.length > 0)
|
||||
this.pathname = rest;
|
||||
@ -585,9 +584,11 @@ Url.prototype.format = function format() {
|
||||
if (this.host) {
|
||||
host = auth + this.host;
|
||||
} else if (this.hostname) {
|
||||
host = auth + (this.hostname.indexOf(':') === -1 ?
|
||||
host = auth + (
|
||||
this.hostname.indexOf(':') === -1 ?
|
||||
this.hostname :
|
||||
'[' + this.hostname + ']');
|
||||
'[' + this.hostname + ']'
|
||||
);
|
||||
if (this.port) {
|
||||
host += ':' + this.port;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user