From d981c71d04cb76a8e24b368d6ae719f7f427cb2a Mon Sep 17 00:00:00 2001 From: "hugo.prunaux" Date: Fri, 25 Oct 2024 13:05:48 +0200 Subject: [PATCH] refactor: renames `requiresEndingSemicolonWhenInline` to `addSafetySemicolonWhenInline` --- rules/sort-classes.ts | 2 +- rules/sort-exports.ts | 2 +- rules/sort-imports.ts | 2 +- rules/sort-interfaces.ts | 2 +- rules/sort-object-types.ts | 2 +- rules/sort-switch-case.ts | 2 +- typings/index.ts | 2 +- utils/make-fixes.ts | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rules/sort-classes.ts b/rules/sort-classes.ts index 1f1c07c6..1ab041b0 100644 --- a/rules/sort-classes.ts +++ b/rules/sort-classes.ts @@ -608,7 +608,7 @@ export default createEslintRule({ node: member, dependencies, name, - requiresEndingSemicolonWhenInline: requiresEndingSemicolon, + addSafetySemicolonWhenInline: requiresEndingSemicolon, dependencyName: getDependencyName( name, modifiers.includes('static'), diff --git a/rules/sort-exports.ts b/rules/sort-exports.ts index 369e5817..565f6a56 100644 --- a/rules/sort-exports.ts +++ b/rules/sort-exports.ts @@ -148,7 +148,7 @@ export default createEslintRule({ size: rangeToDiff(node, sourceCode), name: node.source.value, node, - requiresEndingSemicolonWhenInline: true, + addSafetySemicolonWhenInline: true, } let lastNode = parts.at(-1)?.at(-1) if ( diff --git a/rules/sort-imports.ts b/rules/sort-imports.ts index 352d5c5f..48dac43b 100644 --- a/rules/sort-imports.ts +++ b/rules/sort-imports.ts @@ -516,7 +516,7 @@ export default createEslintRule, MESSAGE_ID>({ size: rangeToDiff(node, sourceCode), group: getGroup(), node, - requiresEndingSemicolonWhenInline: true, + addSafetySemicolonWhenInline: true, isIgnored: !options.sortSideEffects && isSideEffect && diff --git a/rules/sort-interfaces.ts b/rules/sort-interfaces.ts index d09d0fba..ec3401e1 100644 --- a/rules/sort-interfaces.ts +++ b/rules/sort-interfaces.ts @@ -281,7 +281,7 @@ export default createEslintRule, MESSAGE_ID>({ node: element, group: getGroup(), name, - requiresEndingSemicolonWhenInline: true, + addSafetySemicolonWhenInline: true, } if ( diff --git a/rules/sort-object-types.ts b/rules/sort-object-types.ts index 2fdf2bb2..9be92541 100644 --- a/rules/sort-object-types.ts +++ b/rules/sort-object-types.ts @@ -269,7 +269,7 @@ export default createEslintRule, MESSAGE_ID>({ group: getGroup(), node: member, name, - requiresEndingSemicolonWhenInline: true, + addSafetySemicolonWhenInline: true, } if ( diff --git a/rules/sort-switch-case.ts b/rules/sort-switch-case.ts index 1d9a9915..13ef77eb 100644 --- a/rules/sort-switch-case.ts +++ b/rules/sort-switch-case.ts @@ -126,7 +126,7 @@ export default createEslintRule({ size: rangeToDiff(caseNode.test ?? caseNode, sourceCode), node: caseNode, isDefaultClause, - requiresEndingSemicolonWhenInline: true, + addSafetySemicolonWhenInline: true, name, } }, diff --git a/typings/index.ts b/typings/index.ts index 5bc2cceb..478ad984 100644 --- a/typings/index.ts +++ b/typings/index.ts @@ -1,8 +1,8 @@ import type { TSESTree } from '@typescript-eslint/types' export interface SortingNode { - requiresEndingSemicolonWhenInline?: boolean hasMultipleImportDeclarations?: boolean + addSafetySemicolonWhenInline?: boolean group?: string name: string size: number diff --git a/utils/make-fixes.ts b/utils/make-fixes.ts index 945d63ac..a466055a 100644 --- a/utils/make-fixes.ts +++ b/utils/make-fixes.ts @@ -40,7 +40,7 @@ export let makeFixes = ( if ( !sortedNodeText.endsWith(';') && !sortedNodeText.endsWith(',') && - sortedSortingNode.requiresEndingSemicolonWhenInline && + sortedSortingNode.addSafetySemicolonWhenInline && nextToken && node.loc.start.line === nextToken.loc.start.line && nextToken.value !== ';' &&