refactor with methods in astUtil

wix-incubator · Aug 24, 2015 · 919cb2d · 919cb2d
1 parent ea14068
commit 919cb2d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/lib/rules/matches-prop-shorthand.js b/lib/rules/matches-prop-shorthand.js
@@ -14,15 +14,9 @@ module.exports = function (context) {
 
     var SUPPORT_MATCHES = ['find', 'detect', 'filter', 'select', 'reject'];
 
-    function isParamEqEqEq(exp, paramName) {
-        return exp.type === 'BinaryExpression' && exp.operator === '===' &&
-            (astUtil.isMemberExpOfArg(exp.left, paramName) ||
-            astUtil.isMemberExpOfArg(exp.right, paramName));
-    }
-
     function shouldPreferMatches(func) {
         var firstLine = astUtil.getFirstFunctionLine(func);
-        return astUtil.isReturnStatement(firstLine) && isParamEqEqEq(firstLine.argument, astUtil.getFirstParamName(func));
+        return astUtil.isReturnStatement(firstLine) && astUtil.isEqEqEqToParamMember(firstLine.argument, astUtil.getFirstParamName(func));
     }
 
     function methodSupportsShorthand(node) {

diff --git a/lib/rules/prefer-reject.js b/lib/rules/prefer-reject.js
@@ -16,21 +16,12 @@ module.exports = function (context) {
         return aliases.isAliasOfMethod('filter', astUtil.getMethodName(node));
     }
 
-    function isParamNegation(exp, firstParamName) {
-        return exp && exp.type === 'UnaryExpression' && exp.operator === '!' && astUtil.isMemberExpOfArg(exp.argument, firstParamName);
-    }
-
-    function isParamNotEqEq(exp, firstParamName) {
-        return exp && exp.type === 'BinaryExpression' && exp.operator === '!==' &&
-            (astUtil.isMemberExpOfArg(exp.left, firstParamName) || astUtil.isMemberExpOfArg(exp.right, firstParamName));
-    }
-
     function isNegativeExpressionFunction(func) {
         var firstLine = astUtil.getFirstFunctionLine(func);
         var firstParamName = astUtil.getFirstParamName(func);
         return astUtil.isReturnStatement(firstLine) &&
-            (isParamNegation(firstLine.argument, firstParamName) ||
-            isParamNotEqEq(firstLine.argument, firstParamName));
+            (astUtil.isNegationOfParamMember(firstLine.argument, firstParamName) ||
+            astUtil.isNotEqEqToParamMember(firstLine.argument, firstParamName));
     }
 
     return {