Fix prop-shorthand breaking when using _.mixin

wix-incubator · Dec 5, 2018 · ca1faf4 · ca1faf4
1 parent 69992b1
commit ca1faf4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/util/methodDataUtil.js b/src/util/methodDataUtil.js
@@ -66,7 +66,7 @@ function isCollectionMethod(version, method) {
 function methodSupportsShorthand(version, method, shorthandType) {
     const mainAlias = getMainAlias(version, method)
     const methodShorthandData = _.get(getMethodData(version), [mainAlias, 'shorthand'])
-    return _.isBoolean(methodShorthandData) ? methodShorthandData : Boolean(shorthandType && methodShorthandData[shorthandType])
+    return _.isObject(methodShorthandData) ? Boolean(shorthandType && methodShorthandData[shorthandType]) : Boolean(methodShorthandData)
 }
 
 /**

diff --git a/tests/lib/rules/prop-shorthand.js b/tests/lib/rules/prop-shorthand.js
@@ -27,6 +27,7 @@ ruleTester.run('prop-shorthand', rule, {
         'var r = _.map([], function() { return React.PropTypes.object; })',
         'var r = _.map([])',
         'var r = _.map(results, result => result[result.length - 1]);',
+        'var x = _.mixedInMethod()',
         {
             code: 'var r = _.map([], function(x) { return x.id})',
             options: ['never']