Refactor parentheses related functions (sindresorhus#1169)

Author: fisker

rules/no-array-for-each.js

@@ -11,7 +11,7 @@ const getDocumentationUrl = require('./utils/get-documentation-url');
 const methodSelector = require('./utils/method-selector');
 const needsSemicolon = require('./utils/needs-semicolon');
 const shouldAddParenthesesToExpressionStatementExpression = require('./utils/should-add-parentheses-to-expression-statement-expression');
-const getParenthesizedTimes = require('./utils/get-parenthesized-times');
+const {getParentheses} = require('./utils/parentheses');
 const extendFixRange = require('./utils/extend-fix-range');
 const isFunctionSelfUsedInside = require('./utils/is-function-self-used-inside');
 const {isNodeMatches} = require('./utils/is-node-matches');
@@ -155,18 +155,12 @@ function getFixFunction(callExpression, sourceCode, functionInfo) {
 	};
 
 	function * removeCallbackParentheses(fixer) {
-		const parenthesizedTimes = getParenthesizedTimes(callback, sourceCode);
-		if (parenthesizedTimes > 0) {
-			// Opening parenthesis tokens already included in `getForOfLoopHeadRange`
+		// Opening parenthesis tokens already included in `getForOfLoopHeadRange`
+		const closingParenthesisTokens = getParentheses(callback, sourceCode)
+			.filter(token => isClosingParenToken(token));
 
-			const closingParenthesisTokens = sourceCode.getTokensAfter(
-				callback,
-				{count: parenthesizedTimes, filter: isClosingParenToken}
-			);
-
-			for (const closingParenthesisToken of closingParenthesisTokens) {
-				yield fixer.remove(closingParenthesisToken);
-			}
+		for (const closingParenthesisToken of closingParenthesisTokens) {
+			yield fixer.remove(closingParenthesisToken);
 		}
 	}
 

rules/prefer-spread.js

@@ -3,7 +3,7 @@ const {isParenthesized, getStaticValue, isCommaToken, hasSideEffect} = require('
 const getDocumentationUrl = require('./utils/get-documentation-url');
 const methodSelector = require('./utils/method-selector');
 const needsSemicolon = require('./utils/needs-semicolon');
-const getParentheses = require('./utils/get-parentheses');
+const {getParenthesizedRange} = require('./utils/parentheses');
 const shouldAddParenthesesToSpreadElementArgument = require('./utils/should-add-parentheses-to-spread-element-argument');
 const replaceNodeOrTokenAndSpacesBefore = require('./utils/replace-node-or-token-and-spaces-before');
 const removeSpacesAfter = require('./utils/remove-spaces-after');
@@ -69,14 +69,6 @@ const isArrayLiteralHasTrailingComma = (node, sourceCode) => {
 	return isCommaToken(sourceCode.getLastToken(node, 1));
 };
 
-const getParenthesizedRange = (node, sourceCode) => {
-	const [firstToken = node, lastToken = node] = getParentheses(node, sourceCode);
-
-	const [start] = firstToken.range;
-	const [, end] = lastToken.range;
-	return [start, end];
-};
-
 const getRangeAfterCalleeObject = (node, sourceCode) => {
 	const {object} = node.callee;
 	const parenthesizedRange = getParenthesizedRange(object, sourceCode);

rules/utils/get-parentheses.js

@@ -0,0 +1,58 @@
+'use strict';
+const {isParenthesized, isOpeningParenToken, isClosingParenToken} = require('eslint-utils');
+
+/*
+Get how many times the node is parenthesized.
+
+@param {Node} node - The node to be checked.
+@param {SourceCode} sourceCode - The source code object.
+@returns {number}
+*/
+function getParenthesizedTimes(node, sourceCode) {
+	let times = 0;
+	while (isParenthesized(times + 1, node, sourceCode)) {
+		times++;
+	}
+
+	return times;
+}
+
+/*
+Get all parentheses tokens around the node.
+
+@param {Node} node - The node to be checked.
+@param {SourceCode} sourceCode - The source code object.
+@returns {Token[]}
+*/
+function getParentheses(node, sourceCode) {
+	const count = getParenthesizedTimes(node, sourceCode);
+
+	if (count === 0) {
+		return [];
+	}
+
+	return [
+		...sourceCode.getTokensBefore(node, {count, filter: isOpeningParenToken}),
+		...sourceCode.getTokensAfter(node, {count, filter: isClosingParenToken})
+	];
+}
+
+/*
+Get the parenthesized range of the node.
+
+@param {Node} node - The node to be checked.
+@param {SourceCode} sourceCode - The source code object.
+@returns {number[]}
+*/
+function getParenthesizedRange(node, sourceCode) {
+	const parentheses = getParentheses(node, sourceCode);
+	const [start] = (parentheses[0] || node).range;
+	const [, end] = (parentheses[parentheses.length - 1] || node).range;
+	return [start, end];
+}
+
+module.exports = {
+	getParenthesizedTimes,
+	getParentheses,
+	getParenthesizedRange
+};

rules/utils/get-parenthesized-times.js

@@ -1,21 +1,11 @@
 'use strict';
-const {isOpeningParenToken, isClosingParenToken} = require('eslint-utils');
-const getParenthesizedTimes = require('./get-parenthesized-times');
+const {getParentheses} = require('./parentheses');
 
 function * replaceNodeOrTokenAndSpacesBefore(nodeOrToken, replacement, fixer, sourceCode) {
-	const parenthesizedTimes = getParenthesizedTimes(nodeOrToken, sourceCode);
+	const tokens = getParentheses(nodeOrToken, sourceCode);
 
-	if (parenthesizedTimes > 0) {
-		let lastBefore = nodeOrToken;
-		let lastAfter = nodeOrToken;
-		for (let index = 0; index < parenthesizedTimes; index++) {
-			const openingParenthesisToken = sourceCode.getTokenBefore(lastBefore, isOpeningParenToken);
-			const closingParenthesisToken = sourceCode.getTokenAfter(lastAfter, isClosingParenToken);
-			yield * replaceNodeOrTokenAndSpacesBefore(openingParenthesisToken, '', fixer, sourceCode);
-			yield * replaceNodeOrTokenAndSpacesBefore(closingParenthesisToken, '', fixer, sourceCode);
-			lastBefore = openingParenthesisToken;
-			lastAfter = closingParenthesisToken;
-		}
+	for (const token of tokens) {
+		yield * replaceNodeOrTokenAndSpacesBefore(token, '', fixer, sourceCode);
 	}
 
 	let [start, end] = nodeOrToken.range;