fix false positives of complex comparison and computed properties

wix-incubator · Oct 11, 2015 · 3a0878e · 3a0878e
1 parent 00c24d2
commit 3a0878e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/lib/rules/prefer-get.js b/lib/rules/prefer-get.js
@@ -18,7 +18,7 @@ module.exports = function (context) {
     }
 
     function shouldCheckDeeper(node, nodeRight, toCompare) {
-        return node.operator === '&&' && nodeRight && (!toCompare || astUtil.isEquivalentExp(nodeRight, toCompare));
+        return node.operator === '&&' && nodeRight && nodeRight.type === 'MemberExpression' && !astUtil.isComputed(nodeRight) && (!toCompare || astUtil.isEquivalentExp(nodeRight, toCompare));
     }
 
     return {

diff --git a/lib/util/astUtil.js b/lib/util/astUtil.js
@@ -130,5 +130,6 @@ module.exports = {
     isNegationExpression: isNegationExpression,
     getValueReturnedInFirstLine: getValueReturnedInFirstLine,
     isCallFromObject: isCallFromObject,
+    isComputed: isComputed,
     isEquivalentExp: isEquivalentExp
 };
diff --git a/tests/lib/rules/prefer-get.js b/tests/lib/rules/prefer-get.js
@@ -19,7 +19,8 @@ ruleTester.run('prefer-get', rule, {
         'var x = _.has(a, "b.c");',
         'var x = a && a.b',
         'a && a.b && f()',
-        'a && a[v] && a[v].c'
+        'a && a[v] && a[v].c',
+        'a && a.b && typeof a.b === "number"'
     ],
     invalid: [{
         code: 'x = a && a.b && a.b.c === 8',