Merge 446ff37 into 74ddbf9

rules/catch-error-name.js

@@ -2,6 +2,7 @@
 const astUtils = require('eslint-ast-utils');
 const avoidCapture = require('./utils/avoid-capture');
 const getDocumentationUrl = require('./utils/get-documentation-url');
+const renameIdentifier = require('./utils/rename-identifier');
 
 // Matches `someObj.then([FunctionExpression | ArrowFunctionExpression])`
 function isLintablePromiseCatch(node) {
@@ -38,7 +39,8 @@ const create = context => {
 		...context.options[0]
 	};
 
-	const {scopeManager} = context.getSourceCode();
+	const sourceCode = context.getSourceCode();
+	const {scopeManager} = sourceCode;
 
 	const {name} = options;
 	const caughtErrorsIgnorePattern = new RegExp(options.caughtErrorsIgnorePattern);
@@ -64,7 +66,7 @@ const create = context => {
 
 			if (node.type === 'Identifier') {
 				problem.fix = fixer => {
-					const fixings = [fixer.replaceText(node, expectedName)];
+					const nodes = [node];
 
 					const variables = scopeManager.getDeclaredVariables(scopeNode);
 					for (const variable of variables) {
@@ -73,11 +75,11 @@ const create = context => {
 						}
 
 						for (const reference of variable.references) {
-							fixings.push(fixer.replaceText(reference.identifier, expectedName));
+							nodes.push(reference.identifier);
 						}
 					}
 
-					return fixings;
+					return nodes.map(node => renameIdentifier(node, expectedName, fixer, sourceCode));
 				};
 			}
 

rules/no-keyword-prefix.js

@@ -194,7 +194,6 @@ module.exports = {
 		docs: {
 			url: getDocumentationUrl(__filename)
 		},
-		fixable: 'code',
 		schema,
 		messages: {
 			[MESSAGE_ID]: 'Do not prefix identifiers with keyword `{{keyword}}`.'

rules/no-unreadable-array-destructuring.js

@@ -1,22 +1,17 @@
 'use strict';
 const getDocumentationUrl = require('./utils/get-documentation-url');
 
-const isCommaFollowedWithComma = (element, index, array) => {
-	return element === null && array[index + 1] === null;
-};
+const message = 'Array destructuring may not contain consecutive ignored values.';
+const isCommaFollowedWithComma = (element, index, array) =>
+	element === null && array[index + 1] === null;
 
 const create = context => {
 	return {
-		ArrayPattern(node) {
-			const {elements} = node;
-			if (!elements || elements.length === 0) {
-				return;
-			}
-
-			if (elements.some(isCommaFollowedWithComma)) {
+		'ArrayPattern[elements.length>=3]': node => {
+			if (node.elements.some(isCommaFollowedWithComma)) {
 				context.report({
 					node,
-					message: 'Array destructuring may not contain consecutive ignored values.'
+					message
 				});
 			}
 		}

test/catch-error-name.js

@@ -9,6 +9,10 @@ const ruleTester = avaRuleTester(test, {
 	}
 });
 
+const typescriptRuleTester = avaRuleTester(test, {
+	parser: require.resolve('@typescript-eslint/parser')
+});
+
 function invalidTestCase(options) {
 	if (typeof options === 'string') {
 		options = {code: options};
@@ -416,3 +420,13 @@ ruleTester.run('catch-error-name', rule, {
 		}
 	]
 });
+
+typescriptRuleTester.run('catch-error-name', rule, {
+	valid: [],
+	invalid: [
+		invalidTestCase({
+			code: 'promise.catch(function (err: Error) { console.log(err) })',
+			output: 'promise.catch(function (error: Error) { console.log(error) })'
+		})
+	]
+});

test/no-unreadable-array-destructuring.js

@@ -30,7 +30,9 @@ ruleTester.run('no-unreadable-array-destructuring', rule, {
 		'function foo([bar,]) {}',
 		'function foo([bar,,]) {}',
 		'function foo([bar,, baz,, qux]) {}',
-		'const [, ...rest] = parts;'
+		'const [, ...rest] = parts;',
+		// This is stupid, but valid code
+		'const [,,] = parts;'
 	],
 	invalid: [
 		{
@@ -68,6 +70,11 @@ ruleTester.run('no-unreadable-array-destructuring', rule, {
 		{
 			code: 'const [,,...rest] = parts;',
 			errors
+		},
+		// This is stupid, but valid code
+		{
+			code: 'const [,,,] = parts;',
+			errors
 		}
 	]
 });