no-array-for-each: Improve fixable parameter detection (#1177)

Author: fisker

rules/no-array-for-each.js

@@ -16,6 +16,7 @@ const extendFixRange = require('./utils/extend-fix-range');
 const isFunctionSelfUsedInside = require('./utils/is-function-self-used-inside');
 const {isNodeMatches} = require('./utils/is-node-matches');
 const assertToken = require('./utils/assert-token');
+const referenceIdentifierSelector = require('./utils/reference-identifier-selector');
 
 const MESSAGE_ID = 'no-array-for-each';
 const messages = {
@@ -231,7 +232,7 @@ function isParameterSafeToFix(parameter, {scope, array, allIdentifiers}) {
 
 	const [arrayStart, arrayEnd] = array.range;
 	for (const identifier of allIdentifiers) {
-		const {name, range: [start, end], parent} = identifier;
+		const {name, range: [start, end]} = identifier;
 		if (
 			name !== parameterName ||
 			start < arrayStart ||
@@ -240,31 +241,6 @@ function isParameterSafeToFix(parameter, {scope, array, allIdentifiers}) {
 			continue;
 		}
 
-		if (
-			(
-				(
-					parent.type === 'FunctionExpression' ||
-					parent.type === 'ClassExpression' ||
-					parent.type === 'FunctionDeclaration' ||
-					parent.type === 'ClassDeclaration'
-				) &&
-				parent.id === identifier
-			) ||
-			(
-				parent.type === 'MemberExpression' &&
-				!parent.computed &&
-				parent.property === identifier
-			) ||
-			(
-				parent.type === 'Property' &&
-				!parent.shorthand &&
-				!parent.computed &&
-				parent.key === identifier
-			)
-		) {
-			continue;
-		}
-
 		const variable = findVariable(scope, identifier);
 		if (!variable || variable.scope === scope || isChildScope(scope, variable.scope)) {
 			return false;
@@ -366,7 +342,7 @@ const create = context => {
 		':function:exit'() {
 			functionStack.pop();
 		},
-		Identifier(node) {
+		[referenceIdentifierSelector()](node) {
 			allIdentifiers.push(node);
 		},
 		ReturnStatement(node) {

rules/utils/reference-identifier-selector.js

@@ -71,11 +71,13 @@ function referenceIdentifierSelector(nameOrNames) {
 		`:not(${nonReferenceSelector})`
 	];
 
-	/* istanbul ignore else: no rule use single name yet */
-	if (Array.isArray(nameOrNames)) {
-		selector.push(`:matches(${nameOrNames.map(name => `[name="${name}"]`).join(', ')})`);
-	} else {
-		selector.push(`[name="${nameOrNames}"]`);
+	if (nameOrNames) {
+		/* istanbul ignore else: no rule use single name yet */
+		if (Array.isArray(nameOrNames)) {
+			selector.push(`:matches(${nameOrNames.map(name => `[name="${name}"]`).join(', ')})`);
+		} else {
+			selector.push(`[name="${nameOrNames}"]`);
+		}
 	}
 
 	return selector.join('');

test/snapshots/no-array-for-each.mjs.md

@@ -1394,6 +1394,16 @@ Generated by [AVA](https://avajs.dev).
       4 | 	}
       5 | ].forEach((Foo, bar) => process(Foo, bar))
 
+> Output
+
+    `␊
+      1 | for (const [bar, Foo] of [␊
+      2 | 	class Foo {␊
+      3 | 		bar() {}␊
+      4 | 	}␊
+      5 | ].entries())  process(Foo, bar)␊
+    `
+
 > Error 1/1
 
     `␊