Fix element used case

fisker · Dec 17, 2019 · c034799 · c034799
1 parent ca742cb
commit c034799
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 7 deletions.
diff --git a/rules/no-for-loop.js b/rules/no-for-loop.js
@@ -326,18 +326,27 @@ const create = context => {
 					const shouldGenerateIndex = isIndexVariableUsedElsewhereInTheLoopBody(indexVariable, bodyScope, arrayIdentifierName);
 
 					const index = indexIdentifierName;
+					const element = elementIdentifierName || defaultElementName;
 					const array = arrayIdentifierName;
 
-					let element = elementIdentifierName || defaultElementName;
+					let declarationElement = element;
 					let declarationType = 'const';
-					if (elementNode && elementNode.id.type === 'ObjectPattern') {
-						declarationType = elementNode.parent.kind;
-						element = sourceCode.getText(elementNode.id);
+					let removeDeclaration = true;
+					if (
+						elementNode &&
+						elementNode.id.type === 'ObjectPattern'
+					) {
+						removeDeclaration = arrayReferences.length === 1;
+
+						if (removeDeclaration) {
+							declarationType = elementNode.parent.kind;
+							declarationElement = sourceCode.getText(elementNode.id);
+						}
 					}
 
 					const replacement = shouldGenerateIndex ?
-						`${declarationType} [${index}, ${element}] of ${array}.entries()` :
-						`${declarationType} ${element} of ${array}`;
+						`${declarationType} [${index}, ${declarationElement}] of ${array}.entries()` :
+						`${declarationType} ${declarationElement} of ${array}`;
 
 					return [
 						fixer.replaceTextRange([
@@ -351,7 +360,11 @@ const create = context => {
 
 							return fixer.replaceText(reference.identifier.parent, element);
 						}),
-						elementNode && fixer.removeRange(getRemovalRange(elementNode, sourceCode))
+						elementNode && (
+							removeDeclaration ?
+								fixer.removeRange(getRemovalRange(elementNode, sourceCode)) :
+								fixer.replaceText(elementNode.init, element)
+						)
 					].filter(Boolean);
 				};
 			}

diff --git a/test/no-for-loop.js b/test/no-for-loop.js
@@ -398,6 +398,17 @@ ruleTester.run('no-for-loop', rule, {
 			for (var [i, { a, b }] of arr.entries()) {
 				console.log(i, a, b);
 			}
+		`),
+		testCase(outdent`
+			for (let i = 0; i < arr.length; i++) {
+				const { a, b } = arr[i];
+				console.log(a, b, i, arr[i]);
+			}
+		`, outdent`
+			for (const [i, element] of arr.entries()) {
+				const { a, b } = element;
+				console.log(a, b, i, element);
+			}
 		`)
 	]
 });