scope to .then function call

eslint-community · Jan 27, 2017 · 360fb8b · 360fb8b
1 parent b84874f
commit 360fb8b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/rules/always-return.js b/rules/always-return.js
@@ -34,6 +34,11 @@ function isInlineThenFunctionExpression (node) {
 
 function hasParentReturnStatement (node) {
   if (node && node.parent && node.parent.type) {
+    // if the parent is a then, and we haven't returned anything, fail
+    if (isThenCallExpression(node.parent)) {
+      return false
+    }
+
     if (node.parent.type === 'ReturnStatement') {
       return true
     }

diff --git a/test/always-return.test.js b/test/always-return.test.js
@@ -94,14 +94,16 @@ ruleTester.run('always-return', rule, {
       errors: [ { message: message } ]
     },
     {
-      code: `hey.then(x => { 
-        anotherFunc({
-          nested: {
-            one: x === 1 ? 1 : 0,
-            two: x === 2 ? 1 : 0
-          }
+      code: `(function() {
+        return hey.then(x => { 
+          anotherFunc({
+            nested: {
+              one: x === 1 ? 1 : 0,
+              two: x === 2 ? 1 : 0
+            }
+          })
         })
-      })`,
+      })()`,
       parserOptions: parserOptions,
       errors: [ { message: message } ]
     }