@@ -19,7 +19,7 @@ import { complete } from '../utils/complete'
1919import { pairwise } from '../utils/pairwise'
2020import { compare } from '../utils/compare'
2121
22- type MESSAGE_ID = 'unexpectedClassesOrder'
22+ type MESSAGE_ID = 'unexpectedClassesGroupOrder' | ' unexpectedClassesOrder'
2323
2424type ProtectedModifier = 'protected'
2525type 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