eslint-plugin-unicorn 20.0.0 → 20.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "eslint-plugin-unicorn",
-	"version": "20.0.0",
+	"version": "20.1.0",
 	"description": "Various awesome ESLint rules",
 	"license": "MIT",
 	"repository": "sindresorhus/eslint-plugin-unicorn",
@@ -36,10 +36,11 @@
 		"ci-info": "^2.0.0",
 		"clean-regexp": "^1.0.0",
 		"eslint-ast-utils": "^1.1.0",
-		"eslint-template-visitor": "^1.1.0",
+		"eslint-template-visitor": "^2.0.0",
 		"eslint-utils": "^2.0.0",
 		"import-modules": "^2.0.0",
 		"lodash": "^4.17.15",
+		"pluralize": "^8.0.0",
 		"read-pkg-up": "^7.0.1",
 		"regexp-tree": "^0.1.21",
 		"reserved-words": "^0.1.2",

package/rules/no-for-loop.js

@@ -2,6 +2,8 @@
 const getDocumentationUrl = require('./utils/get-documentation-url');
 const isLiteralValue = require('./utils/is-literal-value');
 const {flatten} = require('lodash');
+const avoidCapture = require('./utils/avoid-capture');
+const {singular} = require('pluralize');
 
 const defaultElementName = 'element';
 const isLiteralZero = node => isLiteralValue(node, 0);
@@ -261,6 +263,18 @@ const getReferencesInChildScopes = (scope, name) => {
 	];
 };
 
+const getChildScopesRecursive = scope => [
+	scope,
+	...flatten(scope.childScopes.map(scope => getChildScopesRecursive(scope)))
+];
+
+const getSingularName = originalName => {
+	const singularName = singular(originalName);
+	if (singularName !== originalName) {
+		return singularName;
+	}
+};
+
 const create = context => {
 	const sourceCode = context.getSourceCode();
 	const {scopeManager} = sourceCode;
@@ -331,11 +345,12 @@ const create = context => {
 			const shouldFix = !someVariablesLeakOutOfTheLoop(node, [indexVariable, elementVariable].filter(Boolean), forScope);
 
 			if (shouldFix) {
-				problem.fix = fixer => {
+				problem.fix = function * (fixer) {
 					const shouldGenerateIndex = isIndexVariableUsedElsewhereInTheLoopBody(indexVariable, bodyScope, arrayIdentifierName);
 
 					const index = indexIdentifierName;
-					const element = elementIdentifierName || defaultElementName;
+					const element = elementIdentifierName ||
+						avoidCapture(getSingularName(arrayIdentifierName) || defaultElementName, getChildScopesRecursive(bodyScope), context.parserOptions.ecmaVersion);
 					const array = arrayIdentifierName;
 
 					let declarationElement = element;
@@ -357,24 +372,24 @@ const create = context => {
 						`${declarationType} [${index}, ${declarationElement}] of ${array}.entries()` :
 						`${declarationType} ${declarationElement} of ${array}`;
 
-					return [
-						fixer.replaceTextRange([
-							node.init.range[0],
-							node.update.range[1]
-						], replacement),
-						...arrayReferences.map(reference => {
-							if (reference === elementReference) {
-								return;
-							}
-
-							return fixer.replaceText(reference.identifier.parent, element);
-						}),
-						elementNode && (
-							removeDeclaration ?
-								fixer.removeRange(getRemovalRange(elementNode, sourceCode)) :
-								fixer.replaceText(elementNode.init, element)
-						)
-					].filter(Boolean);
+					yield fixer.replaceTextRange([
+						node.init.range[0],
+						node.update.range[1]
+					], replacement);
+
+					for (const reference of arrayReferences) {
+						if (reference !== elementReference) {
+							yield fixer.replaceText(reference.identifier.parent, element);
+						}
+					}
+
+					if (elementNode) {
+						if (removeDeclaration) {
+							yield fixer.removeRange(getRemovalRange(elementNode, sourceCode));
+						} else {
+							yield fixer.replaceText(elementNode.init, element);
+						}
+					}
 				};
 			}