Improve removeArgument

rules/fix/remove-argument.js

@@ -1,30 +1,35 @@
 import {isCommaToken} from '@eslint-community/eslint-utils';
 import {getParentheses} from '../utils/parentheses.js';
 
-export default function removeArgument(fixer, node, sourceCode) {
-	const callExpression = node.parent;
-	const index = callExpression.arguments.indexOf(node);
+export default function * removeArgument(fixer, node, context) {
+	const {sourceCode} = context;
+	for (const token of sourceCode.getTokens(node)) {
+		yield fixer.remove(token);
+	}
+
 	const parentheses = getParentheses(node, sourceCode);
-	const firstToken = parentheses[0] || node;
-	const lastToken = parentheses.at(-1) || node;
+	for (const token of parentheses) {
+		yield fixer.remove(token);
+	}
 
-	let [start] = sourceCode.getRange(firstToken);
-	let [, end] = sourceCode.getRange(lastToken);
+	const firstToken = parentheses[0] ?? node;
+	const lastToken = parentheses.at(-1) ?? node;
+
+	const callExpression = node.parent;
+	const index = callExpression.arguments.indexOf(node);
 
 	if (index !== 0) {
 		const commaToken = sourceCode.getTokenBefore(firstToken);
-		[start] = sourceCode.getRange(commaToken);
+		yield fixer.remove(commaToken);
 	}
 
 	// If the removed argument is the only argument, the trailing comma must be removed too
 	/* c8 ignore start */
 	if (callExpression.arguments.length === 1) {
-		const tokenAfter = sourceCode.getTokenBefore(lastToken);
+		const tokenAfter = sourceCode.getTokenAfter(lastToken);
 		if (isCommaToken(tokenAfter)) {
-			[, end] = sourceCode.getRange(tokenAfter);
+			yield fixer.remove(tokenAfter);
 		}
 	}
 	/* c8 ignore end */
-
-	return fixer.removeRange([start, end]);
 }

rules/no-array-method-this-argument.js

@@ -71,14 +71,15 @@ const ignored = [
 	'underscore.some',
 ];
 
-function removeThisArgument(thisArgumentNode, sourceCode) {
-	return fixer => removeArgument(fixer, thisArgumentNode, sourceCode);
+function removeThisArgument(thisArgumentNode, context) {
+	return fixer => removeArgument(fixer, thisArgumentNode, context);
 }
 
-function useBoundFunction(callbackNode, thisArgumentNode, sourceCode) {
+function useBoundFunction(callbackNode, thisArgumentNode, context) {
 	return function * (fixer) {
-		yield removeThisArgument(thisArgumentNode, sourceCode)(fixer);
+		yield * removeThisArgument(thisArgumentNode, context)(fixer);
 
+		const {sourceCode} = context;
 		const callbackParentheses = getParentheses(callbackNode, sourceCode);
 		const isParenthesized = callbackParentheses.length > 0;
 		const callbackLastToken = isParenthesized
@@ -99,7 +100,7 @@ function useBoundFunction(callbackNode, thisArgumentNode, sourceCode) {
 }
 
 function getProblem({
-	sourceCode,
+	context,
 	callExpression,
 	callbackNode,
 	thisArgumentNode,
@@ -115,16 +116,16 @@ function getProblem({
 
 	const isArrowCallback = callbackNode.type === 'ArrowFunctionExpression';
 	if (isArrowCallback) {
-		const thisArgumentHasSideEffect = hasSideEffect(thisArgumentNode, sourceCode);
+		const thisArgumentHasSideEffect = hasSideEffect(thisArgumentNode, context.sourceCode);
 		if (thisArgumentHasSideEffect) {
 			problem.suggest = [
 				{
 					messageId: SUGGESTION_REMOVE,
-					fix: removeThisArgument(thisArgumentNode, sourceCode),
+					fix: removeThisArgument(thisArgumentNode, context),
 				},
 			];
 		} else {
-			problem.fix = removeThisArgument(thisArgumentNode, sourceCode);
+			problem.fix = removeThisArgument(thisArgumentNode, context);
 		}
 
 		return problem;
@@ -133,11 +134,11 @@ function getProblem({
 	problem.suggest = [
 		{
 			messageId: SUGGESTION_REMOVE,
-			fix: removeThisArgument(thisArgumentNode, sourceCode),
+			fix: removeThisArgument(thisArgumentNode, context),
 		},
 		{
 			messageId: SUGGESTION_BIND,
-			fix: useBoundFunction(callbackNode, thisArgumentNode, sourceCode),
+			fix: useBoundFunction(callbackNode, thisArgumentNode, context),
 		},
 	];
 
@@ -146,8 +147,6 @@ function getProblem({
 
 /** @param {import('eslint').Rule.RuleContext} context */
 const create = context => {
-	const {sourceCode} = context;
-
 	// Prototype methods
 	context.on('CallExpression', callExpression => {
 		if (
@@ -175,7 +174,7 @@ const create = context => {
 		}
 
 		return getProblem({
-			sourceCode,
+			context,
 			callExpression,
 			callbackNode: callExpression.arguments[0],
 			thisArgumentNode: callExpression.arguments[1],
@@ -199,7 +198,7 @@ const create = context => {
 		}
 
 		return getProblem({
-			sourceCode,
+			context,
 			callExpression,
 			callbackNode: callExpression.arguments[1],
 			thisArgumentNode: callExpression.arguments[2],

rules/no-unnecessary-array-flat-depth.js

@@ -26,7 +26,7 @@ const create = context => {
 			node: numberOne,
 			messageId: MESSAGE_ID,
 			/** @param {import('eslint').Rule.RuleFixer} fixer */
-			fix: fixer => removeArgument(fixer, numberOne, context.sourceCode),
+			fix: fixer => removeArgument(fixer, numberOne, context),
 		};
 	});
 };

rules/prefer-json-parse-buffer.js

@@ -139,7 +139,7 @@ const create = context => ({
 		return {
 			node: charsetNode,
 			messageId: MESSAGE_ID,
-			fix: fixer => removeArgument(fixer, charsetNode, sourceCode),
+			fix: fixer => removeArgument(fixer, charsetNode, context),
 		};
 	},
 });

rules/shared/no-unnecessary-length-or-infinity-rule.js

@@ -72,7 +72,7 @@ function listen(context, {methods, messageId}) {
 			messageId,
 			data: messageData,
 			/** @param {import('eslint').Rule.RuleFixer} fixer */
-			fix: fixer => removeArgument(fixer, secondArgument, context.sourceCode),
+			fix: fixer => removeArgument(fixer, secondArgument, context),
 		};
 	});
 }

test/no-array-method-this-argument.js

@@ -1,3 +1,4 @@
+import {outdent} from 'outdent';
 import {getTester, parsers} from './utils/test.js';
 
 const {test} = getTester(import.meta);
@@ -90,6 +91,24 @@ test.snapshot({
 		'array.map(() => {}, thisArgumentHasSideEffect())',
 		'Array.from(iterableOrArrayLike, () => {}, thisArgumentHasSideEffect())',
 		'Array.fromAsync(iterableOrArrayLike, () => {}, thisArgumentHasSideEffect())',
+		outdent`
+			array.map(
+				() => {} /* comment 1 */ ,
+				/* comment 2 */
+				(
+				/* comment 3 */
+					(
+						/* comment 4 */
+						there.are/* comment 5 */.many.comments
+						/* comment 6 */
+					)
+					/* comment 7 */
+				)
+				/* comment 8 */
+				,
+				/* comment 9 */
+			)
+		`,
 	],
 });