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.

Sign up for GitHub

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

Jump to bottom

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

Closed
wants to merge 1 commit into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ rules:
no-multiple-empty-lines: [2, {max: 2, maxEOF: 0, maxBOF: 0}]
no-tabs: 2
no-trailing-spaces: 2
one-var-declaration-per-line: 2
operator-linebreak: [2, after]
quotes: [2, single, avoid-escape]
semi: 2
Expand Down
4 changes: 2 additions & 2 deletions benchmark/domain/domain-fn-args.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ var gargs = [1, 2, 3];

function main(conf) {

var args, n = +conf.n;
var n = +conf.n;
Copy link
Member

Choose a reason for hiding this comment

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

Nit: any reason for putting this in for block instead of keeping it here on a separate line?

Copy link
Member Author

Choose a reason for hiding this comment

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

I think it's clearer to declare it in the block where it's used

Copy link
Member

Choose a reason for hiding this comment

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

Yeah but var is not block scoped so I think this only create confusion for newbies. Can const be used instead?

Copy link
Member Author

Choose a reason for hiding this comment

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

OK, I'll change it to const.

var myArguments = gargs.slice(0, conf.arguments);
bench.start();

bdomain.enter();
for (var i = 0; i < n; i++) {
if (myArguments.length >= 2) {
args = Array.prototype.slice.call(myArguments, 1);
var args = Array.prototype.slice.call(myArguments, 1);
fn.apply(this, args);
} else {
fn.call(this);
Expand Down
8 changes: 4 additions & 4 deletions benchmark/es/destructuring-bench.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ const bench = common.createBenchmark(main, {
});

function runSwapManual(n) {
var i = 0, x, y, r;
var x, y, r;
bench.start();
for (; i < n; i++) {
for (var i = 0; i < n; i++) {
x = 1, y = 2;
r = x;
x = y;
Expand All @@ -23,9 +23,9 @@ function runSwapManual(n) {
}

function runSwapDestructured(n) {
var i = 0, x, y;
var x, y;
bench.start();
for (; i < n; i++) {
for (var i = 0; i < n; i++) {
x = 1, y = 2;
[x, y] = [y, x];
assert.strictEqual(x, 2);
Expand Down
3 changes: 2 additions & 1 deletion lib/child_process.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ exports.exec = function(command /*, options, callback*/) {


exports.execFile = function(file /*, args, options, callback*/) {
var args = [], callback;
var args = [];
var callback;
var options = {
encoding: 'utf8',
timeout: 0,
Expand Down
4 changes: 2 additions & 2 deletions lib/readline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,9 +427,9 @@ Interface.prototype._tabComplete = function(lastKeypressWasTab) {
if (!maxColumns || maxColumns === Infinity) {
maxColumns = 1;
}
var group = [], c;
var group = [];
for (var i = 0, compLen = completions.length; i < compLen; i++) {
c = completions[i];
var c = completions[i];
if (c === '') {
handleGroup(self, group, width, maxColumns);
group = [];
Expand Down
4 changes: 3 additions & 1 deletion lib/repl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,9 @@ function REPLServer(prompt,
code = code.replace(/\n$/, '');
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

if (code === '\n')
Expand Down
4 changes: 3 additions & 1 deletion lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,8 +413,10 @@ function formatValue(ctx, value, recurseTimes) {
}
}

var base = '', empty = false, braces;
var base = '';
var empty = false;
var formatter = formatObject;
var braces;

// We can't compare constructors for various objects using a comparison like
// `constructor === Array` because the object could have come from a different
Expand Down
4 changes: 2 additions & 2 deletions test/parallel/test-child-process-fork-net2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ if (process.argv[2] === 'child') {
let disconnected = 0;
server.on('listening', function() {

let j = count, client;
let j = count;
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() {
// This can happen if we kill the child too early.
// The client should still get a close event afterwards.
Expand Down
3 changes: 2 additions & 1 deletion test/parallel/test-fs-realpath.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ const assert = require('assert');
const fs = require('fs');
const path = require('path');
const exec = require('child_process').exec;
let async_completed = 0, async_expected = 0;
let async_completed = 0;
let async_expected = 0;
const unlink = [];
let skipSymlinks = false;

Expand Down
3 changes: 2 additions & 1 deletion test/parallel/test-http-get-pipeline-problem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ const image = fs.readFileSync(common.fixturesDir + '/person.jpg');
console.log('image.length = ' + image.length);

const total = 10;
let requests = 0, responses = 0;
let requests = 0;
let responses = 0;

const server = http.Server(function(req, res) {
if (++requests === total) {
Expand Down
3 changes: 2 additions & 1 deletion test/parallel/test-tcp-wrap-listen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ port = port.port;

server.listen(128);

let sliceCount = 0, eofCount = 0;
let sliceCount = 0;
let eofCount = 0;

let writeCount = 0;
let recvCount = 0;
Expand Down
3 changes: 2 additions & 1 deletion test/parallel/test-whatwg-url-searchparams.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ assert.strictEqual(m.search, `?${serialized}`);

assert.strictEqual(sp[Symbol.iterator], sp.entries);

let key, val, n = 0;
let key, val;
let n = 0;
for ([key, val] of sp) {
assert.strictEqual(key, 'a');
assert.strictEqual(val, String(values[n++]));
Expand Down
3 changes: 2 additions & 1 deletion test/pummel/test-net-pause.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ const assert = require('assert');
const net = require('net');

const N = 200;
let recv = '', chars_recved = 0;
let recv = '';
let chars_recved = 0;

const server = net.createServer(function(connection) {
function write(j) {
Expand Down