implement suggestions

Author: aduh95

test/parallel/test-abortcontroller.js

@@ -161,9 +161,9 @@ test('AbortController inspection depth 1 or null works', () => {
 
 test('AbortSignal reason is set correctly', () => {
   // Test AbortSignal.reason
+  // eslint-disable-next-line node-core/prefer-abort-signal-abort
   const ac = new AbortController();
   ac.abort('reason');
-  // eslint-disable-next-line node-core/prefer-abort-signal-abort
   assert.strictEqual(ac.signal.reason, 'reason');
 });
 
@@ -236,6 +236,7 @@ test('AbortSignal.reason should default', () => {
   assert.ok(signal.reason instanceof DOMException);
   assert.strictEqual(signal.reason.code, 20);
 
+  // eslint-disable-next-line node-core/prefer-abort-signal-abort
   const ac = new AbortController();
   ac.abort();
   assert.ok(ac.signal.reason instanceof DOMException);

test/parallel/test-eslint-prefer-abort-signal-abort.js

@@ -21,11 +21,6 @@ new RuleTester().run('prefer-abort-signal-abort', rule, {
       controller.abort();
       fn(controller.signal);
     `,
-    `
-      const controller = new AbortController();
-      controller.abort();
-      fn(controller.signal, controller.signal);
-    `,
     `
       const controller = new AbortController();
       controller.abort();
@@ -87,5 +82,37 @@ new RuleTester().run('prefer-abort-signal-abort', rule, {
         }
       `,
     },
+    {
+      code: `
+        {
+          const controller = new AbortController();
+          controller.abort();
+          fn(controller.signal, controller.signal);
+        }
+      `,
+      errors: [{ message }],
+      output: `
+        {
+          const controller = AbortSignal.abort();
+          fn(controller, controller);
+        }
+      `,
+    },
+    {
+      code: `
+        {
+          const controller = new AbortController();
+          controller.abort("reason");
+          fn(controller.signal, controller.signal);
+        }
+      `,
+      errors: [{ message }],
+      output: `
+        {
+          const controller = AbortSignal.abort("reason");
+          fn(controller, controller);
+        }
+      `,
+    },
   ]
 });

tools/eslint-rules/prefer-abort-signal-abort.js

@@ -129,13 +129,21 @@ module.exports = {
             '' : sourceCode.getText(abortArguments[0]);
 
           context.report({
-            node: signalNode,
+            node: declarator,
             message,
             fix(fixer) {
+              const abortSignalCreationCall = `AbortSignal.abort(${abortReason})`;
+              if (signalReferences.length > 1) {
+                return [
+                  fixer.replaceText(declarator.init, abortSignalCreationCall),
+                  fixer.removeRange(rangeIncludingTrailingLine(abortStatement)),
+                  ...signalReferences.map(({ identifier: { parent } }) => fixer.replaceText(parent, name)),
+                ];
+              }
               return [
                 fixer.removeRange(rangeIncludingTrailingLine(variableDeclaration)),
                 fixer.removeRange(rangeIncludingTrailingLine(abortStatement)),
-                fixer.replaceText(signalNode, `AbortSignal.abort(${abortReason})`),
+                fixer.replaceText(signalNode, abortSignalCreationCall),
               ];
             },
           });