tools: enable one-var-declaration-per-line ESLint rule

This rule enforces new lines around variable declarations. It is
configured to spot only variables that are initialized.

PR-URL: https://github.com/nodejs/node/pull/11462
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Yuta Hiroto <hello@about-hiroppy.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
This commit is contained in:
Michaël Zasso 2017-02-19 13:45:30 +01:00
parent a4c3e31ac7
commit 193468667b
13 changed files with 29 additions and 18 deletions

View File

@ -103,6 +103,7 @@ rules:
no-multiple-empty-lines: [2, {max: 2, maxEOF: 0, maxBOF: 0}] no-multiple-empty-lines: [2, {max: 2, maxEOF: 0, maxBOF: 0}]
no-tabs: 2 no-tabs: 2
no-trailing-spaces: 2 no-trailing-spaces: 2
one-var-declaration-per-line: 2
operator-linebreak: [2, after] operator-linebreak: [2, after]
quotes: [2, single, avoid-escape] quotes: [2, single, avoid-escape]
semi: 2 semi: 2

View File

@ -12,14 +12,14 @@ var gargs = [1, 2, 3];
function main(conf) { function main(conf) {
var args, n = +conf.n; var n = +conf.n;
var myArguments = gargs.slice(0, conf.arguments); var myArguments = gargs.slice(0, conf.arguments);
bench.start(); bench.start();
bdomain.enter(); bdomain.enter();
for (var i = 0; i < n; i++) { for (var i = 0; i < n; i++) {
if (myArguments.length >= 2) { if (myArguments.length >= 2) {
args = Array.prototype.slice.call(myArguments, 1); const args = Array.prototype.slice.call(myArguments, 1);
fn.apply(this, args); fn.apply(this, args);
} else { } else {
fn.call(this); fn.call(this);

View File

@ -9,9 +9,9 @@ const bench = common.createBenchmark(main, {
}); });
function runSwapManual(n) { function runSwapManual(n) {
var i = 0, x, y, r; var x, y, r;
bench.start(); bench.start();
for (; i < n; i++) { for (var i = 0; i < n; i++) {
x = 1, y = 2; x = 1, y = 2;
r = x; r = x;
x = y; x = y;
@ -23,9 +23,9 @@ function runSwapManual(n) {
} }
function runSwapDestructured(n) { function runSwapDestructured(n) {
var i = 0, x, y; var x, y;
bench.start(); bench.start();
for (; i < n; i++) { for (var i = 0; i < n; i++) {
x = 1, y = 2; x = 1, y = 2;
[x, y] = [y, x]; [x, y] = [y, x];
assert.strictEqual(x, 2); assert.strictEqual(x, 2);

View File

@ -126,7 +126,8 @@ exports.exec = function(command /*, options, callback*/) {
exports.execFile = function(file /*, args, options, callback*/) { exports.execFile = function(file /*, args, options, callback*/) {
var args = [], callback; var args = [];
var callback;
var options = { var options = {
encoding: 'utf8', encoding: 'utf8',
timeout: 0, timeout: 0,

View File

@ -427,9 +427,9 @@ Interface.prototype._tabComplete = function(lastKeypressWasTab) {
if (!maxColumns || maxColumns === Infinity) { if (!maxColumns || maxColumns === Infinity) {
maxColumns = 1; maxColumns = 1;
} }
var group = [], c; var group = [];
for (var i = 0, compLen = completions.length; i < compLen; i++) { for (var i = 0, compLen = completions.length; i < compLen; i++) {
c = completions[i]; var c = completions[i];
if (c === '') { if (c === '') {
handleGroup(self, group, width, maxColumns); handleGroup(self, group, width, maxColumns);
group = []; group = [];

View File

@ -266,7 +266,9 @@ function REPLServer(prompt,
code = code.replace(/\n$/, ''); code = code.replace(/\n$/, '');
code = preprocess(code); code = preprocess(code);
var err, result, retry = false, input = code, wrappedErr; var retry = false;
var input = code;
var err, result, wrappedErr;
// first, create the Script object to check the syntax // first, create the Script object to check the syntax
if (code === '\n') if (code === '\n')

View File

@ -413,8 +413,10 @@ function formatValue(ctx, value, recurseTimes) {
} }
} }
var base = '', empty = false, braces; var base = '';
var empty = false;
var formatter = formatObject; var formatter = formatObject;
var braces;
// We can't compare constructors for various objects using a comparison like // We can't compare constructors for various objects using a comparison like
// `constructor === Array` because the object could have come from a different // `constructor === Array` because the object could have come from a different

View File

@ -97,9 +97,9 @@ if (process.argv[2] === 'child') {
let disconnected = 0; let disconnected = 0;
server.on('listening', function() { server.on('listening', function() {
let j = count, client; let j = count;
while (j--) { while (j--) {
client = net.connect(this.address().port, '127.0.0.1'); const client = net.connect(this.address().port, '127.0.0.1');
client.on('error', function() { client.on('error', function() {
// This can happen if we kill the child too early. // This can happen if we kill the child too early.
// The client should still get a close event afterwards. // The client should still get a close event afterwards.

View File

@ -4,7 +4,8 @@ const assert = require('assert');
const fs = require('fs'); const fs = require('fs');
const path = require('path'); const path = require('path');
const exec = require('child_process').exec; const exec = require('child_process').exec;
let async_completed = 0, async_expected = 0; let async_completed = 0;
let async_expected = 0;
const unlink = []; const unlink = [];
let skipSymlinks = false; let skipSymlinks = false;

View File

@ -16,7 +16,8 @@ const image = fs.readFileSync(common.fixturesDir + '/person.jpg');
console.log('image.length = ' + image.length); console.log('image.length = ' + image.length);
const total = 10; const total = 10;
let requests = 0, responses = 0; let requests = 0;
let responses = 0;
const server = http.Server(function(req, res) { const server = http.Server(function(req, res) {
if (++requests === total) { if (++requests === total) {

View File

@ -15,7 +15,8 @@ port = port.port;
server.listen(128); server.listen(128);
let sliceCount = 0, eofCount = 0; let sliceCount = 0;
let eofCount = 0;
let writeCount = 0; let writeCount = 0;
let recvCount = 0; let recvCount = 0;

View File

@ -36,7 +36,8 @@ assert.strictEqual(m.search, `?${serialized}`);
assert.strictEqual(sp[Symbol.iterator], sp.entries); assert.strictEqual(sp[Symbol.iterator], sp.entries);
let key, val, n = 0; let key, val;
let n = 0;
for ([key, val] of sp) { for ([key, val] of sp) {
assert.strictEqual(key, 'a'); assert.strictEqual(key, 'a');
assert.strictEqual(val, String(values[n++])); assert.strictEqual(val, String(values[n++]));

View File

@ -4,7 +4,8 @@ const assert = require('assert');
const net = require('net'); const net = require('net');
const N = 200; const N = 200;
let recv = '', chars_recved = 0; let recv = '';
let chars_recved = 0;
const server = net.createServer(function(connection) { const server = net.createServer(function(connection) {
function write(j) { function write(j) {