Reuse removeParentheses (#1592)

sindresorhus · Nov 10, 2021 · 5584983 · 5584983
1 parent 579d05d
commit 5584983
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/rules/no-useless-fallback-in-spread.js b/rules/no-useless-fallback-in-spread.js
@@ -3,8 +3,8 @@ const {matches} = require('./selectors/index.js');
 const {
 	isParenthesized,
 	getParenthesizedRange,
-	getParentheses,
 } = require('./utils/parentheses.js');
+const {removeParentheses} = require('./fix/index.js');
 const shouldAddParenthesesToSpreadElementArgument = require('./utils/should-add-parentheses-to-spread-element-argument.js');
 
 const MESSAGE_ID = 'no-useless-fallback-in-spread';
@@ -49,11 +49,7 @@ const create = context => ({
 					isLeftObjectParenthesized
 					|| !shouldAddParenthesesToSpreadElementArgument(left)
 				) {
-					const parentheses = getParentheses(logicalExpression, sourceCode);
-
-					for (const token of parentheses) {
-						yield fixer.remove(token);
-					}
+					yield * removeParentheses(logicalExpression, fixer, sourceCode);
 				}
 			},
 		};

diff --git a/rules/no-useless-spread.js b/rules/no-useless-spread.js
@@ -5,9 +5,8 @@ const {
 	newExpressionSelector,
 	methodCallSelector,
 } = require('./selectors/index.js');
-const {getParentheses} = require('./utils/parentheses.js');
 const typedArray = require('./shared/typed-array.js');
-const {fixSpaceAroundKeyword} = require('./fix/index.js');
+const {removeParentheses, fixSpaceAroundKeyword} = require('./fix/index.js');
 
 const SPREAD_IN_LIST = 'spread-in-list';
 const ITERABLE_TO_ARRAY = 'iterable-to-array';
@@ -107,10 +106,7 @@ const create = context => {
 
 					// `[...(( [foo] ))]`
 					//      ^^       ^^
-					const parentheses = getParentheses(spreadObject, sourceCode);
-					for (const parenthesis of parentheses) {
-						yield fixer.remove(parenthesis);
-					}
+					yield * removeParentheses(spreadObject, fixer, sourceCode);
 
 					// `[...[foo]]`
 					//      ^

diff --git a/rules/prefer-object-from-entries.js b/rules/prefer-object-from-entries.js
@@ -2,6 +2,7 @@
 const {isCommaToken, isArrowToken, isClosingParenToken} = require('eslint-utils');
 const getDocumentationUrl = require('./utils/get-documentation-url.js');
 const {matches, methodCallSelector} = require('./selectors/index.js');
+const {removeParentheses} = require('./fix/index.js');
 const {getParentheses, getParenthesizedText} = require('./utils/parentheses.js');
 const {isNodeMatches, isNodeMatchesNameOrPath} = require('./utils/is-node-matches.js');
 
@@ -147,10 +148,7 @@ function fixReduceAssignOrSpread({sourceCode, node, property}) {
 		const functionBody = node.arguments[0].body;
 		const {keyText, valueText} = getKeyValueText();
 		yield fixer.replaceText(functionBody, `[${keyText}, ${valueText}]`);
-
-		for (const parentheses of getParentheses(functionBody, sourceCode)) {
-			yield fixer.remove(parentheses);
-		}
+		yield * removeParentheses(functionBody, fixer, sourceCode);
 	}
 
 	return function * (fixer) {