Skip to content

Commit

Permalink
tools: make trailing commas consistent in .eslintrc
Browse files Browse the repository at this point in the history
.eslintrc has lots of trailing commas and lots of places where there
aren't trailing commas. Use trailing commas throughout the files for
consistency.

PR-URL: #25739
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
  • Loading branch information
Trott authored and targos committed Jan 29, 2019
1 parent 15f6b8e commit 8032969
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions .eslintrc.js
Expand Up @@ -64,11 +64,11 @@ module.exports = {
// start with something that looks like a variable name or code. // start with something that looks like a variable name or code.
ignorePattern: '^.{0,50}$|^ [a-z]+ ?[0-9A-Z_.(/=:[#-]', ignorePattern: '^.{0,50}$|^ [a-z]+ ?[0-9A-Z_.(/=:[#-]',
ignoreInlineComments: true, ignoreInlineComments: true,
ignoreConsecutiveComments: true ignoreConsecutiveComments: true,
}, },
block: { block: {
ignorePattern: '.*' ignorePattern: '.*',
} },
}], }],
'comma-dangle': ['error', 'only-multiline'], 'comma-dangle': ['error', 'only-multiline'],
'comma-spacing': 'error', 'comma-spacing': 'error',
Expand Down Expand Up @@ -168,27 +168,27 @@ module.exports = {
{ {
property: '__defineSetter__', property: '__defineSetter__',
message: '__defineSetter__ is deprecated.', message: '__defineSetter__ is deprecated.',
} },
], ],
// If this list is modified, please copy the change to lib/.eslintrc.yaml // If this list is modified, please copy the change to lib/.eslintrc.yaml
// and test/.eslintrc.yaml. // and test/.eslintrc.yaml.
'no-restricted-syntax': [ 'no-restricted-syntax': [
'error', 'error',
{ {
selector: "CallExpression[callee.object.name='assert'][callee.property.name='deepStrictEqual'][arguments.2.type='Literal']", selector: "CallExpression[callee.object.name='assert'][callee.property.name='deepStrictEqual'][arguments.2.type='Literal']",
message: 'Do not use a literal for the third argument of assert.deepStrictEqual()' message: 'Do not use a literal for the third argument of assert.deepStrictEqual()',
}, },
{ {
selector: "CallExpression[callee.object.name='assert'][callee.property.name='doesNotThrow']", selector: "CallExpression[callee.object.name='assert'][callee.property.name='doesNotThrow']",
message: 'Please replace `assert.doesNotThrow()` and add a comment next to the code instead.' message: 'Please replace `assert.doesNotThrow()` and add a comment next to the code instead.',
}, },
{ {
selector: "CallExpression[callee.object.name='assert'][callee.property.name='rejects'][arguments.length<2]", selector: "CallExpression[callee.object.name='assert'][callee.property.name='rejects'][arguments.length<2]",
message: '`assert.rejects()` must be invoked with at least two arguments.', message: '`assert.rejects()` must be invoked with at least two arguments.',
}, },
{ {
selector: "CallExpression[callee.object.name='assert'][callee.property.name='strictEqual'][arguments.2.type='Literal']", selector: "CallExpression[callee.object.name='assert'][callee.property.name='strictEqual'][arguments.2.type='Literal']",
message: 'Do not use a literal for the third argument of assert.strictEqual()' message: 'Do not use a literal for the third argument of assert.strictEqual()',
}, },
{ {
selector: "CallExpression[callee.object.name='assert'][callee.property.name='throws'][arguments.1.type='Literal']:not([arguments.1.regex])", selector: "CallExpression[callee.object.name='assert'][callee.property.name='throws'][arguments.1.type='Literal']:not([arguments.1.regex])",
Expand All @@ -209,7 +209,7 @@ module.exports = {
{ {
selector: 'ThrowStatement > CallExpression[callee.name=/Error$/]', selector: 'ThrowStatement > CallExpression[callee.name=/Error$/]',
message: 'Use `new` keyword when throwing an `Error`.', message: 'Use `new` keyword when throwing an `Error`.',
} },
], ],
/* eslint-enable max-len */ /* eslint-enable max-len */
'no-return-await': 'error', 'no-return-await': 'error',
Expand Down Expand Up @@ -263,7 +263,7 @@ module.exports = {
'space-unary-ops': 'error', 'space-unary-ops': 'error',
'spaced-comment': ['error', 'always', { 'spaced-comment': ['error', 'always', {
'block': { 'balanced': true }, 'block': { 'balanced': true },
'exceptions': ['-'] 'exceptions': ['-'],
}], }],
'strict': ['error', 'global'], 'strict': ['error', 'global'],
'symbol-description': 'error', 'symbol-description': 'error',
Expand Down

0 comments on commit 8032969

Please sign in to comment.