Skip to content

Commit d651aae

Browse files
formatting
1 parent 7ccba2c commit d651aae

File tree

1 file changed

+9
-15
lines changed

1 file changed

+9
-15
lines changed

src/rules/sort-keys.js

+9-15
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ export default {
9090
const sensitivity = caseSensitive ? "sensitive" : "insensitive";
9191
const isValidOrder = comparators[direction][sortName][sensitivity];
9292

93-
const commentLineRanges = new Set();
93+
const commentLines = new Set();
9494
for (const comment of context.sourceCode.comments) {
95-
commentLineRanges.add(
95+
commentLines.add(
9696
`${comment.loc.start.line}:${comment.loc.end.line}`,
9797
);
9898
}
@@ -113,21 +113,15 @@ export default {
113113
const prevLine = prevMember?.loc.end.line;
114114
const thisLine = member.loc.start.line;
115115

116-
const membersAreJoinedByComment =
117-
commentLineRanges.has(`${prevLine}:${thisLine}`) ||
118-
commentLineRanges.has(
119-
`${prevLine + 1}:${thisLine}`,
120-
) ||
121-
commentLineRanges.has(
122-
`${prevLine}:${thisLine - 1}`,
123-
) ||
124-
commentLineRanges.has(
125-
`${prevLine + 1}:${thisLine - 1}`,
126-
);
116+
const membersAreAdjacent =
117+
thisLine - prevLine < 2 ||
118+
commentLines.has(`${prevLine}:${thisLine}`) ||
119+
commentLines.has(`${prevLine + 1}:${thisLine}`) ||
120+
commentLines.has(`${prevLine}:${thisLine - 1}`) ||
121+
commentLines.has(`${prevLine + 1}:${thisLine - 1}`);
127122

128123
if (
129-
(thisLine - prevLine < 2 ||
130-
membersAreJoinedByComment) &&
124+
membersAreAdjacent &&
131125
isValidOrder(prevName, thisName) === false
132126
) {
133127
context.report({

0 commit comments

Comments
 (0)