Fix: consistencies for blockstmt no-inner-fn (fix eslint#12222)

anikethsaha · Mar 18, 2020 · 83f83c5 · 83f83c5
1 parent f3788af
commit 83f83c5
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 1 deletion.
diff --git a/lib/rules/no-inner-declarations.js b/lib/rules/no-inner-declarations.js
@@ -67,7 +67,7 @@ module.exports = {
         function check(node) {
             const body = nearestBody(),
                 valid = ((body.type === "Program" && body.distance === 1) ||
-                    body.distance === 2);
+                    (body.type !== "Program" && body.distance === 2));
 
             if (!valid) {
                 context.report({

diff --git a/tests/lib/rules/no-inner-declarations.js b/tests/lib/rules/no-inner-declarations.js
@@ -61,6 +61,65 @@ ruleTester.run("no-inner-declarations", rule, {
             },
             type: "FunctionDeclaration"
         }]
+    }, {
+        code: "if (foo) var a; ",
+        options: ["both"],
+        errors: [{
+            messageId: "moveDeclToRoot",
+            data: {
+                type: "variable",
+                body: "program"
+            },
+            type: "VariableDeclaration"
+        }]
+    },
+    {
+        code: "if (foo)  function f(){} ",
+        options: ["both"],
+        errors: [{
+            messageId: "moveDeclToRoot",
+            data: {
+                type: "function",
+                body: "program"
+            },
+            type: "FunctionDeclaration"
+        }]
+    },
+    {
+        code: "function bar() { if (foo) function f(){}; }",
+        options: ["both"],
+        errors: [{
+            messageId: "moveDeclToRoot",
+            data: {
+                type: "function",
+                body: "function body"
+            },
+            type: "FunctionDeclaration"
+        }]
+    },
+    {
+        code: "function bar() { if (foo) var a; }",
+        options: ["both"],
+        errors: [{
+            messageId: "moveDeclToRoot",
+            data: {
+                type: "variable",
+                body: "function body"
+            },
+            type: "VariableDeclaration"
+        }]
+    },
+    {
+        code: "if (foo){ var a; }",
+        options: ["both"],
+        errors: [{
+            messageId: "moveDeclToRoot",
+            data: {
+                type: "variable",
+                body: "program"
+            },
+            type: "VariableDeclaration"
+        }]
     }, {
         code: "function doSomething() { do { function somethingElse() { } } while (test); }",
         errors: [{