no-for-loop: Improve output when using the TypeScript parser (#883)

sindresorhus · Oct 21, 2020 · 52edd3b · 52edd3b
1 parent ce6500a
commit 52edd3b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/rules/no-for-loop.js b/rules/no-for-loop.js
@@ -371,8 +371,11 @@ const create = context => {
 						if (removeDeclaration) {
 							declarationType = element.type === 'VariableDeclarator' ? elementNode.kind : elementNode.parent.kind;
 							if (elementNode.id.typeAnnotation && shouldGenerateIndex) {
-								declarationElement = sourceCode.text.slice(elementNode.id.range[0], elementNode.id.typeAnnotation.range[0]);
-								typeAnnotation = sourceCode.getText(elementNode.id.typeAnnotation, -1).trim();
+								declarationElement = sourceCode.text.slice(elementNode.id.range[0], elementNode.id.typeAnnotation.range[0]).trim();
+								typeAnnotation = sourceCode.getText(
+									elementNode.id.typeAnnotation,
+									-1 // Skip leading `:`
+								).trim();
 							} else {
 								declarationElement = sourceCode.getText(elementNode.id);
 							}

diff --git a/test/no-for-loop.js b/test/no-for-loop.js
@@ -743,6 +743,20 @@ runTest.typescript({
 			`,
 			errors: 1
 		},
+		{
+			code: outdent`
+				for (let i = 0; i < positions.length; i++) {
+					const    last   /* comment */    : /* comment */ Position = positions[i];
+					console.log(i);
+				}
+			`,
+			output: outdent`
+				for (const [i, last   /* comment */]: [number, /* comment */ Position] of positions.entries()) {
+					console.log(i);
+				}
+			`,
+			errors: 1
+		},
 		{
 			code: outdent`
 				for (let i = 0; i < positions.length; i++) {