Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions src/rules/sort-keys.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import { getKey, getRawKey } from "../util.js";
//-----------------------------------------------------------------------------

const hasNonWhitespace = /\S/u;
const commentTypes = new Set(["LineComment", "BlockComment"]);

/** @type {ComparatorMap} */
const comparators = {
Expand Down Expand Up @@ -79,6 +80,8 @@ const rule = {
meta: {
type: "suggestion",

fixable: "code",

defaultOptions: [
"asc",
{
Expand Down Expand Up @@ -184,6 +187,30 @@ const rule = {
return false;
}

/**
* Checks if a member has a comment before or after it.
* @param {MemberNode} member The member to check.
* @returns {boolean} True if a comment is adjacent to the member.
*/
function hasAdjacentComment(member) {
const before = sourceCode.getTokenBefore(member, {
includeComments: true,
});
Comment thread
sethamus marked this conversation as resolved.
let after = sourceCode.getTokenAfter(member, {
includeComments: true,
});

if (after.type === "Comma") {
after = sourceCode.getTokenAfter(after, {
includeComments: true,
});
}

return (
Comment thread
sethamus marked this conversation as resolved.
commentTypes.has(before.type) || commentTypes.has(after.type)
);
}

return {
Object(node) {
/** @type {MemberNode} */
Expand All @@ -200,6 +227,9 @@ const rule = {
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;
Comment thread
sethamus marked this conversation as resolved.

if (
prevMember &&
Expand All @@ -217,6 +247,25 @@ const rule = {
sensitivity,
sortName,
},
fix(fixer) {
if (
hasAdjacentComment(member) ||
hasAdjacentComment(prevMemberNode)
) {
return null;
}

return [
fixer.replaceText(
member,
sourceCode.getText(prevMemberNode),
),
fixer.replaceText(
prevMemberNode,
sourceCode.getText(member),
),
];
},
});
}

Expand Down
Loading
Loading