Skip to content

Commit 4265b27

Browse files
fix: use name to sort method property (#497)
this fix potential wrong result due to comments.
1 parent b038886 commit 4265b27

File tree

2 files changed

+26
-3
lines changed

2 files changed

+26
-3
lines changed

src/rules/sortKeys.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ const generateOrderedList = (context, sort, properties) => {
5757
});
5858
const text = source.getText().slice(startIndex, beforePunctuator.range[1]);
5959

60-
return [property, text];
60+
return [property, name, text];
6161
}
6262

6363
const colonToken = source.getTokenBefore(property.value, {
@@ -123,8 +123,8 @@ const generateOrderedList = (context, sort, properties) => {
123123
});
124124
}
125125
orderedList.push(...itemGroup.map((item) => {
126-
if (item.length === 2) {
127-
return item[1];
126+
if (item.length === 3) {
127+
return item[2];
128128
}
129129

130130
return item[2] + ':' + item[3];

tests/rules/assertions/sortKeys.js

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,29 @@ export default {
557557
}
558558
`,
559559
},
560+
{
561+
code: `
562+
type FooType = {
563+
/* preserves block comment before a */
564+
a: number | string | boolean,
565+
/* preserves block comment before c */
566+
c: number,
567+
/* preserves block comment before b */
568+
b(param: string): number,
569+
}
570+
`,
571+
errors: [{message: 'Expected type annotations to be in ascending order. "b" should be before "c".'}],
572+
output: `
573+
type FooType = {
574+
/* preserves block comment before a */
575+
a: number | string | boolean,
576+
/* preserves block comment before b */
577+
b(param: string): number,
578+
/* preserves block comment before c */
579+
c: number,
580+
}
581+
`,
582+
},
560583

561584
// https://github.com/gajus/eslint-plugin-flowtype/issues/493
562585
{

0 commit comments

Comments
 (0)