Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Brace style linting #7630

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ rules:

# Stylistic Issues
# http://eslint.org/docs/rules/#stylistic-issues
brace-style: [2, "1tbs", {allowSingleLine: true}]
comma-spacing: 2
eol-last: 2
indent: [2, 2, {SwitchCase: 1}]
Expand Down
3 changes: 1 addition & 2 deletions benchmark/child_process/child-process-read-ipc.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
'use strict';
if (process.argv[2] === 'child')
{
if (process.argv[2] === 'child') {
const len = +process.argv[3];
const msg = `"${'.'.repeat(len)}"`;
while (true) {
Expand Down
8 changes: 5 additions & 3 deletions lib/_stream_readable.js
Original file line number Diff line number Diff line change
Expand Up @@ -803,9 +803,11 @@ Readable.prototype.wrap = function(stream) {
// important when wrapping filters and duplexes.
for (var i in stream) {
if (this[i] === undefined && typeof stream[i] === 'function') {
this[i] = function(method) { return function() {
return stream[method].apply(stream, arguments);
}; }(i);
this[i] = function(method) {
return function() {
return stream[method].apply(stream, arguments);
};
}(i);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated to this change, but I think one level of function wrapping can be removed here:

this[i] = function(method) {
  return stream[method].apply(stream, arguments);
}(i);

}
}

Expand Down
3 changes: 1 addition & 2 deletions lib/module.js
Original file line number Diff line number Diff line change
Expand Up @@ -622,8 +622,7 @@ Module._preloadModules = function(requests) {
var parent = new Module('internal/preload', null);
try {
parent.paths = Module._nodeModulePaths(process.cwd());
}
catch (e) {
} catch (e) {
if (e.code !== 'ENOENT') {
throw e;
}
Expand Down
3 changes: 1 addition & 2 deletions lib/net.js
Original file line number Diff line number Diff line change
Expand Up @@ -1159,8 +1159,7 @@ function createServerHandle(address, port, addressType, fd) {
if (typeof fd === 'number' && fd >= 0) {
try {
handle = createHandle(fd);
}
catch (e) {
} catch (e) {
// Not a fd we can listen on. This will trigger an error.
debug('listen invalid fd=' + fd + ': ' + e.message);
return uv.UV_EINVAL;
Expand Down
3 changes: 1 addition & 2 deletions test/internet/test-dgram-broadcast-multi-process.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,7 @@ if (process.argv[2] !== 'child') {
//all child process are listening, so start sending
sendSocket.sendNext();
}
}
else if (msg.message) {
} else if (msg.message) {
worker.messagesReceived.push(msg.message);

if (worker.messagesReceived.length === messages.length) {
Expand Down
6 changes: 2 additions & 4 deletions test/parallel/test-child-process-fork-exec-path.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@ if (process.env.FORK) {
assert.equal(process.argv[0], copyPath);
process.send(msg);
process.exit();
}
else {
} else {
common.refreshTmpDir();
try {
fs.unlinkSync(copyPath);
}
catch (e) {
} catch (e) {
if (e.code !== 'ENOENT') throw e;
}
fs.writeFileSync(copyPath, fs.readFileSync(nodePath));
Expand Down
6 changes: 2 additions & 4 deletions test/parallel/test-child-process-recv-handle.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,12 @@ function worker() {
if (n === 1) {
assert.equal(msg, 'one');
assert.equal(handle, undefined);
}
else if (n === 2) {
} else if (n === 2) {
assert.equal(msg, 'two');
assert.equal(typeof handle, 'object'); // Also matches null, therefore...
assert.ok(handle); // also check that it's truthy.
handle.close();
}
else if (n === 3) {
} else if (n === 3) {
assert.equal(msg, 'three');
assert.equal(handle, undefined);
process.exit();
Expand Down
4 changes: 1 addition & 3 deletions test/parallel/test-cluster-basic.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ if (cluster.isWorker) {
http.Server(function() {

}).listen(common.PORT, '127.0.0.1');
}

else if (cluster.isMaster) {
} else if (cluster.isMaster) {

var checks = {
cluster: {
Expand Down
3 changes: 1 addition & 2 deletions test/parallel/test-cluster-bind-privileged-port.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ if (cluster.isMaster) {
cluster.fork().on('exit', common.mustCall(function(exitCode) {
assert.equal(exitCode, 0);
}));
}
else {
} else {
var s = net.createServer(common.fail);
s.listen(42, common.fail.bind(null, 'listen should have failed'));
s.on('error', common.mustCall(function(err) {
Expand Down
9 changes: 3 additions & 6 deletions test/parallel/test-cluster-bind-twice.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@ if (!id) {
process.on('exit', function() {
assert(ok);
});
}
else if (id === 'one') {
} else if (id === 'one') {
if (cluster.isMaster) return startWorker();

http.createServer(common.fail).listen(common.PORT, function() {
Expand All @@ -75,8 +74,7 @@ else if (id === 'one') {
process.on('message', function(m) {
if (m === 'QUIT') process.exit();
});
}
else if (id === 'two') {
} else if (id === 'two') {
if (cluster.isMaster) return startWorker();

let ok = false;
Expand All @@ -96,8 +94,7 @@ else if (id === 'two') {
ok = true;
});
});
}
else {
} else {
assert(0); // bad command line argument
}

Expand Down
6 changes: 2 additions & 4 deletions test/parallel/test-cluster-eaddrinuse.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ if (id === 'undefined') {
});
});
});
}
else if (id === 'worker') {
} else if (id === 'worker') {
let server = net.createServer(common.fail);
server.listen(common.PORT, common.fail);
server.on('error', common.mustCall(function(e) {
Expand All @@ -36,7 +35,6 @@ else if (id === 'worker') {
}));
});
}));
}
else {
} else {
assert(0); // Bad argument.
}
3 changes: 1 addition & 2 deletions test/parallel/test-cluster-listening-port.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ if (cluster.isMaster) {
// ensure that the 'listening' handler has been called
assert(port);
});
}
else {
} else {
net.createServer(common.fail).listen(0);
}
4 changes: 1 addition & 3 deletions test/parallel/test-cluster-message.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ if (cluster.isWorker) {
});

server.listen(common.PORT, '127.0.0.1');
}

else if (cluster.isMaster) {
} else if (cluster.isMaster) {

var checks = {
global: {
Expand Down
3 changes: 1 addition & 2 deletions test/parallel/test-cluster-net-listen.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ if (cluster.isMaster) {
process.on('exit', function() {
assert.equal(worker, null);
});
}
else {
} else {
// listen() without port should not trigger a libuv assert
net.createServer(common.fail).listen(process.exit);
}
3 changes: 1 addition & 2 deletions test/parallel/test-cluster-shared-handle-bind-error.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ if (cluster.isMaster) {
server.close();
}));
});
}
else {
} else {
var s = net.createServer(common.fail);
s.listen(common.PORT, common.fail.bind(null, 'listen should have failed'));
s.on('error', common.mustCall(function(err) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ if (cluster.isMaster) {
cluster.fork().on('exit', common.mustCall(function(exitCode) {
assert.equal(exitCode, 0);
}));
}
else {
} else {
var s = net.createServer(common.fail);
s.listen(42, common.fail.bind(null, 'listen should have failed'));
s.on('error', common.mustCall(function(err) {
Expand Down
6 changes: 2 additions & 4 deletions test/parallel/test-cluster-uncaught-exception.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ if (isTestRunner) {
master.on('exit', function(code) {
exitCode = code;
});
}
else if (cluster.isMaster) {
} else if (cluster.isMaster) {
process.on('uncaughtException', function() {
process.nextTick(function() {
process.exit(MAGIC_EXIT_CODE);
Expand All @@ -33,7 +32,6 @@ else if (cluster.isMaster) {

cluster.fork();
throw new Error('kill master');
}
else { // worker
} else { // worker
process.exit();
}
3 changes: 1 addition & 2 deletions test/parallel/test-cluster-worker-death.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ var cluster = require('cluster');

if (!cluster.isMaster) {
process.exit(42);
}
else {
} else {
var seenExit = 0;
var seenDeath = 0;
var worker = cluster.fork();
Expand Down
16 changes: 7 additions & 9 deletions test/parallel/test-crypto-authenticated.js
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,7 @@ for (var i in TEST_CASES) {
(function() {
if (!test.password) return;
if (common.hasFipsCrypto) {
assert.throws(function()
{ crypto.createCipher(test.algo, test.password); },
assert.throws(() => { crypto.createCipher(test.algo, test.password); },
/not supported in FIPS mode/);
} else {
var encrypt = crypto.createCipher(test.algo, test.password);
Expand All @@ -383,8 +382,7 @@ for (var i in TEST_CASES) {
(function() {
if (!test.password) return;
if (common.hasFipsCrypto) {
assert.throws(function()
{ crypto.createDecipher(test.algo, test.password); },
assert.throws(() => { crypto.createDecipher(test.algo, test.password); },
/not supported in FIPS mode/);
} else {
var decrypt = crypto.createDecipher(test.algo, test.password);
Expand Down Expand Up @@ -415,9 +413,9 @@ for (var i in TEST_CASES) {
'ipxp9a6i1Mb4USb4', '6fKjEjR3Vl30EUYC');
encrypt.update('blah', 'ascii');
encrypt.final();
assert.throws(function() { encrypt.getAuthTag(); }, / state/);
assert.throws(function() {
encrypt.setAAD(Buffer.from('123', 'ascii')); }, / state/);
assert.throws(() => { encrypt.getAuthTag(); }, / state/);
assert.throws(() => { encrypt.setAAD(Buffer.from('123', 'ascii')); },
/ state/);
})();

(function() {
Expand All @@ -432,8 +430,8 @@ for (var i in TEST_CASES) {
// trying to set tag on encryption object:
var encrypt = crypto.createCipheriv(test.algo,
Buffer.from(test.key, 'hex'), Buffer.from(test.iv, 'hex'));
assert.throws(function() {
encrypt.setAuthTag(Buffer.from(test.tag, 'hex')); }, / state/);
assert.throws(() => { encrypt.setAuthTag(Buffer.from(test.tag, 'hex')); },
/ state/);
})();

(function() {
Expand Down
6 changes: 2 additions & 4 deletions test/parallel/test-debugger-util-regression.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,10 @@ proc.stdout.on('data', (data) => {
stdout.includes('> 4') && nextCount < 4) {
nextCount++;
proc.stdin.write('n\n');
}
else if (stdout.includes('{ a: \'b\' }')) {
} else if (stdout.includes('{ a: \'b\' }')) {
clearTimeout(timer);
proc.stdin.write('.exit\n');
}
else if (stdout.includes('program terminated')) {
} else if (stdout.includes('program terminated')) {
// Catch edge case present in v4.x
// process will terminate after call to util.inspect
common.fail('the program should not terminate');
Expand Down
3 changes: 1 addition & 2 deletions test/parallel/test-fs-open.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ try {
// should throw ENOENT, not EBADF
// see https://github.com/joyent/node/pull/1228
fs.openSync('/path/to/file/that/does/not/exist', 'r');
}
catch (e) {
} catch (e) {
assert.equal(e.code, 'ENOENT');
caughtException = true;
}
Expand Down
3 changes: 1 addition & 2 deletions test/parallel/test-fs-realpath.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ function asynctest(testBlock, args, callback, assertBlock) {
if (assertBlock) {
try {
ignoreError = assertBlock.apply(assertBlock, arguments);
}
catch (e) {
} catch (e) {
err = e;
}
}
Expand Down
3 changes: 1 addition & 2 deletions test/parallel/test-http-server-stale-close.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ if (process.env.NODE_TEST_FORK_PORT) {
}, process.exit);
req.write('BAM');
req.end();
}
else {
} else {
var server = http.createServer(function(req, res) {
res.writeHead(200, {'Content-Length': '42'});
req.pipe(res);
Expand Down
3 changes: 1 addition & 2 deletions test/parallel/test-next-tick-errors.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ process.on('uncaughtException', function() {
if (!exceptionHandled) {
exceptionHandled = true;
order.push('B');
}
else {
} else {
// If we get here then the first process.nextTick got called twice
order.push('OOPS!');
}
Expand Down
3 changes: 1 addition & 2 deletions test/parallel/test-process-argv-0.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ if (process.argv[2] !== 'child') {
process.on('exit', function() {
assert.equal(childArgv0, process.execPath);
});
}
else {
} else {
process.stdout.write(process.argv[0]);
}
20 changes: 12 additions & 8 deletions test/parallel/test-process-cpuUsage.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,18 @@ assert.throws(function() { process.cpuUsage({ user: null, system: 'c' }); });
assert.throws(function() { process.cpuUsage({ user: 'd', system: null }); });
assert.throws(function() { process.cpuUsage({ user: -1, system: 2 }); });
assert.throws(function() { process.cpuUsage({ user: 3, system: -2 }); });
assert.throws(function() { process.cpuUsage({
user: Number.POSITIVE_INFINITY,
system: 4
});});
assert.throws(function() { process.cpuUsage({
user: 5,
system: Number.NEGATIVE_INFINITY
});});
assert.throws(function() {
process.cpuUsage({
user: Number.POSITIVE_INFINITY,
system: 4
});
});
assert.throws(function() {
process.cpuUsage({
user: 5,
system: Number.NEGATIVE_INFINITY
});
});

// Ensure that the return value is the expected shape.
function validateResult(result) {
Expand Down
3 changes: 1 addition & 2 deletions test/parallel/test-repl-domain.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ putIn.write = function(data) {
// give a false negative. Don't throw, just print and exit.
if (data === 'OK\n') {
console.log('ok');
}
else {
} else {
console.error(data);
process.exit(1);
}
Expand Down
3 changes: 1 addition & 2 deletions test/parallel/test-vm-context.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ console.error('test runInContext signature');
var gh1140Exception;
try {
vm.runInContext('throw new Error()', context, 'expected-filename.js');
}
catch (e) {
} catch (e) {
gh1140Exception = e;
assert.ok(/expected-filename/.test(e.stack),
'expected appearance of filename in Error stack');
Expand Down
Loading