Fix: vars-on-top conflict with ES6 import (fixes #2099)

eslint · Mar 18, 2015 · 9e226ad · 9e226ad
1 parent 66b43cb
commit 9e226ad
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/lib/rules/vars-on-top.js b/lib/rules/vars-on-top.js
@@ -27,6 +27,16 @@ module.exports = function (context) {
             node.expression.type === "Literal" && typeof node.expression.value === "string";
     }
 
+    /**
+     * Check to see if its a ES6 import declaration
+     * @param {ASTNode} node - any node
+     * @returns {Boolean} whether the given node represents a import declaration
+     */
+    function looksLikeImport(node) {
+        return node.type === "ImportDeclaration" || node.type === "ImportSpecifier" ||
+            node.type === "ImportDefaultSpecifier" || node.type === "ImportNamespaceSpecifier";
+    }
+
     /**
      * Checks whether this variable is on top of the block body
      * @param {ASTNode} node - The node to check
@@ -38,7 +48,7 @@ module.exports = function (context) {
 
         // skip over directives
         for (; i < l; ++i) {
-            if (!looksLikeDirective(statements[i])) {
+            if (!looksLikeDirective(statements[i]) && !looksLikeImport(statements[i])) {
                 break;
             }
         }

diff --git a/tests/lib/rules/vars-on-top.js b/tests/lib/rules/vars-on-top.js
@@ -150,7 +150,15 @@ eslintTester.addRuleTest("lib/rules/vars-on-top", {
         "'use strict'; var x; f();",
         "'use strict'; 'directive'; var x; var y; f();",
         "function f() { 'use strict'; var x; f(); }",
-        "function f() { 'use strict'; 'directive'; var x; var y; f(); }"
+        "function f() { 'use strict'; 'directive'; var x; var y; f(); }",
+        {code: "import React from 'react'; var y; function f() { 'use strict'; var x; var y; f(); }", ecmaFeatures: { modules: true }},
+        {code: "'use strict'; import React from 'react'; var y; function f() { 'use strict'; var x; var y; f(); }", ecmaFeatures: { modules: true }},
+        {code: "import React from 'react'; 'use strict'; var y; function f() { 'use strict'; var x; var y; f(); }", ecmaFeatures: { modules: true }},
+        {code: "import * as foo from 'mod.js'; 'use strict'; var y; function f() { 'use strict'; var x; var y; f(); }", ecmaFeatures: { modules: true }},
+        {code: "import { square, diag } from 'lib'; 'use strict'; var y; function f() { 'use strict'; var x; var y; f(); }", ecmaFeatures: { modules: true }},
+        {code: "import { default as foo } from 'lib'; 'use strict'; var y; function f() { 'use strict'; var x; var y; f(); }", ecmaFeatures: { modules: true }},
+        {code: "import 'src/mylib'; 'use strict'; var y; function f() { 'use strict'; var x; var y; f(); }", ecmaFeatures: { modules: true }},
+        {code: "import theDefault, { named1, named2 } from 'src/mylib'; 'use strict'; var y; function f() { 'use strict'; var x; var y; f(); }", ecmaFeatures: { modules: true }}
     ],
 
     invalid: [