tools: custom eslint autofix for inspector-check.js

1. Removes extra indentation 2. Removes array to track commomModule AST node. 3. Refactored test Refs: #16636
nodejs · Feb 12, 2018 · 4afc45d · 4afc45d
1 parent 0e860d0
commit 4afc45d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/test/parallel/test-eslint-inspector-check.js b/test/parallel/test-eslint-inspector-check.js
@@ -13,13 +13,13 @@ new RuleTester().run('inspector-check', rule, {
   valid: [
     'foo;',
     'common.skipIfInspectorDisabled(); require("inspector");',
-    `require("common");
-     common.skipIfInspectorDisabled();
-     require("inspector");`
+    'require("common");\n' +
+    'common.skipIfInspectorDisabled();\n' +
+    'require("inspector");'
   ],
   invalid: [
     {
-      code: 'require("inspector")',
+      code: 'require("inspector");',
       errors: [{ message }],
       output: 'require("common");\n' +
               'common.skipIfInspectorDisabled();\n' +

diff --git a/tools/eslint-rules/inspector-check.js b/tools/eslint-rules/inspector-check.js
@@ -11,11 +11,11 @@ const utils = require('./rules-utils.js');
 // Rule Definition
 //------------------------------------------------------------------------------
 const msg = 'Please add a skipIfInspectorDisabled() call to allow this ' +
-  'test to be skippped when Node is built \'--without-inspector\'.';
+            'test to be skippped when Node is built \'--without-inspector\'.';
 
 module.exports = function(context) {
   const missingCheckNodes = [];
-  const commonModuleNodes = [];
+  var commonModuleNode = null;
   var hasInspectorCheck = false;
 
   function testInspectorUsage(context, node) {
@@ -24,7 +24,7 @@ module.exports = function(context) {
     }
 
     if (utils.isCommonModule(node)) {
-      commonModuleNodes.push(node);
+      commonModuleNode = node;
     }
   }
 
@@ -41,10 +41,12 @@ module.exports = function(context) {
           node,
           message: msg,
           fix: (fixer) => {
-            return fixer.insertTextAfter(
-              commonModuleNodes[0],
-              '\ncommon.skipIfInspectorDisabled();'
-            );
+            if (commonModuleNode) {
+              return fixer.insertTextAfter(
+                commonModuleNode,
+                '\ncommon.skipIfInspectorDisabled();'
+              );
+            }
           }
         });
       });

diff --git a/tools/eslint-rules/rules-utils.js b/tools/eslint-rules/rules-utils.js
@@ -55,8 +55,8 @@ module.exports.usesCommonProperty = function(node, properties) {
 module.exports.inSkipBlock = function(node) {
   var hasSkipBlock = false;
   if (node.test &&
-    node.test.type === 'UnaryExpression' &&
-    node.test.operator === '!') {
+      node.test.type === 'UnaryExpression' &&
+      node.test.operator === '!') {
     const consequent = node.consequent;
     if (consequent.body) {
       consequent.body.some(function(expressionStatement) {
@@ -74,8 +74,8 @@ module.exports.inSkipBlock = function(node) {
 
 function hasSkip(expression) {
   return expression &&
-    expression.callee &&
-    (expression.callee.name === 'skip' ||
-      expression.callee.property &&
-      expression.callee.property.name === 'skip');
+         expression.callee &&
+         (expression.callee.name === 'skip' ||
+         expression.callee.property &&
+         expression.callee.property.name === 'skip');
 }