tools: replace var to let/const
PR-URL: https://github.com/nodejs/node/pull/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>
This commit is contained in:
parent
95e3119bad
commit
ce8f01cf0c
@ -23,8 +23,8 @@ const bindingModules = cryptoModules.concat(['tls_wrap']);
|
|||||||
module.exports = function(context) {
|
module.exports = function(context) {
|
||||||
const missingCheckNodes = [];
|
const missingCheckNodes = [];
|
||||||
const requireNodes = [];
|
const requireNodes = [];
|
||||||
var commonModuleNode = null;
|
let commonModuleNode = null;
|
||||||
var hasSkipCall = false;
|
let hasSkipCall = false;
|
||||||
|
|
||||||
function testCryptoUsage(node) {
|
function testCryptoUsage(node) {
|
||||||
if (utils.isRequired(node, requireModules) ||
|
if (utils.isRequired(node, requireModules) ||
|
||||||
|
@ -14,8 +14,8 @@ const msg = 'Please add a skipIfEslintMissing() call to allow this test to ' +
|
|||||||
|
|
||||||
module.exports = function(context) {
|
module.exports = function(context) {
|
||||||
const missingCheckNodes = [];
|
const missingCheckNodes = [];
|
||||||
var commonModuleNode = null;
|
let commonModuleNode = null;
|
||||||
var hasEslintCheck = false;
|
let hasEslintCheck = false;
|
||||||
|
|
||||||
function testEslintUsage(context, node) {
|
function testEslintUsage(context, node) {
|
||||||
if (utils.isRequired(node, ['../../tools/node_modules/eslint'])) {
|
if (utils.isRequired(node, ['../../tools/node_modules/eslint'])) {
|
||||||
|
@ -15,8 +15,8 @@ const msg = 'Please add a skipIfInspectorDisabled() call to allow this ' +
|
|||||||
|
|
||||||
module.exports = function(context) {
|
module.exports = function(context) {
|
||||||
const missingCheckNodes = [];
|
const missingCheckNodes = [];
|
||||||
var commonModuleNode = null;
|
let commonModuleNode = null;
|
||||||
var hasInspectorCheck = false;
|
let hasInspectorCheck = false;
|
||||||
|
|
||||||
function testInspectorUsage(context, node) {
|
function testInspectorUsage(context, node) {
|
||||||
if (utils.isRequired(node, ['inspector'])) {
|
if (utils.isRequired(node, ['inspector'])) {
|
||||||
|
@ -11,8 +11,8 @@
|
|||||||
module.exports = function(context) {
|
module.exports = function(context) {
|
||||||
const sourceCode = context.getSourceCode();
|
const sourceCode = context.getSourceCode();
|
||||||
const regexpStack = [];
|
const regexpStack = [];
|
||||||
var regexpBuffer = [];
|
let regexpBuffer = [];
|
||||||
var inRegExp = false;
|
let inRegExp = false;
|
||||||
|
|
||||||
function report(node, startOffset) {
|
function report(node, startOffset) {
|
||||||
const indexOfDot = sourceCode.getIndexFromLoc(node.loc.start) + startOffset;
|
const indexOfDot = sourceCode.getIndexFromLoc(node.loc.start) + startOffset;
|
||||||
@ -25,13 +25,13 @@ module.exports = function(context) {
|
|||||||
|
|
||||||
const allowedModifiers = ['+', '*', '?', '{'];
|
const allowedModifiers = ['+', '*', '?', '{'];
|
||||||
function checkRegExp(nodes) {
|
function checkRegExp(nodes) {
|
||||||
var escaping = false;
|
let escaping = false;
|
||||||
var inCharClass = false;
|
let inCharClass = false;
|
||||||
for (var n = 0; n < nodes.length; ++n) {
|
for (let n = 0; n < nodes.length; ++n) {
|
||||||
const pair = nodes[n];
|
const pair = nodes[n];
|
||||||
const node = pair[0];
|
const node = pair[0];
|
||||||
const str = pair[1];
|
const str = pair[1];
|
||||||
for (var i = 0; i < str.length; ++i) {
|
for (let i = 0; i < str.length; ++i) {
|
||||||
switch (str[i]) {
|
switch (str[i]) {
|
||||||
case '[':
|
case '[':
|
||||||
if (!escaping)
|
if (!escaping)
|
||||||
@ -96,7 +96,7 @@ module.exports = function(context) {
|
|||||||
node.quasis.length);
|
node.quasis.length);
|
||||||
if (inRegExp &&
|
if (inRegExp &&
|
||||||
(isTemplate || (typeof node.value === 'string' && node.value.length))) {
|
(isTemplate || (typeof node.value === 'string' && node.value.length))) {
|
||||||
var p = node.parent;
|
let p = node.parent;
|
||||||
while (p && p.type === 'BinaryExpression') {
|
while (p && p.type === 'BinaryExpression') {
|
||||||
p = p.parent;
|
p = p.parent;
|
||||||
}
|
}
|
||||||
@ -105,7 +105,7 @@ module.exports = function(context) {
|
|||||||
p.callee.name === 'RegExp') {
|
p.callee.name === 'RegExp') {
|
||||||
if (isTemplate) {
|
if (isTemplate) {
|
||||||
const quasis = node.quasis;
|
const quasis = node.quasis;
|
||||||
for (var i = 0; i < quasis.length; ++i) {
|
for (let i = 0; i < quasis.length; ++i) {
|
||||||
const el = quasis[i];
|
const el = quasis[i];
|
||||||
if (el.type === 'TemplateElement' && el.value && el.value.cooked)
|
if (el.type === 'TemplateElement' && el.value && el.value.cooked)
|
||||||
regexpBuffer.push([el, el.value.cooked]);
|
regexpBuffer.push([el, el.value.cooked]);
|
||||||
|
@ -10,7 +10,7 @@ const utils = require('./rules-utils.js');
|
|||||||
module.exports = {
|
module.exports = {
|
||||||
create(context) {
|
create(context) {
|
||||||
const sourceCode = context.getSourceCode();
|
const sourceCode = context.getSourceCode();
|
||||||
var assertImported = false;
|
let assertImported = false;
|
||||||
|
|
||||||
function hasSameTokens(nodeA, nodeB) {
|
function hasSameTokens(nodeA, nodeB) {
|
||||||
const aTokens = sourceCode.getTokens(nodeA);
|
const aTokens = sourceCode.getTokens(nodeA);
|
||||||
|
@ -12,7 +12,7 @@ const path = require('path');
|
|||||||
|
|
||||||
module.exports = function(context) {
|
module.exports = function(context) {
|
||||||
// trim required module names
|
// trim required module names
|
||||||
var requiredModules = context.options;
|
const requiredModules = context.options;
|
||||||
const isESM = context.parserOptions.sourceType === 'module';
|
const isESM = context.parserOptions.sourceType === 'module';
|
||||||
|
|
||||||
const foundModules = [];
|
const foundModules = [];
|
||||||
@ -46,7 +46,7 @@ module.exports = function(context) {
|
|||||||
* @returns {undefined|String} required module name or undefined
|
* @returns {undefined|String} required module name or undefined
|
||||||
*/
|
*/
|
||||||
function getRequiredModuleName(str) {
|
function getRequiredModuleName(str) {
|
||||||
var value = path.basename(str);
|
const value = path.basename(str);
|
||||||
|
|
||||||
// Check if value is in required modules array
|
// Check if value is in required modules array
|
||||||
return requiredModules.indexOf(value) !== -1 ? value : undefined;
|
return requiredModules.indexOf(value) !== -1 ? value : undefined;
|
||||||
@ -70,7 +70,7 @@ module.exports = function(context) {
|
|||||||
const rules = {
|
const rules = {
|
||||||
'Program:exit'(node) {
|
'Program:exit'(node) {
|
||||||
if (foundModules.length < requiredModules.length) {
|
if (foundModules.length < requiredModules.length) {
|
||||||
var missingModules = requiredModules.filter(
|
const missingModules = requiredModules.filter(
|
||||||
(module) => foundModules.indexOf(module) === -1
|
(module) => foundModules.indexOf(module) === -1
|
||||||
);
|
);
|
||||||
missingModules.forEach((moduleName) => {
|
missingModules.forEach((moduleName) => {
|
||||||
@ -86,7 +86,7 @@ module.exports = function(context) {
|
|||||||
|
|
||||||
if (isESM) {
|
if (isESM) {
|
||||||
rules.ImportDeclaration = (node) => {
|
rules.ImportDeclaration = (node) => {
|
||||||
var requiredModuleName = getRequiredModuleName(node.source.value);
|
const requiredModuleName = getRequiredModuleName(node.source.value);
|
||||||
if (requiredModuleName) {
|
if (requiredModuleName) {
|
||||||
foundModules.push(requiredModuleName);
|
foundModules.push(requiredModuleName);
|
||||||
}
|
}
|
||||||
@ -94,7 +94,7 @@ module.exports = function(context) {
|
|||||||
} else {
|
} else {
|
||||||
rules.CallExpression = (node) => {
|
rules.CallExpression = (node) => {
|
||||||
if (isRequireCall(node)) {
|
if (isRequireCall(node)) {
|
||||||
var requiredModuleName = getRequiredModuleNameFromCall(node);
|
const requiredModuleName = getRequiredModuleNameFromCall(node);
|
||||||
|
|
||||||
if (requiredModuleName) {
|
if (requiredModuleName) {
|
||||||
foundModules.push(requiredModuleName);
|
foundModules.push(requiredModuleName);
|
||||||
|
@ -24,7 +24,7 @@ module.exports.isRequired = function(node, modules) {
|
|||||||
* Return true if common module is required
|
* Return true if common module is required
|
||||||
* in AST Node under inspection
|
* in AST Node under inspection
|
||||||
*/
|
*/
|
||||||
var commonModuleRegExp = new RegExp(/^(\.\.\/)*common(\.js)?$/);
|
const commonModuleRegExp = new RegExp(/^(\.\.\/)*common(\.js)?$/);
|
||||||
module.exports.isCommonModule = function(node) {
|
module.exports.isCommonModule = function(node) {
|
||||||
return node.callee.name === 'require' &&
|
return node.callee.name === 'require' &&
|
||||||
node.arguments.length !== 0 &&
|
node.arguments.length !== 0 &&
|
||||||
@ -63,7 +63,7 @@ module.exports.usesCommonProperty = function(node, properties) {
|
|||||||
* and the block also has a call to skip.
|
* and the block also has a call to skip.
|
||||||
*/
|
*/
|
||||||
module.exports.inSkipBlock = function(node) {
|
module.exports.inSkipBlock = function(node) {
|
||||||
var hasSkipBlock = false;
|
let hasSkipBlock = false;
|
||||||
if (node.test &&
|
if (node.test &&
|
||||||
node.test.type === 'UnaryExpression' &&
|
node.test.type === 'UnaryExpression' &&
|
||||||
node.test.operator === '!') {
|
node.test.operator === '!') {
|
||||||
|
@ -25,24 +25,24 @@ if (process.argv.indexOf('-F') !== -1)
|
|||||||
const cli = new CLIEngine(cliOptions);
|
const cli = new CLIEngine(cliOptions);
|
||||||
|
|
||||||
if (cluster.isMaster) {
|
if (cluster.isMaster) {
|
||||||
var numCPUs = 1;
|
let numCPUs = 1;
|
||||||
const paths = [];
|
const paths = [];
|
||||||
var files = null;
|
let files = null;
|
||||||
var totalPaths = 0;
|
let totalPaths = 0;
|
||||||
var failures = 0;
|
let failures = 0;
|
||||||
var successes = 0;
|
let successes = 0;
|
||||||
var lastLineLen = 0;
|
let lastLineLen = 0;
|
||||||
var curPath = 'Starting ...';
|
let curPath = 'Starting ...';
|
||||||
var showProgress = true;
|
let showProgress = true;
|
||||||
const globOptions = {
|
const globOptions = {
|
||||||
nodir: true
|
nodir: true
|
||||||
};
|
};
|
||||||
const workerConfig = {};
|
const workerConfig = {};
|
||||||
var startTime;
|
let startTime;
|
||||||
var formatter;
|
let formatter;
|
||||||
var outFn;
|
let outFn;
|
||||||
var fd;
|
let fd;
|
||||||
var i;
|
let i;
|
||||||
|
|
||||||
// Check if spreading work among all cores/cpus
|
// Check if spreading work among all cores/cpus
|
||||||
if (process.argv.indexOf('-J') !== -1)
|
if (process.argv.indexOf('-J') !== -1)
|
||||||
@ -169,7 +169,7 @@ if (cluster.isMaster) {
|
|||||||
// We either just started or we have no more files to lint for the current
|
// We either just started or we have no more files to lint for the current
|
||||||
// path. Find the next path that has some files to be linted.
|
// path. Find the next path that has some files to be linted.
|
||||||
while (paths.length) {
|
while (paths.length) {
|
||||||
var dir = paths.shift();
|
let dir = paths.shift();
|
||||||
curPath = dir;
|
curPath = dir;
|
||||||
const patterns = cli.resolveFileGlobPatterns([dir]);
|
const patterns = cli.resolveFileGlobPatterns([dir]);
|
||||||
dir = path.resolve(patterns[0]);
|
dir = path.resolve(patterns[0]);
|
||||||
@ -188,7 +188,7 @@ if (cluster.isMaster) {
|
|||||||
// workers busy most of the time instead of only a minority doing most of
|
// workers busy most of the time instead of only a minority doing most of
|
||||||
// the work.
|
// the work.
|
||||||
const sliceLen = Math.min(maxWorkload, Math.ceil(files.length / numCPUs));
|
const sliceLen = Math.min(maxWorkload, Math.ceil(files.length / numCPUs));
|
||||||
var slice;
|
let slice;
|
||||||
if (sliceLen === files.length) {
|
if (sliceLen === files.length) {
|
||||||
// Micro-optimization to avoid splicing to an empty array
|
// Micro-optimization to avoid splicing to an empty array
|
||||||
slice = files;
|
slice = files;
|
||||||
@ -212,10 +212,10 @@ if (cluster.isMaster) {
|
|||||||
const secs = `${elapsed % 60}`.padStart(2, '0');
|
const secs = `${elapsed % 60}`.padStart(2, '0');
|
||||||
const passed = `${successes}`.padStart(6);
|
const passed = `${successes}`.padStart(6);
|
||||||
const failed = `${failures}`.padStart(6);
|
const failed = `${failures}`.padStart(6);
|
||||||
var pct = Math.ceil(((totalPaths - paths.length) / totalPaths) * 100);
|
let pct = `${Math.ceil(((totalPaths - paths.length) / totalPaths) * 100)}`;
|
||||||
pct = `${pct}`.padStart(3);
|
pct = pct.padStart(3);
|
||||||
|
|
||||||
var line = `[${mins}:${secs}|%${pct}|+${passed}|-${failed}]: ${curPath}`;
|
let line = `[${mins}:${secs}|%${pct}|+${passed}|-${failed}]: ${curPath}`;
|
||||||
|
|
||||||
// Truncate line like cpplint does in case it gets too long
|
// Truncate line like cpplint does in case it gets too long
|
||||||
if (line.length > 75)
|
if (line.length > 75)
|
||||||
@ -229,7 +229,7 @@ if (cluster.isMaster) {
|
|||||||
} else {
|
} else {
|
||||||
// Worker
|
// Worker
|
||||||
|
|
||||||
var config = {};
|
let config = {};
|
||||||
process.on('message', (files) => {
|
process.on('message', (files) => {
|
||||||
if (files instanceof Array) {
|
if (files instanceof Array) {
|
||||||
// Lint some files
|
// Lint some files
|
||||||
@ -246,7 +246,7 @@ if (cluster.isMaster) {
|
|||||||
// Silence warnings for files with no errors while keeping the "ok"
|
// Silence warnings for files with no errors while keeping the "ok"
|
||||||
// status
|
// status
|
||||||
if (report.warningCount > 0) {
|
if (report.warningCount > 0) {
|
||||||
for (var i = 0; i < results.length; ++i) {
|
for (let i = 0; i < results.length; ++i) {
|
||||||
const result = results[i];
|
const result = results[i];
|
||||||
if (result.errorCount === 0 && result.warningCount > 0) {
|
if (result.errorCount === 0 && result.warningCount > 0) {
|
||||||
result.warningCount = 0;
|
result.warningCount = 0;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user