Skip to content

Commit 05b4797

Browse files
authored
fix: don't enforce new lines between behavior in unordered groups
1 parent 9e8405a commit 05b4797

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+721
-117
lines changed

rules/sort-array-includes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ export let sortArray = <MessageIds extends string>({
279279
): SortArrayIncludesSortingNode[] =>
280280
filteredGroupKindNodes.flatMap(groupedNodes =>
281281
sortNodesByGroups({
282-
getOptionsByGroupNumber:
282+
getOptionsByGroupIndex:
283283
buildGetCustomGroupOverriddenOptionsFunction(options),
284284
ignoreEslintDisabledNodes,
285285
groups: options.groups,

rules/sort-classes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ export default createEslintRule<SortClassesOptions, MESSAGE_ID>({
595595
isNodeIgnored: sortingNode =>
596596
getGroupIndex(options.groups, sortingNode) ===
597597
options.groups.length,
598-
getOptionsByGroupNumber:
598+
getOptionsByGroupIndex:
599599
buildGetCustomGroupOverriddenOptionsFunction(options),
600600
ignoreEslintDisabledNodes,
601601
groups: options.groups,

rules/sort-decorators.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ let sortDecorators = (
243243
): SortDecoratorsSortingNode[] =>
244244
formattedMembers.flatMap(nodes =>
245245
sortNodesByGroups({
246-
getOptionsByGroupNumber: () => ({ options }),
246+
getOptionsByGroupIndex: () => ({ options }),
247247
ignoreEslintDisabledNodes,
248248
groups: options.groups,
249249
nodes,

rules/sort-enums.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,10 @@ export default createEslintRule<Options, MESSAGE_ID>({
221221
): SortEnumsSortingNode[] => {
222222
let nodesSortedByGroups = formattedMembers.flatMap(sortingNodes =>
223223
sortNodesByGroups({
224-
getOptionsByGroupNumber: groupNumber => ({
224+
getOptionsByGroupIndex: groupIndex => ({
225225
options: getCustomGroupOverriddenOptions({
226226
options: overriddenOptions,
227-
groupNumber,
227+
groupIndex,
228228
}),
229229
nodeValueGetter,
230230
}),

rules/sort-exports.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ export default createEslintRule<Options, MESSAGE_ID>({
173173
): SortExportsSortingNode[] =>
174174
filteredGroupKindNodes.flatMap(groupedNodes =>
175175
sortNodesByGroups({
176-
getOptionsByGroupNumber:
176+
getOptionsByGroupIndex:
177177
buildGetCustomGroupOverriddenOptionsFunction(options),
178178
ignoreEslintDisabledNodes,
179179
groups: options.groups,

rules/sort-heritage-clauses.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ let sortHeritageClauses = (
142142
ignoreEslintDisabledNodes: boolean,
143143
): SortingNode[] =>
144144
sortNodesByGroups({
145-
getOptionsByGroupNumber: () => ({ options }),
145+
getOptionsByGroupIndex: () => ({ options }),
146146
ignoreEslintDisabledNodes,
147147
groups: options.groups,
148148
nodes,

rules/sort-imports.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ export default createEslintRule<Options, MESSAGE_ID>({
335335
): SortImportsSortingNode[] => {
336336
let nodesSortedByGroups = sortingNodeGroups.flatMap(nodes =>
337337
sortNodesByGroups({
338-
getOptionsByGroupNumber: groupNumber => {
338+
getOptionsByGroupIndex: groupIndex => {
339339
let customGroupOverriddenOptions =
340340
getCustomGroupOverriddenOptions({
341341
options: {
@@ -344,7 +344,7 @@ export default createEslintRule<Options, MESSAGE_ID>({
344344
? options.customGroups
345345
: [],
346346
},
347-
groupNumber,
347+
groupIndex,
348348
})
349349

350350
if (options.sortSideEffects) {
@@ -363,9 +363,9 @@ export default createEslintRule<Options, MESSAGE_ID>({
363363
options: {
364364
...overriddenOptions,
365365
type:
366-
overriddenOptions.groups[groupNumber] &&
366+
overriddenOptions.groups[groupIndex] &&
367367
isSideEffectOnlyGroup(
368-
overriddenOptions.groups[groupNumber],
368+
overriddenOptions.groups[groupIndex],
369369
)
370370
? 'unsorted'
371371
: overriddenOptions.type,

rules/sort-jsx-props.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ export default createEslintRule<Options, MESSAGE_ID>({
199199
ignoreEslintDisabledNodes: boolean,
200200
): SortingNode[] =>
201201
sortNodesByGroups({
202-
getOptionsByGroupNumber:
202+
getOptionsByGroupIndex:
203203
buildGetCustomGroupOverriddenOptionsFunction(options),
204204
ignoreEslintDisabledNodes,
205205
groups: options.groups,

rules/sort-maps.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ export default createEslintRule<Options, MESSAGE_ID>({
166166
ignoreEslintDisabledNodes: boolean,
167167
): SortingNode[] =>
168168
sortNodesByGroups({
169-
getOptionsByGroupNumber:
169+
getOptionsByGroupIndex:
170170
buildGetCustomGroupOverriddenOptionsFunction(options),
171171
ignoreEslintDisabledNodes,
172172
groups: options.groups,

rules/sort-modules.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ let analyzeModule = ({
340340
sortNodesByGroups({
341341
isNodeIgnored: sortingNode =>
342342
getGroupIndex(options.groups, sortingNode) === options.groups.length,
343-
getOptionsByGroupNumber:
343+
getOptionsByGroupIndex:
344344
buildGetCustomGroupOverriddenOptionsFunction(options),
345345
ignoreEslintDisabledNodes,
346346
groups: options.groups,

0 commit comments

Comments
 (0)