feat: improve group order error messages in sort-classes

azat-io · Aug 14, 2024 · b02d626 · b02d626
1 parent 105f096
commit b02d626
Show file tree

Hide file tree

Showing 2 changed files with 234 additions and 76 deletions.
diff --git a/rules/sort-classes.ts b/rules/sort-classes.ts
@@ -19,7 +19,7 @@ import { complete } from '../utils/complete'
 import { pairwise } from '../utils/pairwise'
 import { compare } from '../utils/compare'
 
-type MESSAGE_ID = 'unexpectedClassesOrder'
+type MESSAGE_ID = 'unexpectedClassesGroupOrder' | 'unexpectedClassesOrder'
 
 type ProtectedModifier = 'protected'
 type PrivateModifier = 'private'
@@ -207,6 +207,8 @@ export default createEslintRule<Options, MESSAGE_ID>({
       },
     ],
     messages: {
+      unexpectedClassesGroupOrder:
+        'Expected "{{right}}" ({{rightGroup}}) to come before "{{left}}" ({{leftGroup}}).',
       unexpectedClassesOrder: 'Expected "{{right}}" to come before "{{left}}".',
     },
   },
@@ -512,10 +514,15 @@ export default createEslintRule<Options, MESSAGE_ID>({
                   isPositive(compare(left, right, options))))
             ) {
               context.report({
-                messageId: 'unexpectedClassesOrder',
+                messageId:
+                  leftNum !== rightNum
+                    ? 'unexpectedClassesGroupOrder'
+                    : 'unexpectedClassesOrder',
                 data: {
                   left: toSingleLine(left.name),
+                  leftGroup: left.group,
                   right: toSingleLine(right.name),
+                  rightGroup: right.group,
                 },
                 node: right.node,
                 fix: (fixer: TSESLint.RuleFixer) => {