fix collection-return bug with arrow functions

wix-incubator · Dec 29, 2015 · 212b7f2 · 212b7f2
1 parent 7ec9360
commit 212b7f2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/lib/rules/collection-return.js b/lib/rules/collection-return.js
@@ -52,6 +52,12 @@ module.exports = function (context) {
             if (last) {
                 last.found = true;
             }
+        },
+        'CallExpression:exit': function (node) {
+            var last = _.last(callStack);
+            if (last && last.node === node) {
+                callStack.pop();
+            }
         }
     };
 };
diff --git a/tests/lib/rules/collection-return.js b/tests/lib/rules/collection-return.js
@@ -22,7 +22,11 @@ ruleTester.run('collection-return', rule, {
         },
         '_.map(arr, function(a) {return a.some(function(x) {})})',
         '_(a).transform(function(acc, item) {acc[item] = f(item);}, {}).mapValues(g).value()',
-        'function x(a) {return a;}'
+        'function x(a) {return a;}',
+        {
+            code: 'y = _.reject(x, p => p); _.forEach(t, s => {}).value();',
+            ecmaFeatures: {arrowFunctions: true}
+        }
     ],
     invalid: [{
         code: '_.map(arr, function(a) {console.log(a)})',