test + fix at least one case that causes #441

import-js · Jul 17, 2016 · 3684a11 · 3684a11
1 parent 2b4397b
commit 3684a11
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/rules/newline-after-import.js b/src/rules/newline-after-import.js
@@ -86,8 +86,12 @@ module.exports = function (context) {
     },
     'Program:exit': function () {
       scopes.forEach(function ({ scope, requireCalls }) {
+        const scopeBody = getScopeBody(scope)
+
+        // skip non-array scopes (i.e. arrow function expressions)
+        if (!(scopeBody instanceof Array)) return
+
         requireCalls.forEach(function (node, index) {
-          const scopeBody = getScopeBody(scope)
           const nodePosition = findNodeIndexInScopeBody(scopeBody, node)
           const statementWithRequireCall = scopeBody[nodePosition]
           const nextStatement = scopeBody[nodePosition + 1]

diff --git a/tests/src/rules/newline-after-import.js b/tests/src/rules/newline-after-import.js
@@ -8,6 +8,20 @@ const ruleTester = new RuleTester()
 ruleTester.run('newline-after-import', require('rules/newline-after-import'), {
   valid: [
     "var path = require('path');\nvar foo = require('foo');\n",
+    "require('foo');",
+    "switch ('foo') { case 'bar': require('baz'); }",
+    {
+      code: `
+        const x = () => require('baz')
+            , y = () => require('bar')`,
+      parserOptions: { ecmaVersion: 6 } ,
+    },
+    {
+      code: `const x = () => require('baz') && require('bar')`,
+      parserOptions: { ecmaVersion: 6 } ,
+    },
+    "function x(){ require('baz'); }",
+
     "a(require('b'), require('c'), require('d'));",
     `function foo() {
       switch (renderData.modalViewKey) {