Skip to content

Commit b02d626

Browse files
authored
feat: improve group order error messages in sort-classes
1 parent 105f096 commit b02d626

File tree

2 files changed

+234
-76
lines changed

2 files changed

+234
-76
lines changed

rules/sort-classes.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { complete } from '../utils/complete'
1919
import { pairwise } from '../utils/pairwise'
2020
import { compare } from '../utils/compare'
2121

22-
type MESSAGE_ID = 'unexpectedClassesOrder'
22+
type MESSAGE_ID = 'unexpectedClassesGroupOrder' | 'unexpectedClassesOrder'
2323

2424
type ProtectedModifier = 'protected'
2525
type PrivateModifier = 'private'
@@ -207,6 +207,8 @@ export default createEslintRule<Options, MESSAGE_ID>({
207207
},
208208
],
209209
messages: {
210+
unexpectedClassesGroupOrder:
211+
'Expected "{{right}}" ({{rightGroup}}) to come before "{{left}}" ({{leftGroup}}).',
210212
unexpectedClassesOrder: 'Expected "{{right}}" to come before "{{left}}".',
211213
},
212214
},
@@ -512,10 +514,15 @@ export default createEslintRule<Options, MESSAGE_ID>({
512514
isPositive(compare(left, right, options))))
513515
) {
514516
context.report({
515-
messageId: 'unexpectedClassesOrder',
517+
messageId:
518+
leftNum !== rightNum
519+
? 'unexpectedClassesGroupOrder'
520+
: 'unexpectedClassesOrder',
516521
data: {
517522
left: toSingleLine(left.name),
523+
leftGroup: left.group,
518524
right: toSingleLine(right.name),
525+
rightGroup: right.group,
519526
},
520527
node: right.node,
521528
fix: (fixer: TSESLint.RuleFixer) => {

0 commit comments

Comments
 (0)