eslint-plugin-unicorn 70.0.0 → 71.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "eslint-plugin-unicorn",
-	"version": "70.0.0",
+	"version": "71.0.0",
 	"description": "More than 300 powerful ESLint rules",
 	"license": "MIT",
 	"repository": {
@@ -62,58 +62,59 @@
 		"xo"
 	],
 	"dependencies": {
-		"@babel/helper-validator-identifier": "^7.29.7",
 		"@eslint-community/eslint-utils": "^4.9.1",
-		"browserslist": "^4.28.2",
+		"browserslist": "^4.28.4",
 		"change-case": "^5.4.4",
 		"ci-info": "^4.4.0",
 		"core-js-compat": "^3.49.0",
 		"detect-indent": "^7.0.2",
 		"find-up-simple": "^1.0.1",
-		"globals": "^17.6.0",
+		"globals": "^17.7.0",
 		"indent-string": "^5.0.0",
 		"is-builtin-module": "^5.0.0",
-		"jsesc": "^3.1.0",
+		"is-identifier": "^1.1.0",
 		"pluralize": "^8.0.0",
-		"regjsparser": "^0.13.1",
-		"semver": "^7.8.4",
+		"quote-js-string": "^0.1.0",
+		"regjsparser": "^0.13.2",
+		"reserved-identifiers": "^1.2.0",
+		"semver": "^7.8.5",
 		"strip-indent": "^4.1.1"
 	},
 	"devDependencies": {
-		"@babel/code-frame": "^8.0.0-rc.6",
-		"@eslint/css": "^1.3.0",
+		"@babel/code-frame": "^8.0.0",
+		"@eslint/css": "^1.4.0",
 		"@eslint/eslintrc": "^3.3.5",
-		"@eslint/json": "^2.0.0",
-		"@eslint/markdown": "^8.0.2",
-		"@html-eslint/eslint-plugin": "^0.62.0",
-		"@html-eslint/parser": "^0.62.0",
+		"@eslint/json": "^2.0.1",
+		"@eslint/markdown": "^8.0.3",
+		"@html-eslint/eslint-plugin": "^0.63.0",
+		"@html-eslint/parser": "^0.63.0",
 		"@lubien/fixture-beta-package": "^1.0.0-beta.1",
-		"@typescript-eslint/parser": "^8.61.0",
-		"@typescript-eslint/types": "^8.61.0",
+		"@typescript-eslint/parser": "^8.62.1",
+		"@typescript-eslint/types": "^8.62.1",
 		"ava": "^8.0.1",
 		"c8": "^11.0.0",
 		"enquirer": "^2.4.1",
-		"eslint": "^10.4.1",
+		"eslint": "^10.6.0",
 		"eslint-ava-rule-tester": "^5.0.1",
-		"eslint-config-xo": "^0.52.0",
+		"eslint-config-xo": "^0.56.0",
 		"eslint-doc-generator": "^3.6.0",
-		"eslint-plugin-eslint-plugin": "^7.4.0",
-		"eslint-plugin-jsdoc": "^63.0.2",
-		"eslint-plugin-unicorn": "^65.0.1",
+		"eslint-plugin-eslint-plugin": "^7.4.1",
+		"eslint-plugin-jsdoc": "^63.0.11",
+		"eslint-plugin-unicorn": "^70.0.0",
 		"eslint-remote-tester": "^4.0.4",
 		"eslint-remote-tester-repositories": "^2.0.2",
 		"eslint-scope": "^9.1.2",
 		"espree": "^11.2.0",
-		"listr2": "^10.2.1",
-		"markdownlint-cli": "^0.48.0",
+		"listr2": "^10.2.2",
+		"markdownlint-cli": "^0.49.0",
 		"nano-spawn": "^2.1.0",
 		"node-style-text": "^2.1.2",
-		"npm-package-json-lint": "^10.4.0",
-		"npm-run-all2": "^9.0.1",
+		"npm-package-json-lint": "^10.4.1",
+		"npm-run-all2": "^9.0.2",
 		"open-editor": "^6.0.0",
 		"outdent": "^0.8.0",
 		"pretty-ms": "^9.3.0",
-		"svelte": "^5.56.3",
+		"svelte": "^5.56.4",
 		"svelte-eslint-parser": "^1.8.0",
 		"typescript": "^6.0.3",
 		"vue-eslint-parser": "^10.4.1",

package/readme.md

@@ -391,7 +391,7 @@ export default defineConfig([
 | [prefer-top-level-await](docs/rules/prefer-top-level-await.md)                                             | Prefer top-level await over top-level promises and async function calls.                                                       | ✅ ☑️ |    | 💡 |    |
 | [prefer-type-error](docs/rules/prefer-type-error.md)                                                       | Enforce throwing `TypeError` in type checking conditions.                                                                      | ✅ ☑️ | 🔧 |    |    |
 | [prefer-type-literal-last](docs/rules/prefer-type-literal-last.md)                                         | Require type literals to be last in union types.                                                                               | ✅    | 🔧 |    |    |
-| [prefer-uint8array-base64](docs/rules/prefer-uint8array-base64.md)                                         | Prefer `Uint8Array#toBase64()` and `Uint8Array.fromBase64()` over `atob()`, `btoa()`, and `Buffer` base64 conversions.         | ✅ ☑️ |    | 💡 |    |
+| [prefer-uint8array-base64](docs/rules/prefer-uint8array-base64.md)                                         | Prefer `Uint8Array#toBase64()` and `Uint8Array.fromBase64()` over `atob()`, `btoa()`, and `Buffer` base64 conversions.         |      |    | 💡 |    |
 | [prefer-unary-minus](docs/rules/prefer-unary-minus.md)                                                     | Prefer the unary minus operator over multiplying or dividing by `-1`.                                                          | ✅ ☑️ | 🔧 |    |    |
 | [prefer-unicode-code-point-escapes](docs/rules/prefer-unicode-code-point-escapes.md)                       | Prefer Unicode code point escapes over legacy escape sequences.                                                                | ✅ ☑️ | 🔧 | 💡 |    |
 | [prefer-url-can-parse](docs/rules/prefer-url-can-parse.md)                                                 | Prefer `URL.canParse()` over constructing a `URL` in a try/catch for validation.                                               | ✅ ☑️ | 🔧 |    |    |
@@ -566,3 +566,7 @@ export default defineConfig([
 
 - [Sindre Sorhus](https://github.com/sindresorhus)
 - [Fisker Cheung](https://github.com/fisker)
+
+## Related
+
+- [eslint-node-test](https://github.com/sindresorhus/eslint-node-test) — ESLint rules for the Node.js built-in test runner.

package/rules/ast/call-or-new-expression.js

@@ -79,18 +79,12 @@ function create(node, options, types) {
 		}
 	}
 
-	if (
-		Array.isArray(names)
+	return !(Array.isArray(names)
 		&& names.length > 0
 		&& (
 			node.callee.type !== 'Identifier'
 			|| !names.includes(node.callee.name)
-		)
-	) {
-		return false;
-	}
-
-	return true;
+		));
 }
 
 /**

package/rules/ast/is-member-expression.js

@@ -83,16 +83,10 @@ export default function isMemberExpression(node, options) {
 		return false;
 	}
 
-	if (
-		Array.isArray(objects)
+	return !(Array.isArray(objects)
 		&& objects.length > 0
 		&& (
 			node.object.type !== 'Identifier'
 			|| !objects.includes(node.object.name)
-		)
-	) {
-		return false;
-	}
-
-	return true;
+		));
 }

package/rules/comment-content.js

@@ -346,7 +346,7 @@ const pathTerminatorCharacters = '"\'`<>';
 const packageSpecifierTerminatorCharacters = '"\'`()[]{}<>,';
 const domainLeadingPunctuation = '([{<';
 const domainTrailingPunctuation = '.,;:!?)]}>';
-const maskCharacter = '\uFFFF';
+const maskCharacter = '\u{FFFF}';
 const openBrackets = '([{';
 const closeBrackets = ')]}';
 const quoteCharacters = '"\'`';
@@ -1062,14 +1062,14 @@ const create = context => {
 		return;
 	}
 
-	let checked = false;
+	let isChecked = false;
 
 	onRoot(context, function * (node) {
-		if (checked) {
+		if (isChecked) {
 			return;
 		}
 
-		checked = true;
+		isChecked = true;
 
 		const {sourceCode} = context;
 		const comments = getRuleComments(context);

package/rules/consistent-boolean-name.js

@@ -6,9 +6,11 @@ import {
 	getAvailableVariableName,
 	getScopes,
 	getVariableIdentifiers,
+	isReactHookName,
 	isNullishType,
 	isTypeParameterType,
 	isUnknownType,
+	lowerFirst,
 	upperFirst,
 } from './utils/index.js';
 import {
@@ -17,6 +19,7 @@ import {
 	isBooleanFunctionReference,
 	isBooleanFunctionTypeAnnotation,
 	isBooleanTypeAnnotation,
+	isFunctionTypeAnnotation,
 } from './utils/is-boolean.js';
 
 const MESSAGE_ID = 'consistent-boolean-name';
@@ -98,6 +101,7 @@ const typeScriptExpressionWrapperTypes = new Set([
 ]);
 const isUpperCase = string => string === string.toUpperCase();
 const stripLeadingUnderscores = name => name.replace(/^_+/, '');
+const isScreamingCase = name => /^[A-Z][\dA-Z_]*$/.test(stripLeadingUnderscores(name));
 
 const isFunction = node => [
 	'ArrowFunctionExpression',
@@ -180,6 +184,18 @@ function getReplacementName(name, prefix) {
 		: `${leadingUnderscores}${prefix}${upperFirst(nameWithoutLeadingUnderscores)}`;
 }
 
+function getReactHookReplacementName({name, nameForPrefixCheck}, prefix) {
+	if (name === nameForPrefixCheck) {
+		return getReplacementName(name, prefix);
+	}
+
+	const hookName = isScreamingCase(nameForPrefixCheck)
+		? getReplacementName(nameForPrefixCheck, prefix)
+		: `${prefix}${upperFirst(nameForPrefixCheck)}`;
+
+	return `use${upperFirst(hookName)}`;
+}
+
 const isExportedIdentifier = identifier => {
 	if (
 		identifier.parent.type === 'VariableDeclarator'
@@ -223,6 +239,23 @@ const shouldSuggestRename = variable => getVariableIdentifiers(variable)
 		&& identifier.type !== 'JSXIdentifier',
 	);
 
+function isDestructuredDefinition(definition) {
+	for (let node = definition.name; node && node !== definition.node; node = node.parent) {
+		if (
+			node.type === 'ObjectPattern'
+			|| node.type === 'ArrayPattern'
+		) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+const isDestructuredVariable = variable =>
+	variable.defs.length > 0
+	&& variable.defs.every(definition => isDestructuredDefinition(definition));
+
 const isBooleanFunctionDefinition = (definition, context) =>
 	definition.type === 'FunctionName'
 	&& isFunction(definition.node)
@@ -264,6 +297,41 @@ function getFunctionDefinitions(variable) {
 	return overloadDefinitions.length > 0 ? overloadDefinitions : variable.defs;
 }
 
+function isReactHookFunctionBinding(variable, context) {
+	if (
+		variable.name === 'use'
+		|| !isReactHookName(variable.name)
+	) {
+		return false;
+	}
+
+	if (getFunctionDefinitions(variable)) {
+		return true;
+	}
+
+	const definition = getSupportedVariableDefinition(variable);
+
+	if (definition?.type === 'FunctionName') {
+		return isFunction(definition.node);
+	}
+
+	return definition?.type === 'Variable'
+		&& (
+			isFunction(definition.node.init)
+			|| isFunctionTypeAnnotation(definition.name.typeAnnotation, context, context.sourceCode.getScope(definition.name))
+		);
+}
+
+function getNameForPrefixCheck(variable, context) {
+	if (!isReactHookFunctionBinding(variable, context)) {
+		return variable.name;
+	}
+
+	const hookName = variable.name.slice(3);
+
+	return isScreamingCase(hookName) ? hookName : lowerFirst(hookName);
+}
+
 function combineBooleanStates(states) {
 	if (
 		states.length === 0
@@ -888,7 +956,7 @@ function getPropertyBooleanState(node, context) {
 	return state === unknown && isBooleanProperty(node, context) ? boolean : state;
 }
 
-function getSuggestions(variable, prefixes, context) {
+function getSuggestions(variable, prefixes, context, nameForPrefixCheck) {
 	if (
 		!shouldSuggestRename(variable)
 		|| variable.references.some(reference => reference.vueUsedInTemplate)
@@ -904,7 +972,7 @@ function getSuggestions(variable, prefixes, context) {
 	const suggestions = [];
 
 	for (const prefix of prefixes) {
-		const replacement = getAvailableVariableName(getReplacementName(variable.name, prefix), scopes);
+		const replacement = getAvailableVariableName(getReactHookReplacementName({name: variable.name, nameForPrefixCheck}, prefix), scopes);
 
 		if (!replacement || usedReplacements.has(replacement)) {
 			continue;
@@ -954,7 +1022,13 @@ function isInDeclareContext(node) {
 	return false;
 }
 
-function getAutofix(variable, prefixes, context, suggestions) {
+function getAutofix({
+	variable,
+	prefixes,
+	context,
+	suggestions,
+	nameForPrefixCheck,
+}) {
 	if (
 		!suggestions
 		|| !isAutofixableVariable(variable, context)
@@ -963,7 +1037,7 @@ function getAutofix(variable, prefixes, context, suggestions) {
 	}
 
 	const [prefix] = prefixes;
-	const replacement = getReplacementName(variable.name, prefix);
+	const replacement = getReactHookReplacementName({name: variable.name, nameForPrefixCheck}, prefix);
 	const suggestion = suggestions.find(suggestion => suggestion.data.replacement === replacement);
 
 	return suggestion?.fix;
@@ -978,11 +1052,15 @@ const create = context => {
 	}
 
 	const checkVariable = variable => {
-		if (isIgnoredName(variable.name, ignore)) {
+		if (
+			isIgnoredName(variable.name, ignore)
+			|| isDestructuredVariable(variable)
+		) {
 			return;
 		}
 
-		const booleanPrefix = getBooleanPrefix(variable.name, prefixes);
+		const nameForPrefixCheck = getNameForPrefixCheck(variable, context);
+		const booleanPrefix = getBooleanPrefix(nameForPrefixCheck, prefixes);
 		if (booleanPrefix) {
 			if (getVariableBooleanState(variable, context) === nonBoolean) {
 				const [definition] = variable.defs;
@@ -991,7 +1069,7 @@ const create = context => {
 					node: definition.name,
 					messageId: MESSAGE_ID_NON_BOOLEAN_PREFIX,
 					data: {
-						name: variable.name,
+						name: nameForPrefixCheck,
 						prefix: booleanPrefix,
 					},
 				});
@@ -1008,16 +1086,22 @@ const create = context => {
 		}
 
 		const [definition] = variable.defs;
-		const suggest = getSuggestions(variable, prefixes, context);
+		const suggest = getSuggestions(variable, prefixes, context, nameForPrefixCheck);
 
 		context.report({
 			node: definition.name,
 			messageId: MESSAGE_ID,
 			data: {
-				name: variable.name,
+				name: nameForPrefixCheck,
 				prefixes: formatPrefixes(prefixes),
 			},
-			fix: getAutofix(variable, prefixes, context, suggest),
+			fix: getAutofix({
+				variable,
+				prefixes,
+				context,
+				suggestions: suggest,
+				nameForPrefixCheck,
+			}),
 			suggest,
 		});
 	};

package/rules/consistent-compound-words.js

@@ -1,10 +1,10 @@
-import helperValidatorIdentifier from '@babel/helper-validator-identifier';
 import {
 	getAvailableVariableName,
 	getScopes,
 	isShorthandPropertyValue,
 	lowerFirst,
 	upperFirst,
+	isIdentifierName,
 } from './utils/index.js';
 import {
 	isClassVariable,
@@ -17,7 +17,6 @@ import {renameVariable} from './fix/index.js';
 
 const MESSAGE_ID_ERROR = 'consistent-compound-words/error';
 const MESSAGE_ID_RENAME = 'consistent-compound-words/rename';
-const {isIdentifierName} = helperValidatorIdentifier;
 
 const messages = {
 	[MESSAGE_ID_ERROR]: 'Prefer `{{replacement}}` over `{{name}}`.',

package/rules/consistent-json-file-read.js

@@ -113,15 +113,12 @@ function isBufferEncoding(node, scope) {
 
 function isJsonReadFileCall(node, scope) {
 	if (
-		!(
-			node
+		!(node
 			&& node.type === 'CallExpression'
 			&& !node.optional
 			&& (node.arguments.length === 1 || node.arguments.length === 2)
 			&& node.arguments.every(node => node.type !== 'SpreadElement')
-			&& node.callee.type === 'MemberExpression'
-			&& !node.callee.optional
-		)
+			&& node.callee.type === 'MemberExpression') || node.callee.optional
 	) {
 		return false;
 	}

package/rules/dom-node-dataset.js

@@ -1,4 +1,3 @@
-import helperValidatorIdentifier from '@babel/helper-validator-identifier';
 import {findVariable} from '@eslint-community/eslint-utils';
 import {
 	escapeString,
@@ -12,6 +11,7 @@ import {
 	needsSemicolon,
 	shouldAddParenthesesToMemberExpressionObject,
 	wouldRemoveComments,
+	isIdentifierName,
 } from './utils/index.js';
 import {removeStatement} from './fix/index.js';
 import {
@@ -21,7 +21,6 @@ import {
 	isExpressionStatement,
 } from './ast/index.js';
 
-const {isIdentifierName} = helperValidatorIdentifier;
 const MESSAGE_ID = 'prefer-dataset';
 const INVERSE_MESSAGE_ID = 'prefer-attributes';
 const messages = {
@@ -106,11 +105,8 @@ function getDatasetVariableReadMembers(variable) {
 
 		const {identifier} = reference;
 		const member = identifier.parent;
-		if (!(
-			member.type === 'MemberExpression'
-			&& member.object === identifier
-			&& !member.optional
-		)) {
+		if (!(member.type === 'MemberExpression'
+			&& member.object === identifier) || member.optional) {
 			return;
 		}
 

package/rules/escape-case.js

@@ -24,14 +24,14 @@ const getProblem = ({node, original, regex = escapeCase, lowercase, fix}) => {
 
 /** @param {import('eslint').Rule.RuleContext} context */
 const create = context => {
-	const lowercase = context.options[0] === 'lowercase';
+	const isLowercase = context.options[0] === 'lowercase';
 
 	context.on('Literal', node => {
 		if (isStringLiteral(node)) {
 			return getProblem({
 				node,
 				original: node.raw,
-				lowercase,
+				lowercase: isLowercase,
 			});
 		}
 	});
@@ -42,7 +42,7 @@ const create = context => {
 				node,
 				original: node.raw,
 				regex: escapePatternCase,
-				lowercase,
+				lowercase: isLowercase,
 			});
 		}
 	});
@@ -55,7 +55,7 @@ const create = context => {
 		return getProblem({
 			node,
 			original: node.value.raw,
-			lowercase,
+			lowercase: isLowercase,
 			fix: (fixer, fixed) => replaceTemplateElement(node, fixed, context, fixer),
 		});
 	});

package/rules/expiring-todo-comments.js

@@ -191,8 +191,8 @@ function getPackageHelpers(dirname) {
 
 		// Check if have to skip colon
 		// @example "TODO [...]: message here"
-		const dropColon = afterArguments[0] === ':';
-		if (dropColon) {
+		const isDropColon = afterArguments[0] === ':';
+		if (isDropColon) {
 			return afterArguments.slice(1).trim();
 		}
 

package/rules/explicit-length-check.js

@@ -250,7 +250,7 @@ function create(context) {
 		}
 
 		let node;
-		let autoFix = true;
+		let isAutoFix = true;
 		let {isZeroLengthCheck, node: lengthCheckNode} = getLengthCheckNode(lengthNode);
 		if (lengthCheckNode) {
 			const {isNegative, node: ancestor} = getBooleanAncestor(lengthCheckNode, context);
@@ -266,7 +266,7 @@ function create(context) {
 			} else if (isLogicalExpression(lengthNode.parent) && lengthNode.parent.operator === '&&') {
 				isZeroLengthCheck = isNegative;
 				node = lengthNode;
-				autoFix = false;
+				isAutoFix = false;
 			}
 		}
 
@@ -287,7 +287,7 @@ function create(context) {
 				node,
 				isZeroLengthCheck,
 				lengthNode,
-				autoFix: autoFix && !isUnsafeNegationInBinaryExpression,
+				autoFix: isAutoFix && !isUnsafeNegationInBinaryExpression,
 				shouldSuggest: !isUnsafeNegationInBinaryExpression,
 			});
 		}

package/rules/filename-case.js

@@ -280,8 +280,8 @@ const create = context => {
 
 		return new RegExp(item, 'u');
 	});
