Fix: adds conditional for separateRequires in one-var (fixes #10179).

eslint · Oct 15, 2018 · 413d44c · 413d44c
1 parent d45b184
commit 413d44c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/lib/rules/one-var.js b/lib/rules/one-var.js
@@ -255,7 +255,9 @@ module.exports = {
 
             if (currentOptions.uninitialized === MODE_ALWAYS && currentOptions.initialized === MODE_ALWAYS) {
                 if (currentScope.uninitialized || currentScope.initialized) {
-                    return false;
+                    if (!hasRequires) {
+                        return false;
+                    }
                 }
             }
 
@@ -266,7 +268,9 @@ module.exports = {
             }
             if (declarationCounts.initialized > 0) {
                 if (currentOptions.initialized === MODE_ALWAYS && currentScope.initialized) {
-                    return false;
+                    if (!hasRequires) {
+                        return false;
+                    }
                 }
             }
             if (currentScope.required && hasRequires) {

diff --git a/tests/lib/rules/one-var.js b/tests/lib/rules/one-var.js
@@ -209,6 +209,14 @@ ruleTester.run("one-var", rule, {
             options: [{ separateRequires: true, var: "always" }],
             parserOptions: { env: { node: true } }
         },
+        {
+            code: "var bar = 'bar'; var foo = require('foo');",
+            options: [{ separateRequires: true, var: "always" }]
+        },
+        {
+            code: "var foo = require('foo'); var bar = 'bar';",
+            options: [{ separateRequires: true, var: "always" }]
+        },
         {
             code: "var foo = require('foo'); var bar = 'bar';",
             options: [{ separateRequires: true, var: "always" }],