-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: fix sorting objects with inline comments
- Loading branch information
Showing
8 changed files
with
118 additions
and
89 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| import type { TSESLint } from '@typescript-eslint/utils' | ||
| import type { TSESTree } from '@typescript-eslint/types' | ||
|
|
||
| import { AST_TOKEN_TYPES } from '@typescript-eslint/types' | ||
|
|
||
| export let getCommentAfter = ( | ||
| node: TSESTree.Node, | ||
| source: TSESLint.SourceCode, | ||
| ): TSESTree.Comment | null => { | ||
| let token = source.getTokenAfter(node, { | ||
| includeComments: true, | ||
| filter: ({ type, value }) => | ||
| !(type === AST_TOKEN_TYPES.Punctuator && [',', ';'].includes(value)), | ||
| }) | ||
|
|
||
| if ( | ||
| (token?.type === AST_TOKEN_TYPES.Block || | ||
| token?.type === AST_TOKEN_TYPES.Line) && | ||
| node.loc.end.line === token.loc.end.line | ||
| ) { | ||
| return token | ||
| } | ||
|
|
||
| return null | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| import type { TSESLint } from '@typescript-eslint/utils' | ||
| import type { TSESTree } from '@typescript-eslint/types' | ||
|
|
||
| import { AST_TOKEN_TYPES } from '@typescript-eslint/types' | ||
|
|
||
| export let getCommentBefore = ( | ||
| node: TSESTree.Node, | ||
| source: TSESLint.SourceCode, | ||
| ): TSESTree.Comment | null => { | ||
| let [tokenBefore, tokenOrCommentBefore] = source.getTokensBefore(node, { | ||
| includeComments: true, | ||
| count: 2, | ||
| filter: ({ type, value }) => | ||
| !(type === AST_TOKEN_TYPES.Punctuator && [',', ';'].includes(value)), | ||
| }) as (TSESTree.Token | null)[] | ||
|
|
||
| if ( | ||
| (tokenOrCommentBefore?.type === AST_TOKEN_TYPES.Block || | ||
| tokenOrCommentBefore?.type === AST_TOKEN_TYPES.Line) && | ||
| node.loc.start.line - tokenOrCommentBefore.loc.end.line <= 1 && | ||
| tokenBefore?.loc.end.line !== tokenOrCommentBefore.loc.start.line | ||
| ) { | ||
| return tokenOrCommentBefore | ||
| } | ||
|
|
||
| return null | ||
| } |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,49 @@ | ||
| import type { TSESLint } from '@typescript-eslint/utils' | ||
| import type { TSESTree } from '@typescript-eslint/types' | ||
| import type { SortingNode } from '../typings' | ||
|
|
||
| import { getCommentAfter } from './get-comment-after' | ||
| import { getNodeRange } from './get-node-range' | ||
|
|
||
| export let makeFixes = ( | ||
| fixer: TSESLint.RuleFixer, | ||
| nodes: SortingNode[], | ||
| sortedNodes: SortingNode[], | ||
| source: TSESLint.SourceCode, | ||
| ) => | ||
| nodes.map(({ node }, index) => | ||
| fixer.replaceTextRange( | ||
| getNodeRange(node, source), | ||
| source.text.slice(...getNodeRange(sortedNodes[index].node, source)), | ||
| ), | ||
| ) | ||
| ) => { | ||
| let fixes: TSESLint.RuleFix[] = [] | ||
|
|
||
| nodes.forEach(({ node }, index) => { | ||
| fixes.push( | ||
| fixer.replaceTextRange( | ||
| getNodeRange(node, source), | ||
| source.text.slice(...getNodeRange(sortedNodes[index].node, source)), | ||
| ), | ||
| ) | ||
|
|
||
| let commentAfter = getCommentAfter(sortedNodes[index].node, source) | ||
|
|
||
| if (commentAfter) { | ||
| let tokenBefore = source.getTokenBefore(commentAfter) | ||
|
|
||
| let range: TSESTree.Range = [ | ||
| tokenBefore!.range.at(1)!, | ||
| commentAfter.range.at(1)!, | ||
| ] | ||
|
|
||
| fixes.push(fixer.replaceTextRange(range, '')) | ||
|
|
||
| let tokenAfterNode = source.getTokenAfter(node) | ||
|
|
||
| fixes.push( | ||
| fixer.insertTextAfter( | ||
| tokenAfterNode?.loc.end.line === node.loc.end.line | ||
| ? tokenAfterNode | ||
| : node, | ||
| source.text.slice(...range), | ||
| ), | ||
| ) | ||
| } | ||
| }) | ||
| return fixes | ||
| } |