Fix: no-var autofix syntax error in single-line statements (fixes #7961…

…) (#7962)

lib/rules/no-var.js

@@ -209,6 +209,7 @@ module.exports = {
          * - A variable is used from a closure within a loop.
          * - A variable might be used before it is assigned within a loop.
          * - A variable might be used in TDZ.
+         * - A variable is declared in statement position (e.g. a single-line `IfStatement`)
          *
          * ## A variable is declared on a SwitchCase node.
          *
@@ -270,6 +271,17 @@ module.exports = {
                 }
             }
 
+            if (
+                !isLoopAssignee(node) &&
+                node.parent.type !== "BlockStatement" &&
+                node.parent.type !== "Program" &&
+                node.parent.type !== "SwitchCase"
+            ) {
+
+                // If the declaration is not in a block, e.g. `if (foo) var bar = 1;`, then it can't be fixed.
+                return false;
+            }
+
             return true;
         }
 

tests/lib/rules/no-var.js

@@ -215,6 +215,15 @@ ruleTester.run("no-var", rule, {
             errors: [
                 "Unexpected var, use let or const instead."
             ]
+        },
+
+        // https://github.com/eslint/eslint/issues/7961
+        {
+            code: "if (foo) var bar = 1;",
+            output: "if (foo) var bar = 1;",
+            errors: [
+                { message: "Unexpected var, use let or const instead.", type: "VariableDeclaration" }
+            ]
         }
     ]
 });