From f4339d86fb5118b4d44af163a5b3ff884206a7a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mario=20Beltr=C3=A1n=20Alarc=C3=B3n?= Date: Mon, 28 Feb 2022 17:48:04 +0100 Subject: [PATCH] rename isParenthesized util --- lib/rules/jsx-no-leaked-zero.js | 6 +++--- lib/rules/jsx-wrap-multilines.js | 10 +++++----- lib/util/ast.js | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/rules/jsx-no-leaked-zero.js b/lib/rules/jsx-no-leaked-zero.js index f5412dd2d3..5983f9962b 100644 --- a/lib/rules/jsx-no-leaked-zero.js +++ b/lib/rules/jsx-no-leaked-zero.js @@ -7,7 +7,7 @@ const docsUrl = require('../util/docsUrl'); const report = require('../util/report'); -const isParenthesised = require('../util/ast').isParenthesised; +const isParenthesized = require('../util/ast').isParenthesized; //------------------------------------------------------------------------------ // Rule Definition @@ -62,7 +62,7 @@ module.exports = { function ruleFixer(fixer, logicalExpressionNode) { if (fixStrategy === CAST_FIX_STRATEGY) { let leftSideRange = logicalExpressionNode.left.range; - if (isParenthesised(context, logicalExpressionNode.left)) { + if (isParenthesized(context, logicalExpressionNode.left)) { const [leftSideStart, leftSideEnd] = leftSideRange; leftSideRange = [leftSideStart - 1, leftSideEnd + 1]; } @@ -72,7 +72,7 @@ module.exports = { const sourceCode = context.getSourceCode(); const rightSideText = sourceCode.getText(logicalExpressionNode.right); let leftSideText = sourceCode.getText(logicalExpressionNode.left); - if (isParenthesised(context, logicalExpressionNode.left)) { + if (isParenthesized(context, logicalExpressionNode.left)) { leftSideText = `(${leftSideText})`; } return fixer.replaceText(logicalExpressionNode, `${leftSideText} ? ${rightSideText} : null`); diff --git a/lib/rules/jsx-wrap-multilines.js b/lib/rules/jsx-wrap-multilines.js index e4425513b9..f865cb970a 100644 --- a/lib/rules/jsx-wrap-multilines.js +++ b/lib/rules/jsx-wrap-multilines.js @@ -9,7 +9,7 @@ const has = require('object.hasown/polyfill')(); const docsUrl = require('../util/docsUrl'); const jsxUtil = require('../util/jsx'); const reportC = require('../util/report'); -const isParenthesised = require('../util/ast').isParenthesised; +const isParenthesized = require('../util/ast').isParenthesized; // ------------------------------------------------------------------------------ // Constants @@ -93,7 +93,7 @@ module.exports = { function needsOpeningNewLine(node) { const previousToken = context.getSourceCode().getTokenBefore(node); - if (!isParenthesised(context, node)) { + if (!isParenthesized(context, node)) { return false; } @@ -107,7 +107,7 @@ module.exports = { function needsClosingNewLine(node) { const nextToken = context.getSourceCode().getTokenAfter(node); - if (!isParenthesised(context, node)) { + if (!isParenthesized(context, node)) { return false; } @@ -144,12 +144,12 @@ module.exports = { const sourceCode = context.getSourceCode(); const option = getOption(type); - if ((option === true || option === 'parens') && !isParenthesised(context, node) && isMultilines(node)) { + if ((option === true || option === 'parens') && !isParenthesized(context, node) && isMultilines(node)) { report(node, 'missingParens', (fixer) => fixer.replaceText(node, `(${sourceCode.getText(node)})`)); } if (option === 'parens-new-line' && isMultilines(node)) { - if (!isParenthesised(context, node)) { + if (!isParenthesized(context, node)) { const tokenBefore = sourceCode.getTokenBefore(node, { includeComments: true }); const tokenAfter = sourceCode.getTokenAfter(node, { includeComments: true }); const start = node.loc.start; diff --git a/lib/util/ast.js b/lib/util/ast.js index c8c593d39d..84c94b48a8 100644 --- a/lib/util/ast.js +++ b/lib/util/ast.js @@ -271,7 +271,7 @@ function getKeyValue(context, node) { * @param {ASTNode} node - Node to be checked * @returns {boolean} */ -function isParenthesised(context, node) { +function isParenthesized(context, node) { const sourceCode = context.getSourceCode(); const previousToken = sourceCode.getTokenBefore(node); const nextToken = sourceCode.getTokenAfter(node); @@ -397,7 +397,7 @@ module.exports = { getPropertyNameNode, getComponentProperties, getKeyValue, - isParenthesised, + isParenthesized: isParenthesized, isAssignmentLHS, isClass, isFunction,