fix: improve error output

azat-io · Jun 3, 2023 · c1ad261 · c1ad261
1 parent 01a2f18
commit c1ad261
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/rules/sort-array-includes.ts b/rules/sort-array-includes.ts
@@ -4,6 +4,7 @@ import type { SortingNode } from '../typings'
 import { AST_NODE_TYPES } from '@typescript-eslint/types'
 
 import { createEslintRule } from '../utils/create-eslint-rule'
+import { toSingleLine } from '../utils/to-single-line'
 import { rangeToDiff } from '../utils/range-to-diff'
 import { SortType, SortOrder } from '../typings'
 import { sortNodes } from '../utils/sort-nodes'
@@ -143,8 +144,8 @@ export default createEslintRule<Options, MESSAGE_ID>({
               context.report({
                 messageId: 'unexpectedArrayIncludesOrder',
                 data: {
-                  first: first.name,
-                  second: second.name,
+                  first: toSingleLine(first.name),
+                  second: toSingleLine(second.name),
                 },
                 node: second.node,
                 fix: fixer => {

diff --git a/rules/sort-enums.ts b/rules/sort-enums.ts
@@ -3,6 +3,7 @@ import type { SortingNode } from '../typings'
 import { AST_NODE_TYPES } from '@typescript-eslint/types'
 
 import { createEslintRule } from '../utils/create-eslint-rule'
+import { toSingleLine } from '../utils/to-single-line'
 import { rangeToDiff } from '../utils/range-to-diff'
 import { SortType, SortOrder } from '../typings'
 import { sortNodes } from '../utils/sort-nodes'
@@ -91,8 +92,8 @@ export default createEslintRule<Options, MESSAGE_ID>({
             context.report({
               messageId: 'unexpectedEnumsOrder',
               data: {
-                first: first.name,
-                second: second.name,
+                first: toSingleLine(first.name),
+                second: toSingleLine(second.name),
               },
               node: second.node,
               fix: fixer =>

diff --git a/rules/sort-interfaces.ts b/rules/sort-interfaces.ts
@@ -4,6 +4,7 @@ import { AST_NODE_TYPES } from '@typescript-eslint/types'
 import { minimatch } from 'minimatch'
 
 import { createEslintRule } from '../utils/create-eslint-rule'
+import { toSingleLine } from '../utils/to-single-line'
 import { rangeToDiff } from '../utils/range-to-diff'
 import { SortType, SortOrder } from '../typings'
 import { sortNodes } from '../utils/sort-nodes'
@@ -129,8 +130,8 @@ export default createEslintRule<Options, MESSAGE_ID>({
             context.report({
               messageId: 'unexpectedInterfacePropertiesOrder',
               data: {
-                first: first.name,
-                second: second.name,
+                first: toSingleLine(first.name),
+                second: toSingleLine(second.name),
               },
               node: second.node,
               fix: fixer =>

diff --git a/rules/sort-map-elements.ts b/rules/sort-map-elements.ts
@@ -4,6 +4,7 @@ import type { SortingNode } from '../typings'
 import { AST_NODE_TYPES } from '@typescript-eslint/types'
 
 import { createEslintRule } from '../utils/create-eslint-rule'
+import { toSingleLine } from '../utils/to-single-line'
 import { rangeToDiff } from '../utils/range-to-diff'
 import { SortType, SortOrder } from '../typings'
 import { sortNodes } from '../utils/sort-nodes'
@@ -133,8 +134,8 @@ export default createEslintRule<Options, MESSAGE_ID>({
                 context.report({
                   messageId: 'unexpectedMapElementsOrder',
                   data: {
-                    first: first.name,
-                    second: second.name,
+                    first: toSingleLine(first.name),
+                    second: toSingleLine(second.name),
                   },
                   node: second.node,
                   fix: fixer =>

diff --git a/rules/sort-objects.ts b/rules/sort-objects.ts
@@ -4,6 +4,7 @@ import type { SortingNode } from '../typings'
 import { AST_NODE_TYPES } from '@typescript-eslint/types'
 
 import { createEslintRule } from '../utils/create-eslint-rule'
+import { toSingleLine } from '../utils/to-single-line'
 import { rangeToDiff } from '../utils/range-to-diff'
 import { SortType, SortOrder } from '../typings'
 import { sortNodes } from '../utils/sort-nodes'
@@ -162,8 +163,8 @@ export default createEslintRule<Options, MESSAGE_ID>({
               context.report({
                 messageId: 'unexpectedObjectsOrder',
                 data: {
-                  first: first.name,
-                  second: second.name,
+                  first: toSingleLine(first.name),
+                  second: toSingleLine(second.name),
                 },
                 node: second.node,
                 fix: fixer => {