FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

tools: replace var to let/const · nodejs/node@57198f2 · GitHub

/ node Public

Commit 57198f2

Browse files
Masashi Hirano
authored and
BridgeAR
committed
tools: replace var to let/const
PR-URL: #26398 Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
1 parent 81c5382 commit 57198f2

8 files changed

Lines changed: 42 additions & 42 deletions

File tree

‎tools/eslint-rules/crypto-check.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ const bindingModules = cryptoModules.concat(['tls_wrap']);
2323
module.exports = function(context) {
2424
const missingCheckNodes = [];
2525
const requireNodes = [];
26-
var commonModuleNode = null;
27-
var hasSkipCall = false;
26+
let commonModuleNode = null;
27+
let hasSkipCall = false;
2828

2929
function testCryptoUsage(node) {
3030
if (utils.isRequired(node, requireModules) ||

‎tools/eslint-rules/eslint-check.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ const msg = 'Please add a skipIfEslintMissing() call to allow this test to ' +
1414

1515
module.exports = function(context) {
1616
const missingCheckNodes = [];
17-
var commonModuleNode = null;
18-
var hasEslintCheck = false;
17+
let commonModuleNode = null;
18+
let hasEslintCheck = false;
1919

2020
function testEslintUsage(context, node) {
2121
if (utils.isRequired(node, ['../../tools/node_modules/eslint'])) {

‎tools/eslint-rules/inspector-check.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ const msg = 'Please add a skipIfInspectorDisabled() call to allow this ' +
1515

1616
module.exports = function(context) {
1717
const missingCheckNodes = [];
18-
var commonModuleNode = null;
19-
var hasInspectorCheck = false;
18+
let commonModuleNode = null;
19+
let hasInspectorCheck = false;
2020

2121
function testInspectorUsage(context, node) {
2222
if (utils.isRequired(node, ['inspector'])) {

‎tools/eslint-rules/no-unescaped-regexp-dot.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
module.exports = function(context) {
1212
const sourceCode = context.getSourceCode();
1313
const regexpStack = [];
14-
var regexpBuffer = [];
15-
var inRegExp = false;
14+
let regexpBuffer = [];
15+
let inRegExp = false;
1616

1717
function report(node, startOffset) {
1818
const indexOfDot = sourceCode.getIndexFromLoc(node.loc.start) + startOffset;
@@ -25,13 +25,13 @@ module.exports = function(context) {
2525

2626
const allowedModifiers = ['+', '*', '?', '{'];
2727
function checkRegExp(nodes) {
28-
var escaping = false;
29-
var inCharClass = false;
30-
for (var n = 0; n < nodes.length; ++n) {
28+
let escaping = false;
29+
let inCharClass = false;
30+
for (let n = 0; n < nodes.length; ++n) {
3131
const pair = nodes[n];
3232
const node = pair[0];
3333
const str = pair[1];
34-
for (var i = 0; i < str.length; ++i) {
34+
for (let i = 0; i < str.length; ++i) {
3535
switch (str[i]) {
3636
case '[':
3737
if (!escaping)
@@ -96,7 +96,7 @@ module.exports = function(context) {
9696
node.quasis.length);
9797
if (inRegExp &&
9898
(isTemplate || (typeof node.value === 'string' && node.value.length))) {
99-
var p = node.parent;
99+
let p = node.parent;
100100
while (p && p.type === 'BinaryExpression') {
101101
p = p.parent;
102102
}
@@ -105,7 +105,7 @@ module.exports = function(context) {
105105
p.callee.name === 'RegExp') {
106106
if (isTemplate) {
107107
const quasis = node.quasis;
108-
for (var i = 0; i < quasis.length; ++i) {
108+
for (let i = 0; i < quasis.length; ++i) {
109109
const el = quasis[i];
110110
if (el.type === 'TemplateElement' && el.value && el.value.cooked)
111111
regexpBuffer.push([el, el.value.cooked]);

‎tools/eslint-rules/prefer-assert-iferror.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const utils = require('./rules-utils.js');
1010
module.exports = {
1111
create(context) {
1212
const sourceCode = context.getSourceCode();
13-
var assertImported = false;
13+
let assertImported = false;
1414

1515
function hasSameTokens(nodeA, nodeB) {
1616
const aTokens = sourceCode.getTokens(nodeA);

‎tools/eslint-rules/required-modules.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const path = require('path');
1212

1313
module.exports = function(context) {
1414
// trim required module names
15-
var requiredModules = context.options;
15+
const requiredModules = context.options;
1616
const isESM = context.parserOptions.sourceType === 'module';
1717

1818
const foundModules = [];
@@ -46,7 +46,7 @@ module.exports = function(context) {
4646
* @returns {undefined|String} required module name or undefined
4747
*/
4848
function getRequiredModuleName(str) {
49-
var value = path.basename(str);
49+
const value = path.basename(str);
5050

5151
// Check if value is in required modules array
5252
return requiredModules.indexOf(value) !== -1 ? value : undefined;
@@ -70,7 +70,7 @@ module.exports = function(context) {
7070
const rules = {
7171
'Program:exit'(node) {
7272
if (foundModules.length < requiredModules.length) {
73-
var missingModules = requiredModules.filter(
73+
const missingModules = requiredModules.filter(
7474
(module) => foundModules.indexOf(module) === -1
7575
);
7676
missingModules.forEach((moduleName) => {
@@ -86,15 +86,15 @@ module.exports = function(context) {
8686

8787
if (isESM) {
8888
rules.ImportDeclaration = (node) => {
89-
var requiredModuleName = getRequiredModuleName(node.source.value);
89+
const requiredModuleName = getRequiredModuleName(node.source.value);
9090
if (requiredModuleName) {
9191
foundModules.push(requiredModuleName);
9292
}
9393
};
9494
} else {
9595
rules.CallExpression = (node) => {
9696
if (isRequireCall(node)) {
97-
var requiredModuleName = getRequiredModuleNameFromCall(node);
97+
const requiredModuleName = getRequiredModuleNameFromCall(node);
9898

9999
if (requiredModuleName) {
100100
foundModules.push(requiredModuleName);

‎tools/eslint-rules/rules-utils.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module.exports.isRequired = function(node, modules) {
2424
* Return true if common module is required
2525
* in AST Node under inspection
2626
*/
27-
var commonModuleRegExp = new RegExp(/^(\.\.\/)*common(\.js)?$/);
27+
const commonModuleRegExp = new RegExp(/^(\.\.\/)*common(\.js)?$/);
2828
module.exports.isCommonModule = function(node) {
2929
return node.callee.name === 'require' &&
3030
node.arguments.length !== 0 &&
@@ -63,7 +63,7 @@ module.exports.usesCommonProperty = function(node, properties) {
6363
* and the block also has a call to skip.
6464
*/
6565
module.exports.inSkipBlock = function(node) {
66-
var hasSkipBlock = false;
66+
let hasSkipBlock = false;
6767
if (node.test &&
6868
node.test.type === 'UnaryExpression' &&
6969
node.test.operator === '!') {

‎tools/lint-js.js‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,24 @@ if (process.argv.indexOf('-F') !== -1)
2525
const cli = new CLIEngine(cliOptions);
2626

2727
if (cluster.isMaster) {
28-
var numCPUs = 1;
28+
let numCPUs = 1;
2929
const paths = [];
30-
var files = null;
31-
var totalPaths = 0;
32-
var failures = 0;
33-
var successes = 0;
34-
var lastLineLen = 0;
35-
var curPath = 'Starting ...';
36-
var showProgress = true;
30+
let files = null;
31+
let totalPaths = 0;
32+
let failures = 0;
33+
let successes = 0;
34+
let lastLineLen = 0;
35+
let curPath = 'Starting ...';
36+
let showProgress = true;
3737
const globOptions = {
3838
nodir: true
3939
};
4040
const workerConfig = {};
41-
var startTime;
42-
var formatter;
43-
var outFn;
44-
var fd;
45-
var i;
41+
let startTime;
42+
let formatter;
43+
let outFn;
44+
let fd;
45+
let i;
4646

4747
// Check if spreading work among all cores/cpus
4848
if (process.argv.indexOf('-J') !== -1)
@@ -169,7 +169,7 @@ if (cluster.isMaster) {
169169
// We either just started or we have no more files to lint for the current
170170
// path. Find the next path that has some files to be linted.
171171
while (paths.length) {
172-
var dir = paths.shift();
172+
let dir = paths.shift();
173173
curPath = dir;
174174
const patterns = cli.resolveFileGlobPatterns([dir]);
175175
dir = path.resolve(patterns[0]);
@@ -188,7 +188,7 @@ if (cluster.isMaster) {
188188
// workers busy most of the time instead of only a minority doing most of
189189
// the work.
190190
const sliceLen = Math.min(maxWorkload, Math.ceil(files.length / numCPUs));
191-
var slice;
191+
let slice;
192192
if (sliceLen === files.length) {
193193
// Micro-optimization to avoid splicing to an empty array
194194
slice = files;
@@ -212,10 +212,10 @@ if (cluster.isMaster) {
212212
const secs = `${elapsed % 60}`.padStart(2, '0');
213213
const passed = `${successes}`.padStart(6);
214214
const failed = `${failures}`.padStart(6);
215-
var pct = Math.ceil(((totalPaths - paths.length) / totalPaths) * 100);
216-
pct = `${pct}`.padStart(3);
215+
let pct = `${Math.ceil(((totalPaths - paths.length) / totalPaths) * 100)}`;
216+
pct = pct.padStart(3);
217217

218-
var line = `[${mins}:${secs}|%${pct}|+${passed}|-${failed}]: ${curPath}`;
218+
let line = `[${mins}:${secs}|%${pct}|+${passed}|-${failed}]: ${curPath}`;
219219

220220
// Truncate line like cpplint does in case it gets too long
221221
if (line.length > 75)
@@ -229,7 +229,7 @@ if (cluster.isMaster) {
229229
} else {
230230
// Worker
231231

232-
var config = {};
232+
let config = {};
233233
process.on('message', (files) => {
234234
if (files instanceof Array) {
235235
// Lint some files
@@ -246,7 +246,7 @@ if (cluster.isMaster) {
246246
// Silence warnings for files with no errors while keeping the "ok"
247247
// status
248248
if (report.warningCount > 0) {
249-
for (var i = 0; i < results.length; ++i) {
249+
for (let i = 0; i < results.length; ++i) {
250250
const result = results[i];
251251
if (result.errorCount === 0 && result.warningCount > 0) {
252252
result.warningCount = 0;

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL