fix hey.then(x => { return; }, err=>{ log(err); })

eslint-community · Oct 7, 2016 · 271e239 · 271e239
1 parent 5523a81
commit 271e239
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/rules/always-return.js b/rules/always-return.js
@@ -8,18 +8,27 @@ function isFunctionWithBlockStatement (node) {
   return false
 }
 
-function isThenExpression (node) {
+function isThenCallExpression (node) {
   return (
     node.type === 'CallExpression' &&
     node.callee.type === 'MemberExpression' &&
     node.callee.property.name === 'then'
   )
 }
 
+function isFirstArgument (node) {
+  return (
+    node.parent &&
+    node.parent.arguments &&
+    node.parent.arguments[0] === node
+  )
+}
+
 function isInlineThenFunctionExpression (node) {
   return (
     isFunctionWithBlockStatement(node) &&
-    isThenExpression(node.parent)
+    isThenCallExpression(node.parent) &&
+    isFirstArgument(node)
   )
 }
 

diff --git a/test/always-return.test.js b/test/always-return.test.js
@@ -23,7 +23,8 @@ ruleTester.run('always-return', rule, {
     { code: 'hey.then(x => { if (x) { return x; } throw new Error("no x"); })', parserOptions: parserOptions },
     { code: 'hey.then(x => { var f = function() { }; return f; })', parserOptions: parserOptions },
     { code: 'hey.then(x => { if (x) { return x; } else { return x; } })', parserOptions: parserOptions },
-    { code: 'hey.then(x => { return x; var y = "unreachable"; })', parserOptions: parserOptions }
+    { code: 'hey.then(x => { return x; var y = "unreachable"; })', parserOptions: parserOptions },
+    { code: 'hey.then(x => { return; }, err=>{ log(err); })', parserOptions: parserOptions }
   ],
 
   invalid: [