-	const multipleFileExtensions = options.multipleFileExtensions !== false;
-	const checkDirectories = options.checkDirectories !== false;
+	const isMultipleFileExtensions = options.multipleFileExtensions !== false;
+	const isCheckDirectories = options.checkDirectories !== false;
 	const chosenCasesFunctions = chosenCases.map(case_ => cases[case_].fn);
 
 	onRoot(context, () => {
@@ -292,13 +292,13 @@ const create = context => {
 			filename,
 			middle,
 			extension,
-		} = getFilenameParts(basenameWithExtension, {multipleFileExtensions});
+		} = getFilenameParts(basenameWithExtension, {multipleFileExtensions: isMultipleFileExtensions});
 
 		if (pathSegments.some(segment => ignore.some(regexp => regexp.test(segment)))) {
 			return;
 		}
 
-		if (checkDirectories) {
+		if (isCheckDirectories) {
 			for (const directory of pathSegments.slice(0, -1)) {
 				const report = getInvalidDirectoryReport(directory, chosenCases, chosenCasesFunctions);
 

package/rules/fix/remove-argument.js

@@ -1,5 +1,5 @@
 import {isCommaToken} from '@eslint-community/eslint-utils';
-import {getParentheses} from '../utils/index.js';
+import {getParentheses, hasCommentInRange} from '../utils/index.js';
 
 /**
 @import {TSESTree as ESTree} from '@typescript-eslint/types';
@@ -22,17 +22,22 @@ function getArgumentRemovalRange(node, context) {
 	let [start] = sourceCode.getRange(firstToken);
 	let [, end] = sourceCode.getRange(lastToken);
 
-	if (index !== 0) {
-		const commaToken = sourceCode.getTokenBefore(firstToken);
-		[start] = sourceCode.getRange(commaToken);
-	}
-
-	// If the removed argument is the only argument, the trailing comma must be removed too
 	if (callOrNewExpression.arguments.length === 1) {
+		// The only argument: also drop a dangling trailing comma if present (`fn(a,)`).
 		const tokenAfter = sourceCode.getTokenAfter(lastToken);
 		if (isCommaToken(tokenAfter)) {
 			[, end] = sourceCode.getRange(tokenAfter);
 		}
+	} else if (index === 0) {
+		// First of several: remove it through the following comma and the gap after it, so
+		// `fn(a, b)` becomes `fn(b)` rather than `fn( b)`.
+		const commaToken = sourceCode.getTokenAfter(lastToken);
+		const tokenAfterComma = sourceCode.getTokenAfter(commaToken, {includeComments: true});
+		[end] = sourceCode.getRange(tokenAfterComma);
+	} else {
+		// Otherwise remove the comma that precedes it.
+		const commaToken = sourceCode.getTokenBefore(firstToken);
+		[start] = sourceCode.getRange(commaToken);
 	}
 
 	return [start, end];
@@ -45,7 +50,28 @@ function getArgumentRemovalRange(node, context) {
 @returns {ESLint.Rule.Fix}
 */
 export default function removeArgument(fixer, node, context) {
-	return fixer.removeRange(getArgumentRemovalRange(node, context));
+	const removalRange = getArgumentRemovalRange(node, context);
+	const callOrNewExpression = node.parent;
+	const index = callOrNewExpression.arguments.indexOf(node);
+
+	if (
+		index === 0
+		&& callOrNewExpression.arguments.length > 1
+		&& hasCommentInRange(context, removalRange)
+	) {
+		const {sourceCode} = context;
+		const parentheses = getParentheses(node, context);
+		const lastToken = parentheses.at(-1) || node;
+		const [, argumentEnd] = sourceCode.getRange(lastToken);
+		const commaToken = sourceCode.getTokenAfter(lastToken);
+		const [commaStart, commaEnd] = sourceCode.getRange(commaToken);
+		const rangeText = sourceCode.text.slice(...removalRange);
+		const replacement = rangeText.slice(argumentEnd - removalRange[0], commaStart - removalRange[0]) + rangeText.slice(commaEnd - removalRange[0]);
+
+		return fixer.replaceTextRange(removalRange, replacement);
+	}
+
+	return fixer.removeRange(removalRange);
 }
 
 export {

package/rules/fix/remove-statement.js

@@ -3,7 +3,7 @@ import {isSemicolonToken} from '@eslint-community/eslint-utils';
 const isWhitespaceOnly = text => /^\s*$/.test(text);
 
 // Removes a statement node along with its surrounding whitespace, while preserving comments.
-function removeStatement(statement, context, fixer, preserveSemiColon = false) {
+export default function removeStatement(statement, context, fixer, preserveSemiColon = false) {
 	const {sourceCode} = context;
 	const {lines} = sourceCode;
 	let endToken = statement;
@@ -44,5 +44,3 @@ function removeStatement(statement, context, fixer, preserveSemiColon = false) {
 
 	return fixer.removeRange([start, end]);
 }
-
-export default removeStatement;

package/rules/id-match.js

@@ -26,11 +26,11 @@ const shouldIgnoreNamedSpecifierReport = (problem, checkNamedSpecifiers) =>
 @param {import('eslint').Rule.RuleContext} context
 */
 const create = context => {
-	const checkNamedSpecifiers = context.options[1]?.checkNamedSpecifiers !== false;
+	const isCheckNamedSpecifiers = context.options[1]?.checkNamedSpecifiers !== false;
 	const fakeContext = Object.create(context, {
 		report: {
 			value(problem) {
-				if (shouldIgnoreNamedSpecifierReport(problem, checkNamedSpecifiers)) {
+				if (shouldIgnoreNamedSpecifierReport(problem, isCheckNamedSpecifiers)) {
 					return;
 				}