fix: fix overlapping errors between newlines-between and comment-afte…

…r fixes
azat-io · Jan 13, 2025 · a6e1daf · a6e1daf
1 parent afdda90
commit a6e1daf
Show file tree

Hide file tree

Showing 29 changed files with 691 additions and 208 deletions.
diff --git a/rules/sort-classes.ts b/rules/sort-classes.ts
@@ -42,7 +42,6 @@ import { isNodeEslintDisabled } from '../utils/is-node-eslint-disabled'
 import { hasPartitionComment } from '../utils/has-partition-comment'
 import { sortNodesByGroups } from '../utils/sort-nodes-by-groups'
 import { getCommentsBefore } from '../utils/get-comments-before'
-import { makeNewlinesFixes } from '../utils/make-newlines-fixes'
 import { getNewlinesErrors } from '../utils/get-newlines-errors'
 import { createEslintRule } from '../utils/create-eslint-rule'
 import { getLinesBetween } from '../utils/get-lines-between'
@@ -52,8 +51,8 @@ import { toSingleLine } from '../utils/to-single-line'
 import { rangeToDiff } from '../utils/range-to-diff'
 import { getSettings } from '../utils/get-settings'
 import { isSortable } from '../utils/is-sortable'
-import { useGroups } from '../utils/use-groups'
 import { makeFixes } from '../utils/make-fixes'
+import { useGroups } from '../utils/use-groups'
 import { complete } from '../utils/complete'
 import { pairwise } from '../utils/pairwise'
 import { matches } from '../utils/matches'
