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.

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

tools: refactor for arrow callbacks and trailing commas #26394

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 7 additions & 2 deletions tools/.eslintrc.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
rules:
# Variables
# http://eslint.org/docs/rules/#variables
comma-dangle:
- error
- arrays: 'always-multiline'
objects: 'only-multiline'
imports: 'only-multiline'
exports: 'only-multiline'
no-unused-vars: [error, { args: 'after-used' }]
prefer-arrow-callback: error
2 changes: 1 addition & 1 deletion tools/doc/addon-verify.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ ${files[name].replace(
target_name: 'addon',
sources: files.map(({ name }) => name),
includes: ['../common.gypi'],
}
},
]
})
});
Expand Down
2 changes: 1 addition & 1 deletion tools/doc/generate.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ let nodeVersion = null;
let outputDir = null;
let apilinks = {};

args.forEach(function(arg) {
args.forEach((arg) => {
if (!arg.startsWith('--')) {
filename = arg;
} else if (arg.startsWith('--node-version=')) {
Expand Down
2 changes: 1 addition & 1 deletion tools/doc/html.js
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ function altDocs(filename, docCreated) {
{ num: '5.x' },
{ num: '4.x' },
{ num: '0.12.x' },
{ num: '0.10.x' }
{ num: '0.10.x' },
];

const getHref = (versionNum) =>
Expand Down
6 changes: 2 additions & 4 deletions tools/eslint-rules/required-modules.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,9 @@ module.exports = function(context) {
'Program:exit'(node) {
if (foundModules.length < requiredModules.length) {
var missingModules = requiredModules.filter(
function(module) {
return foundModules.indexOf(module) === -1;
}
(module) => foundModules.indexOf(module) === -1
);
missingModules.forEach(function(moduleName) {
missingModules.forEach((moduleName) => {
context.report(
node,
'Mandatory module "{{moduleName}}" must be loaded.',
Expand Down
2 changes: 1 addition & 1 deletion tools/eslint-rules/rules-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ module.exports.inSkipBlock = function(node) {
node.test.operator === '!') {
const consequent = node.consequent;
if (consequent.body) {
consequent.body.some(function(expressionStatement) {
consequent.body.some((expressionStatement) => {
if (hasSkip(expressionStatement.expression)) {
return hasSkipBlock = true;
}
Expand Down
16 changes: 4 additions & 12 deletions tools/license2rtf.js
Original file line number Diff line number Diff line change
Expand Up @@ -222,20 +222,12 @@ function rtfEscape(string) {
}

return string
.replace(/[\\{}]/g, function(m) {
return `\\${m}`;
})
.replace(/\t/g, function() {
return '\\tab ';
})
.replace(/[\\{}]/g, (m) => `\\${m}`)
.replace(/\t/g, () => '\\tab ')
// eslint-disable-next-line no-control-regex
.replace(/[\x00-\x1f\x7f-\xff]/g, function(m) {
return `\\'${toHex(m.charCodeAt(0), 2)}`;
})
.replace(/[\x00-\x1f\x7f-\xff]/g, (m) => `\\'${toHex(m.charCodeAt(0), 2)}`)
.replace(/\ufeff/g, '')
.replace(/[\u0100-\uffff]/g, function(m) {
return `\\u${toHex(m.charCodeAt(0), 4)}?`;
});
.replace(/[\u0100-\uffff]/g, (m) => `\\u${toHex(m.charCodeAt(0), 4)}?`);
}

/*
Expand Down
12 changes: 5 additions & 7 deletions tools/lint-js.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,7 @@ if (cluster.isMaster) {
outFn = function(str) {
fs.writeSync(fd, str, 'utf8');
};
process.on('exit', function() {
fs.closeSync(fd);
});
process.on('exit', () => { fs.closeSync(fd); });
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
process.on('exit', () => { fs.closeSync(fd); });
process.on('exit', () => fs.closeSync(fd));

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 prefer it with { and } because it makes it clear that the function is not returning a value.

} else {
outFn = function(str) {
process.stdout.write(str);
Expand Down Expand Up @@ -117,20 +115,20 @@ if (cluster.isMaster) {

if (showProgress) {
// Start the progress display update timer when the first worker is ready
cluster.once('online', function() {
cluster.once('online', () => {
startTime = process.hrtime();
setInterval(printProgress, 1000).unref();
printProgress();
});
}

cluster.on('online', function(worker) {
cluster.on('online', (worker) => {
// Configure worker and give it some initial work to do
worker.send(workerConfig);
sendWork(worker);
});

process.on('exit', function(code) {
process.on('exit', (code) => {
if (showProgress) {
curPath = 'Done';
printProgress();
Expand Down Expand Up @@ -232,7 +230,7 @@ if (cluster.isMaster) {
// Worker

var config = {};
process.on('message', function(files) {
process.on('message', (files) => {
if (files instanceof Array) {
// Lint some files
const report = cli.executeOnFiles(files);
Expand Down
4 changes: 2 additions & 2 deletions tools/node-lint-md-cli-rollup/src/cli-entry.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const args = {
description: cli.description,
version: [
proc.name + ': ' + proc.version,
cli.name + ': ' + cli.version
cli.name + ': ' + cli.version,
].join(', '),
ignoreName: '.' + proc.name + 'ignore',
extensions: extensions
Expand All @@ -23,7 +23,7 @@ const config = options(process.argv.slice(2), args);
config.detectConfig = false;
config.plugins = plugins;

engine(config, function done(err, code) {
engine(config, (err, code) => {
if (err) console.error(err);
process.exit(code);
});