-
-
Notifications
You must be signed in to change notification settings - Fork 26
fix: sort-keys autofix fully sorts keys in a single pass #235
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
af2baf6
0967bf6
3ed65a5
93c723f
f8217ed
72f36bf
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -215,23 +215,20 @@ const rule = { | |
|
|
||
| return { | ||
| Object(node) { | ||
| if (node.members.length < minKeys) { | ||
| return; | ||
| } | ||
|
|
||
| /** @type {MemberNode} */ | ||
| let prevMember; | ||
| /** @type {string} */ | ||
| let prevName; | ||
| /** @type {string} */ | ||
| let prevRawName; | ||
|
|
||
| if (node.members.length < minKeys) { | ||
| return; | ||
| } | ||
|
|
||
| for (const member of node.members) { | ||
| const thisName = getKey(member); | ||
| const thisRawName = getRawKey(member, sourceCode); | ||
| // Capture `prevMember` for this iteration so the fixer closure uses the | ||
| // intended node even though `prevMember` is reassigned in the loop. | ||
| const prevMemberNode = prevMember; | ||
|
|
||
| if ( | ||
| prevMember && | ||
|
|
@@ -250,25 +247,76 @@ const rule = { | |
| sortName, | ||
| }, | ||
| fix(fixer) { | ||
| if ( | ||
| hasAdjacentComment(member) || | ||
| hasAdjacentComment(prevMemberNode) | ||
| ) { | ||
| return null; | ||
| let group = node.members; | ||
|
|
||
| if (allowLineSeparatedGroups) { | ||
| let start = node.members.indexOf(member); | ||
| while ( | ||
| start > 0 && | ||
| !isLineSeparated( | ||
| node.members[start - 1], | ||
| node.members[start], | ||
| ) | ||
| ) { | ||
| start--; | ||
| } | ||
| let end = node.members.indexOf(member); | ||
| while ( | ||
| end < node.members.length - 1 && | ||
| !isLineSeparated( | ||
| node.members[end], | ||
| node.members[end + 1], | ||
| ) | ||
| ) { | ||
| end++; | ||
| } | ||
| group = node.members.slice(start, end + 1); | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Note for other reviewers: This would change the current behavior of reporting every unsorted key but only fixing the first group (because of the |
||
| } | ||
|
|
||
| return [ | ||
| fixer.replaceText( | ||
| member, | ||
| sourceCode.getText(prevMemberNode), | ||
| ), | ||
| fixer.replaceText( | ||
| prevMemberNode, | ||
| sourceCode.getText(member), | ||
| ), | ||
| ]; | ||
| const sortedGroup = group.toSorted((a, b) => { | ||
| const nameA = getKey(a); | ||
| const nameB = getKey(b); | ||
|
|
||
| const aFirst = isValidOrder(nameA, nameB); | ||
| const bFirst = isValidOrder(nameB, nameA); | ||
|
|
||
| if (aFirst && bFirst) { | ||
| return 0; | ||
| } | ||
| return aFirst ? -1 : 1; | ||
| }); | ||
|
|
||
| const fixes = []; | ||
| for (let i = 0; i < group.length; i++) { | ||
| const origMember = group[i]; | ||
| const replacementMember = sortedGroup[i]; | ||
|
|
||
| if (origMember === replacementMember) { | ||
| continue; | ||
| } | ||
|
|
||
| if ( | ||
| hasAdjacentComment(origMember) || | ||
| hasAdjacentComment(replacementMember) | ||
| ) { | ||
| return null; | ||
| } | ||
|
|
||
| fixes.push( | ||
| fixer.replaceText( | ||
| origMember, | ||
| sourceCode.getText( | ||
| replacementMember, | ||
| ), | ||
| ), | ||
| ); | ||
| } | ||
|
|
||
| return fixes; | ||
| }, | ||
| }); | ||
|
|
||
| break; | ||
| } | ||
|
|
||
| prevMember = member; | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.