fix(eslint-plugin): [member-ordering] also TSMethodSignature can be g…

…et/set (#9193) fix(eslint-plugin): [member-ordering] TSMethodSignature can be get/set too
typescript-eslint · Jun 1, 2024 · a9dd526 · a9dd526
1 parent 52bfb1f
commit a9dd526
Show file tree

Hide file tree

Showing 2 changed files with 75 additions and 2 deletions.
diff --git a/packages/eslint-plugin/src/rules/member-ordering.ts b/packages/eslint-plugin/src/rules/member-ordering.ts
@@ -380,9 +380,8 @@ function getNodeType(node: Member): MemberKind | null {
  switch (node.type) {
  case AST_NODE_TYPES.TSAbstractMethodDefinition:
  case AST_NODE_TYPES.MethodDefinition:
- return node.kind;
  case AST_NODE_TYPES.TSMethodSignature:
- return 'method';
+ return node.kind;
  case AST_NODE_TYPES.TSCallSignatureDeclaration:
  return 'call-signature';
  case AST_NODE_TYPES.TSConstructSignatureDeclaration:

diff --git a/packages/eslint-plugin/tests/rules/member-ordering.test.ts b/packages/eslint-plugin/tests/rules/member-ordering.test.ts
@@ -2122,6 +2122,32 @@ class Foo {
  },
  ],
  },
+ {
+ code: `
+interface Foo {
+ get x(): number;
+ y(): void;
+}
+ `,
+ options: [
+ {
+ default: ['get', 'method'],
+ },
+ ],
+ },
+ {
+ code: `
+interface Foo {
+ y(): void;
+ get x(): number;
+}
+ `,
+ options: [
+ {
+ default: ['method', 'get'],
+ },
+ ],
+ },
  ],
  invalid: [
  {
@@ -5193,6 +5219,54 @@ class Foo {
  },
  ],
  },
+ {
+ code: `
+interface Foo {
+ y(): void;
+ get x(): number;
+}
+ `,
+ options: [
+ {
+ default: ['get', 'method'],
+ },
+ ],
+ errors: [
+ {
+ messageId: 'incorrectGroupOrder',
+ data: {
+ name: 'x',
+ rank: 'method',
+ },
+ line: 4,
+ column: 3,
+ },
+ ],
+ },
+ {
+ code: `
+interface Foo {
+ get x(): number;
+ y(): void;
+}
+ `,
+ options: [
+ {
+ default: ['method', 'get'],
+ },
+ ],
+ errors: [
+ {
+ messageId: 'incorrectGroupOrder',
+ data: {
+ name: 'y',
+ rank: 'get',
+ },
+ line: 4,
+ column: 3,
+ },
+ ],
+ },
  ],
 };