Merge pull request #51 from zloirock/fix-49

fix #49
eslint-community · Jan 9, 2017 · bb7226b · bb7226b
2 parents 803a4ab + 85ffe84
commit bb7226b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/rules/no-return-wrap.js b/rules/no-return-wrap.js
@@ -22,13 +22,15 @@ module.exports = {
     return {
       ReturnStatement: function (node) {
         if (isInPromise(context)) {
-          if (node.argument.type === 'CallExpression') {
-            if (node.argument.callee.type === 'MemberExpression') {
-              if (node.argument.callee.object.name === 'Promise') {
-                if (node.argument.callee.property.name === 'resolve') {
-                  context.report(node, resolveMessage)
-                } else if (node.argument.callee.property.name === 'reject') {
-                  context.report(node, rejectMessage)
+          if (node.argument) {
+            if (node.argument.type === 'CallExpression') {
+              if (node.argument.callee.type === 'MemberExpression') {
+                if (node.argument.callee.object.name === 'Promise') {
+                  if (node.argument.callee.property.name === 'resolve') {
+                    context.report(node, resolveMessage)
+                  } else if (node.argument.callee.property.name === 'reject') {
+                    context.report(node, rejectMessage)
+                  }
                 }
               }
             }

diff --git a/test/no-return-wrap.js b/test/no-return-wrap.js
@@ -40,7 +40,10 @@ ruleTester.run('no-return-wrap', rule, {
     'var x = function() { return Promise.resolve(4) }',
     'function y() { return Promise.resolve(4) }',
     'function then() { return Promise.reject() }',
-    'doThing(function(x) { return Promise.reject(x) })'
+    'doThing(function(x) { return Promise.reject(x) })',
+
+    // should work with empty return statement
+    'doThing().then(function() { return })'
   ],
 
   invalid: [