Skip to content

Commit 55b80f9

Browse files
silverwindsilverwind
committed
tools: enable block-scoped-var eslint rule
PR-URL: #27616 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent 99b196d commit 55b80f9

File tree

11 files changed

+31
-20
lines changed

11 files changed

+31
-20
lines changed

‎.eslintrc.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ module.exports = {
5959
'array-callback-return': 'error',
6060
'arrow-parens': ['error', 'always'],
6161
'arrow-spacing': ['error', { before: true, after: true }],
62+
'block-scoped-var': 'error',
6263
'block-spacing': 'error',
6364
'brace-style': ['error', '1tbs', { allowSingleLine: true }],
6465
'capitalized-comments': ['error', 'always', {

‎benchmark/fixtures/simple-http-server.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ const storedUnicode = Object.create(null);
1010
const useDomains = process.env.NODE_USE_DOMAINS;
1111

1212
// Set up one global domain.
13+
let domain;
1314
if (useDomains) {
14-
var domain = require('domain');
15+
domain = require('domain');
1516
const gdom = domain.create();
1617
gdom.on('error', (er) => {
1718
console.error('Error on global domain', er);

‎benchmark/http/_chunky_http_client.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function main({ len, n }) {
1616
const headers = [];
1717
// Chose 7 because 9 showed "Connection error" / "Connection closed"
1818
// An odd number could result in a better length dispersion.
19-
for (var i = 7; i <= 7 * 7 * 7; i *= 7)
19+
for (let i = 7; i <= 7 * 7 * 7; i *= 7)
2020
headers.push('o'.repeat(i));
2121

2222
function WriteHTTPHeaders(channel, has_keep_alive, extra_header_count) {
@@ -31,7 +31,7 @@ function main({ len, n }) {
3131
'Chrome/39.0.2171.71 Safari/537.36');
3232
todo.push('Accept-Encoding: gzip, deflate, sdch');
3333
todo.push('Accept-Language: en-US,en;q=0.8');
34-
for (var i = 0; i < extra_header_count; i++) {
34+
for (let i = 0; i < extra_header_count; i++) {
3535
// Utilize first three powers of a small integer for an odd cycle and
3636
// because the fourth power of some integers overloads the server.
3737
todo.push(`X-Header-${i}: ${headers[i % 3]}`);
@@ -41,7 +41,7 @@ function main({ len, n }) {
4141
todo = todo.join('\r\n');
4242
// Using odd numbers in many places may increase length coverage.
4343
const chunksize = 37;
44-
for (i = 0; i < todo.length; i += chunksize) {
44+
for (let i = 0; i < todo.length; i += chunksize) {
4545
const cur = todo.slice(i, i + chunksize);
4646
channel.write(cur);
4747
}

‎benchmark/http/cluster.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ const common = require('../common.js');
33
const PORT = common.PORT;
44

55
const cluster = require('cluster');
6+
let bench;
67
if (cluster.isMaster) {
7-
var bench = common.createBenchmark(main, {
8+
bench = common.createBenchmark(main, {
89
// Unicode confuses ab on os x.
910
type: ['bytes', 'buffer'],
1011
len: [4, 1024, 102400],

‎benchmark/napi/function_call/index.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ const common = require('../../common.js');
1111
// which is quite common for benchmarks. so in that case, just
1212
// abort quietly.
1313

14+
let binding;
1415
try {
15-
var binding = require(`./build/${common.buildType}/binding`);
16+
binding = require(`./build/${common.buildType}/binding`);
1617
} catch {
1718
console.error('misc/function_call.js Binding failed to load');
1819
process.exit(0);

‎benchmark/util/priority-queue.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ function main({ n, type }) {
1010
const PriorityQueue = require('internal/priority_queue');
1111
const queue = new PriorityQueue();
1212
bench.start();
13-
for (var i = 0; i < n; i++)
13+
for (let i = 0; i < n; i++)
1414
queue.insert(Math.random() * 1e7 | 0);
15-
for (i = 0; i < n; i++)
15+
for (let i = 0; i < n; i++)
1616
queue.shift();
1717
bench.end(n);
1818
}

‎lib/dgram.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,9 @@ function Socket(type, listener) {
9191
let recvBufferSize;
9292
let sendBufferSize;
9393

94+
let options;
9495
if (type !== null && typeof type === 'object') {
95-
var options = type;
96+
options = type;
9697
type = options.type;
9798
lookup = options.lookup;
9899
recvBufferSize = options.recvBufferSize;

‎lib/internal/child_process.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,6 +693,8 @@ function setupChannel(target, channel) {
693693
options = { swallowErrors: options };
694694
}
695695

696+
let obj;
697+
696698
// Package messages with a handle object
697699
if (handle) {
698700
// This message will be handled by an internalMessage event handler
@@ -727,7 +729,7 @@ function setupChannel(target, channel) {
727729
return this._handleQueue.length === 1;
728730
}
729731

730-
var obj = handleConversion[message.type];
732+
obj = handleConversion[message.type];
731733

732734
// convert TCP object to native handle object
733735
handle = handleConversion[message.type].send.call(target,

‎lib/internal/util.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,12 +316,13 @@ promisify.custom = kCustomPromisifiedSymbol;
316316
function join(output, separator) {
317317
let str = '';
318318
if (output.length !== 0) {
319-
for (var i = 0; i < output.length - 1; i++) {
319+
const lastIndex = output.length - 1;
320+
for (let i = 0; i < lastIndex; i++) {
320321
// It is faster not to use a template string here
321322
str += output[i];
322323
str += separator;
323324
}
324-
str += output[i];
325+
str += output[lastIndex];
325326
}
326327
return str;
327328
}

‎lib/internal/util/inspect.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,8 @@ function strEscape(str) {
312312

313313
let result = '';
314314
let last = 0;
315-
for (var i = 0; i < str.length; i++) {
315+
const lastIndex = str.length;
316+
for (let i = 0; i < lastIndex; i++) {
316317
const point = str.charCodeAt(i);
317318
if (point === singleQuote || point === 92 || point < 32) {
318319
if (last === i) {
@@ -324,7 +325,7 @@ function strEscape(str) {
324325
}
325326
}
326327

327-
if (last !== i) {
328+
if (last !== lastIndex) {
328329
result += str.slice(last);
329330
}
330331
return addQuotes(result, singleQuote);
@@ -1061,10 +1062,11 @@ function formatPrimitive(fn, value, ctx) {
10611062
if (matches.length > 1) {
10621063
const indent = ' '.repeat(ctx.indentationLvl);
10631064
let res = `${fn(strEscape(matches[0]), 'string')} +\n`;
1064-
for (var i = 1; i < matches.length - 1; i++) {
1065+
const lastIndex = matches.length - 1;
1066+
for (let i = 1; i < lastIndex; i++) {
10651067
res += `${indent} ${fn(strEscape(matches[i]), 'string')} +\n`;
10661068
}
1067-
res += `${indent} ${fn(strEscape(matches[i]), 'string')}`;
1069+
res += `${indent} ${fn(strEscape(matches[lastIndex]), 'string')}`;
10681070
return res;
10691071
}
10701072
}
@@ -1187,10 +1189,10 @@ function formatTypedArray(ctx, value, recurseTimes) {
11871189
const elementFormatter = value.length > 0 && typeof value[0] === 'number' ?
11881190
formatNumber :
11891191
formatBigInt;
1190-
for (var i = 0; i < maxLength; ++i)
1192+
for (let i = 0; i < maxLength; ++i)
11911193
output[i] = elementFormatter(ctx.stylize, value[i]);
11921194
if (remaining > 0) {
1193-
output[i] = `... ${remaining} more item${remaining > 1 ? 's' : ''}`;
1195+
output[maxLength] = `... ${remaining} more item${remaining > 1 ? 's' : ''}`;
11941196
}
11951197
if (ctx.showHidden) {
11961198
// .buffer goes last, it's not a primitive like the others.

0 commit comments

Comments
 (0)