@@ -652,29 +651,21 @@ export default createEslintRule<SortClassesOptions, MESSAGE_ID>({
 
         for (let messageId of messageIds) {
           context.report({
-            fix: (fixer: TSESLint.RuleFixer) => [
-              ...makeFixes({
-                sortedNodes: sortedNodesExcludingEslintDisabled,
-                sourceCode,
-                options,
-                fixer,
-                nodes,
-              }),
-              ...makeNewlinesFixes({
-                sortedNodes: sortedNodesExcludingEslintDisabled,
-                sourceCode,
-                options,
-                fixer,
-                nodes,
-              }),
-            ],
             data: {
               nodeDependentOnRight: firstUnorderedNodeDependentOnRight?.name,
               right: toSingleLine(right.name),
               left: toSingleLine(left.name),
               rightGroup: right.group,
               leftGroup: left.group,
             },
+            fix: (fixer: TSESLint.RuleFixer) =>
+              makeFixes({
+                sortedNodes: sortedNodesExcludingEslintDisabled,
+                sourceCode,
+                options,
+                fixer,
+                nodes,
+              }),
             node: right.node,
             messageId,
           })

diff --git a/rules/sort-decorators.ts b/rules/sort-decorators.ts
@@ -31,8 +31,8 @@ import { toSingleLine } from '../utils/to-single-line'
 import { rangeToDiff } from '../utils/range-to-diff'
 import { getSettings } from '../utils/get-settings'
 import { isSortable } from '../utils/is-sortable'
-import { useGroups } from '../utils/use-groups'
 import { makeFixes } from '../utils/make-fixes'
+import { useGroups } from '../utils/use-groups'
 import { complete } from '../utils/complete'
 import { pairwise } from '../utils/pairwise'
 

diff --git a/rules/sort-enums.ts b/rules/sort-enums.ts
@@ -31,8 +31,8 @@ import { toSingleLine } from '../utils/to-single-line'
 import { rangeToDiff } from '../utils/range-to-diff'
 import { getSettings } from '../utils/get-settings'
 import { isSortable } from '../utils/is-sortable'
-import { sortNodes } from '../utils/sort-nodes'
 import { makeFixes } from '../utils/make-fixes'
+import { sortNodes } from '../utils/sort-nodes'
 import { complete } from '../utils/complete'
 import { pairwise } from '../utils/pairwise'
 

diff --git a/rules/sort-exports.ts b/rules/sort-exports.ts
@@ -23,8 +23,8 @@ import { getLinesBetween } from '../utils/get-lines-between'
 import { getSourceCode } from '../utils/get-source-code'
 import { rangeToDiff } from '../utils/range-to-diff'
 import { getSettings } from '../utils/get-settings'
-import { sortNodes } from '../utils/sort-nodes'
 import { makeFixes } from '../utils/make-fixes'
+import { sortNodes } from '../utils/sort-nodes'
 import { complete } from '../utils/complete'
 import { pairwise } from '../utils/pairwise'
 

diff --git a/rules/sort-heritage-clauses.ts b/rules/sort-heritage-clauses.ts
@@ -26,8 +26,8 @@ import { toSingleLine } from '../utils/to-single-line'
 import { rangeToDiff } from '../utils/range-to-diff'
 import { getSettings } from '../utils/get-settings'
 import { isSortable } from '../utils/is-sortable'
-import { useGroups } from '../utils/use-groups'
 import { makeFixes } from '../utils/make-fixes'
+import { useGroups } from '../utils/use-groups'
 import { complete } from '../utils/complete'
 import { pairwise } from '../utils/pairwise'
 
@@ -176,19 +176,19 @@ let sortHeritageClauses = (
     let leftNumber = getGroupNumber(options.groups, left)
     let rightNumber = getGroupNumber(options.groups, right)
     context.report({
-      data: {
-        right: toSingleLine(right.name),
-        left: toSingleLine(left.name),
-        rightGroup: right.group,
-        leftGroup: left.group,
-      },
       fix: fixer =>
         makeFixes({
           sortedNodes: sortedNodesExcludingEslintDisabled,
           sourceCode,
           fixer,
           nodes,
         }),
+      data: {
+        right: toSingleLine(right.name),
+        left: toSingleLine(left.name),
+        rightGroup: right.group,
+        leftGroup: left.group,
+      },
       messageId:
         leftNumber === rightNumber
           ? 'unexpectedHeritageClausesOrder'

diff --git a/rules/sort-imports.ts b/rules/sort-imports.ts
@@ -28,7 +28,6 @@ import { hasPartitionComment } from '../utils/has-partition-comment'
 import { createNodeIndexMap } from '../utils/create-node-index-map'
 import { sortNodesByGroups } from '../utils/sort-nodes-by-groups'
 import { getCommentsBefore } from '../utils/get-comments-before'
-import { makeNewlinesFixes } from '../utils/make-newlines-fixes'
 import { getNewlinesErrors } from '../utils/get-newlines-errors'
 import { createEslintRule } from '../utils/create-eslint-rule'
 import { getLinesBetween } from '../utils/get-lines-between'
@@ -37,8 +36,8 @@ import { getSourceCode } from '../utils/get-source-code'
 import { rangeToDiff } from '../utils/range-to-diff'
 import { getSettings } from '../utils/get-settings'
 import { isSortable } from '../utils/is-sortable'
-import { useGroups } from '../utils/use-groups'
 import { makeFixes } from '../utils/make-fixes'
+import { useGroups } from '../utils/use-groups'
 import { complete } from '../utils/complete'
 import { pairwise } from '../utils/pairwise'
 import { matches } from '../utils/matches'
@@ -571,15 +570,8 @@ export default createEslintRule<Options<string[]>, MESSAGE_ID>({
 
             for (let messageId of messageIds) {
               context.report({
-                fix: fixer => [
-                  ...makeFixes({
-                    sortedNodes: sortedNodesExcludingEslintDisabled,
-                    nodes: nodeList,
-                    sourceCode,
-                    options,
-                    fixer,
-                  }),
-                  ...makeNewlinesFixes({
+                fix: fixer =>
+                  makeFixes({
                     options: {
                       ...options,
                       customGroups: [],
@@ -589,7 +581,6 @@ export default createEslintRule<Options<string[]>, MESSAGE_ID>({
                     sourceCode,
                     fixer,
                   }),
-                ],
                 data: {
                   rightGroup: right.group,
                   leftGroup: left.group,

diff --git a/rules/sort-jsx-props.ts b/rules/sort-jsx-props.ts
@@ -24,8 +24,8 @@ import { getSourceCode } from '../utils/get-source-code'
 import { rangeToDiff } from '../utils/range-to-diff'
 import { getSettings } from '../utils/get-settings'
 import { isSortable } from '../utils/is-sortable'
-import { useGroups } from '../utils/use-groups'
 import { makeFixes } from '../utils/make-fixes'
+import { useGroups } from '../utils/use-groups'
 import { pairwise } from '../utils/pairwise'
 import { complete } from '../utils/complete'
 import { matches } from '../utils/matches'

diff --git a/rules/sort-maps.ts b/rules/sort-maps.ts
@@ -25,8 +25,8 @@ import { toSingleLine } from '../utils/to-single-line'
 import { rangeToDiff } from '../utils/range-to-diff'
 import { getSettings } from '../utils/get-settings'
 import { isSortable } from '../utils/is-sortable'
-import { sortNodes } from '../utils/sort-nodes'
 import { makeFixes } from '../utils/make-fixes'
+import { sortNodes } from '../utils/sort-nodes'
 import { complete } from '../utils/complete'
 import { pairwise } from '../utils/pairwise'
 

diff --git a/rules/sort-modules.ts b/rules/sort-modules.ts
@@ -44,7 +44,6 @@ import { hasPartitionComment } from '../utils/has-partition-comment'
 import { createNodeIndexMap } from '../utils/create-node-index-map'
 import { sortNodesByGroups } from '../utils/sort-nodes-by-groups'
 import { getNewlinesErrors } from '../utils/get-newlines-errors'
-import { makeNewlinesFixes } from '../utils/make-newlines-fixes'
 import { getCommentsBefore } from '../utils/get-comments-before'
 import { getNodeDecorators } from '../utils/get-node-decorators'
 import { createEslintRule } from '../utils/create-eslint-rule'
@@ -56,8 +55,8 @@ import { toSingleLine } from '../utils/to-single-line'
 import { rangeToDiff } from '../utils/range-to-diff'
 import { getSettings } from '../utils/get-settings'
 import { isSortable } from '../utils/is-sortable'
-import { useGroups } from '../utils/use-groups'
 import { makeFixes } from '../utils/make-fixes'
+import { useGroups } from '../utils/use-groups'
 import { complete } from '../utils/complete'
 import { pairwise } from '../utils/pairwise'
 
@@ -442,29 +441,21 @@ let analyzeModule = ({
 
     for (let messageId of messageIds) {
       context.report({
-        fix: (fixer: TSESLint.RuleFixer) => [
-          ...makeFixes({
-            sortedNodes: sortedNodesExcludingEslintDisabled,
-            sourceCode,
-            options,
-            fixer,
-            nodes,
-          }),
-          ...makeNewlinesFixes({
-            sortedNodes: sortedNodesExcludingEslintDisabled,
-            sourceCode,
-            options,
-            fixer,
-            nodes,
-          }),
-        ],
         data: {
           nodeDependentOnRight: firstUnorderedNodeDependentOnRight?.name,
           right: toSingleLine(right.name),
           left: toSingleLine(left.name),
           rightGroup: right.group,
           leftGroup: left.group,
         },
+        fix: (fixer: TSESLint.RuleFixer) =>
+          makeFixes({
+            sortedNodes: sortedNodesExcludingEslintDisabled,
+            sourceCode,
+            options,
+            fixer,
+            nodes,
+          }),
         node: right.node,
         messageId,
       })

diff --git a/rules/sort-named-exports.ts b/rules/sort-named-exports.ts
@@ -24,8 +24,8 @@ import { getSourceCode } from '../utils/get-source-code'
 import { rangeToDiff } from '../utils/range-to-diff'
 import { getSettings } from '../utils/get-settings'
 import { isSortable } from '../utils/is-sortable'
-import { sortNodes } from '../utils/sort-nodes'
 import { makeFixes } from '../utils/make-fixes'
+import { sortNodes } from '../utils/sort-nodes'
 import { complete } from '../utils/complete'
 import { pairwise } from '../utils/pairwise'
 

diff --git a/rules/sort-named-imports.ts b/rules/sort-named-imports.ts
@@ -24,8 +24,8 @@ import { getSourceCode } from '../utils/get-source-code'
 import { rangeToDiff } from '../utils/range-to-diff'
 import { getSettings } from '../utils/get-settings'
 import { isSortable } from '../utils/is-sortable'
-import { sortNodes } from '../utils/sort-nodes'
 import { makeFixes } from '../utils/make-fixes'
+import { sortNodes } from '../utils/sort-nodes'
 import { complete } from '../utils/complete'
 import { pairwise } from '../utils/pairwise'
 

diff --git a/rules/sort-object-types.ts b/rules/sort-object-types.ts
@@ -41,7 +41,6 @@ import { isNodeFunctionType } from '../utils/is-node-function-type'
 import { createNodeIndexMap } from '../utils/create-node-index-map'
 import { sortNodesByGroups } from '../utils/sort-nodes-by-groups'
 import { getCommentsBefore } from '../utils/get-comments-before'
-import { makeNewlinesFixes } from '../utils/make-newlines-fixes'
 import { getNewlinesErrors } from '../utils/get-newlines-errors'
 import { createEslintRule } from '../utils/create-eslint-rule'
 import { getLinesBetween } from '../utils/get-lines-between'
@@ -447,22 +446,14 @@ export let sortObjectTypeElements = <MessageIds extends string>({
 
       for (let messageId of messageIds) {
         context.report({
-          fix: fixer => [
-            ...makeFixes({
+          fix: fixer =>
+            makeFixes({
               sortedNodes: sortedNodesExcludingEslintDisabled,
               sourceCode,
               options,
               fixer,
               nodes,
             }),
-            ...makeNewlinesFixes({
-              sortedNodes: sortedNodesExcludingEslintDisabled,
-              sourceCode,
-              options,
-              fixer,
-              nodes,
-            }),
-          ],
           data: {
             right: toSingleLine(right.name),
             left: toSingleLine(left.name),

diff --git a/rules/sort-objects.ts b/rules/sort-objects.ts
@@ -39,7 +39,6 @@ import { singleCustomGroupJsonSchema } from './sort-objects/types'
 import { sortNodesByGroups } from '../utils/sort-nodes-by-groups'
 import { allModifiers, allSelectors } from './sort-objects/types'
 import { getCommentsBefore } from '../utils/get-comments-before'
-import { makeNewlinesFixes } from '../utils/make-newlines-fixes'
 import { getNewlinesErrors } from '../utils/get-newlines-errors'
 import { createEslintRule } from '../utils/create-eslint-rule'
 import { getLinesBetween } from '../utils/get-lines-between'
@@ -48,8 +47,8 @@ import { getSourceCode } from '../utils/get-source-code'
 import { rangeToDiff } from '../utils/range-to-diff'
 import { getSettings } from '../utils/get-settings'
 import { isSortable } from '../utils/is-sortable'
-import { useGroups } from '../utils/use-groups'
 import { makeFixes } from '../utils/make-fixes'
+import { useGroups } from '../utils/use-groups'
 import { sortNodes } from '../utils/sort-nodes'
 import { complete } from '../utils/complete'
 import { pairwise } from '../utils/pairwise'
@@ -502,29 +501,21 @@ export default createEslintRule<Options, MESSAGE_ID>({
 
         for (let messageId of messageIds) {
           context.report({
-            fix: fixer => [
-              ...makeFixes({
-                sortedNodes: sortedNodesExcludingEslintDisabled,
-                sourceCode,
-                options,
-                fixer,
-                nodes,
-              }),
-              ...makeNewlinesFixes({
-                sortedNodes: sortedNodesExcludingEslintDisabled,
-                sourceCode,
-                options,
-                fixer,
-                nodes,
-              }),
-            ],
             data: {
               nodeDependentOnRight: firstUnorderedNodeDependentOnRight?.name,
               rightGroup: right.group,
               leftGroup: left.group,
               right: right.name,
               left: left.name,
             },
+            fix: fixer =>
+              makeFixes({
+                sortedNodes: sortedNodesExcludingEslintDisabled,
+                sourceCode,
+                options,
+                fixer,
+                nodes,
+              }),
             node: right.node,
             messageId,
           })

diff --git a/rules/sort-switch-case.ts b/rules/sort-switch-case.ts
@@ -11,8 +11,8 @@ import {
   localesJsonSchema,
   orderJsonSchema,
 } from '../utils/common-json-schemas'
+import { makeSingleNodeCommentAfterFixes } from '../utils/make-single-node-comment-after-fixes'
 import { validateCustomSortConfiguration } from '../utils/validate-custom-sort-configuration'
-import { makeCommentAfterFixes } from '../utils/make-comment-after-fixes'
 import { createNodeIndexMap } from '../utils/create-node-index-map'
 import { createEslintRule } from '../utils/create-eslint-rule'
 import { getSourceCode } from '../utils/get-source-code'
@@ -182,13 +182,13 @@ export default createEslintRule<Options, MESSAGE_ID>({
                 lastCaseRange,
                 sourceCode.getText(defaultCase.node),
               ),
-              ...makeCommentAfterFixes({
+              ...makeSingleNodeCommentAfterFixes({
                 sortedNode: punctuatorAfterLastCase,
                 node: defaultCase.node,
                 sourceCode,
                 fixer,
               }),
-              ...makeCommentAfterFixes({
+              ...makeSingleNodeCommentAfterFixes({
                 node: punctuatorAfterLastCase,
                 sortedNode: defaultCase.node,
                 sourceCode,