tools: simplify prefer-common-mustnotcall rule

PR-URL: #17572 Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
nodejs · Dec 20, 2017 · 3e70ee8 · 3e70ee8
1 parent 2d74af0
commit 3e70ee8
Showing 1 changed file with 13 additions and 22 deletions.
diff --git a/tools/eslint-rules/prefer-common-mustnotcall.js b/tools/eslint-rules/prefer-common-mustnotcall.js
@@ -10,30 +10,21 @@
 
 const msg = 'Please use common.mustNotCall(msg) instead of ' +
             'common.mustCall(fn, 0) or common.mustCall(0).';
-
+const mustCallSelector = 'CallExpression[callee.object.name="common"]' +
-function isCommonMustCall(node) {
+                         '[callee.property.name="mustCall"]';
-  return node &&
+const arg0Selector = `${mustCallSelector}[arguments.0.value=0]`;
-         node.callee &&
+const arg1Selector = `${mustCallSelector}[arguments.1.value=0]`;
-         node.callee.object &&
-         node.callee.object.name === 'common' &&
-         node.callee.property &&
-         node.callee.property.name === 'mustCall';
-}
-
-function isArgZero(argument) {
-  return argument &&
-         typeof argument.value === 'number' &&
-         argument.value === 0;
-}
 
 module.exports = function(context) {
+  function report(node) {
+    context.report(node, msg);
+  }
+
   return {
-    CallExpression(node) {
+    // Catch common.mustCall(0)
-      if (isCommonMustCall(node) &&
+    [arg0Selector]: report,
-          (isArgZero(node.arguments[0]) ||  //  catch common.mustCall(0)
+
-           isArgZero(node.arguments[1]))) { //  catch common.mustCall(fn, 0)
+    // Catch common.mustCall(fn, 0)
-        context.report(node, msg);
+    [arg1Selector]: report
-      }
-    }
   };
 };