1 files changed, 25 insertions, 28 deletions
diff --git a/tools/eslint-rules/lowercase-name-for-primitive.js b/tools/eslint-rules/lowercase-name-for-primitive.js
index bdf10328f3..cb603b62c0 100644
--- a/tools/eslint-rules/lowercase-name-for-primitive.js
+++ b/tools/eslint-rules/lowercase-name-for-primitive.js
@@ -9,41 +9,38 @@
 // Rule Definition
 //------------------------------------------------------------------------------
 
+const astSelector = 'NewExpression[callee.property.name="TypeError"]' +
+                    '[arguments.0.value="ERR_INVALID_ARG_TYPE"]';
+
 const primitives = [
   'number', 'string', 'boolean', 'null', 'undefined'
 ];
 
 module.exports = function(context) {
-  return {
-    NewExpression(node) {
-      if (
-        node.callee.property &&
-        node.callee.property.name === 'TypeError' &&
-        node.arguments[0].value === 'ERR_INVALID_ARG_TYPE'
-      ) {
-        checkNamesArgument(node.arguments[2]);
-      }
+  function checkNamesArgument(node) {
+    const names = node.arguments[2];
 
-      function checkNamesArgument(names) {
-        switch (names.type) {
-          case 'Literal':
-            checkName(names.value);
-            break;
-          case 'ArrayExpression':
-            names.elements.forEach((name) => {
-              checkName(name.value);
-            });
-            break;
-        }
-      }
+    switch (names.type) {
+      case 'Literal':
+        checkName(node, names.value);
+        break;
+      case 'ArrayExpression':
+        names.elements.forEach((name) => {
+          checkName(node, name.value);
+        });
+        break;
+    }
+  }
 
-      function checkName(name) {
-        const lowercaseName = name.toLowerCase();
-        if (primitives.includes(lowercaseName) && !primitives.includes(name)) {
-          const msg = `primitive should use lowercase: ${name}`;
-          context.report(node, msg);
-        }
-      }
+  function checkName(node, name) {
+    const lowercaseName = name.toLowerCase();
+    if (primitives.includes(lowercaseName) && !primitives.includes(name)) {
+      const msg = `primitive should use lowercase: ${name}`;
+      context.report(node, msg);
     }
+  }
+
+  return {
+    [astSelector]: (node) => checkNamesArgument(node)
   };
 };