Fix: no-var should fix ForStatement.init (#7993)

* Fix: no-var should fix ForStatement.init * Chore: add tests
eslint · Feb 3, 2017 · d6b6ba1 · d6b6ba1
1 parent 99d386d
commit d6b6ba1
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/lib/rules/no-var.js b/lib/rules/no-var.js
@@ -273,6 +273,7 @@ module.exports = {
 
             if (
                 !isLoopAssignee(node) &&
+                !(node.parent.type === "ForStatement" && node.parent.init === node) &&
                 node.parent.type !== "BlockStatement" &&
                 node.parent.type !== "Program" &&
                 node.parent.type !== "SwitchCase"

diff --git a/tests/lib/rules/no-var.js b/tests/lib/rules/no-var.js
@@ -85,7 +85,28 @@ ruleTester.run("no-var", rule, {
                 }
             ]
         },
-
+        {
+            code: "for (var i = 0; i < list.length; ++i) { foo(i) }",
+            output: "for (let i = 0; i < list.length; ++i) { foo(i) }",
+            errors: [
+                { message: "Unexpected var, use let or const instead.", type: "VariableDeclaration" }
+            ]
+        },
+        {
+            code: "for (var i = 0, i = 0; false;);",
+            output: "for (var i = 0, i = 0; false;);",
+            errors: [
+                { message: "Unexpected var, use let or const instead.", type: "VariableDeclaration" }
+            ]
+        },
+        {
+            code: "var i = 0; for (var i = 1; false;); console.log(i);",
+            output: "var i = 0; for (var i = 1; false;); console.log(i);",
+            errors: [
+                { message: "Unexpected var, use let or const instead.", type: "VariableDeclaration" },
+                { message: "Unexpected var, use let or const instead.", type: "VariableDeclaration" }
+            ]
+        },
 
         // Not fix if it's redeclared or it's used from outside of the scope or it's declared on a case chunk.
         {