From 30fafb09422b3aca881f4785d89b0536092d4952 Mon Sep 17 00:00:00 2001
From: Yusuke Tanaka <yusuktan@maguro.dev>
Date: Tue, 21 Jul 2020 02:21:19 +0900
Subject: [PATCH] fix(eslint-plugin): [adjacent-overload-signatures] fix false
 positive on call signatures and a method named `call` (#2313)

---
 .../src/rules/adjacent-overload-signatures.ts | 68 +++++++++++++------
 .../adjacent-overload-signatures.test.ts      | 12 ++++
 2 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/packages/eslint-plugin/src/rules/adjacent-overload-signatures.ts b/packages/eslint-plugin/src/rules/adjacent-overload-signatures.ts
index 7b46240c581..c7cd7be84b4 100644
--- a/packages/eslint-plugin/src/rules/adjacent-overload-signatures.ts
+++ b/packages/eslint-plugin/src/rules/adjacent-overload-signatures.ts
@@ -30,16 +30,24 @@ export default util.createRule({
   create(context) {
     const sourceCode = context.getSourceCode();
 
+    interface Method {
+      name: string;
+      static: boolean;
+      callSignature: boolean;
+    }
+
     /**
-     * Gets the name of the member being processed.
+     * Gets the name and attribute of the member being processed.
      * @param member the member being processed.
-     * @returns the name of the member or null if it's a member not relevant to the rule.
+     * @returns the name and attribute of the member or null if it's a member not relevant to the rule.
      */
-    function getMemberName(member: TSESTree.Node): string | null {
+    function getMemberMethod(member: TSESTree.Node): Method | null {
       if (!member) {
         return null;
       }
 
+      const isStatic = 'static' in member && !!member.static;
+
       switch (member.type) {
         case AST_NODE_TYPES.ExportDefaultDeclaration:
         case AST_NODE_TYPES.ExportNamedDeclaration: {
@@ -49,33 +57,55 @@ export default util.createRule({
             return null;
           }
 
-          return getMemberName(member.declaration);
+          return getMemberMethod(member.declaration);
         }
         case AST_NODE_TYPES.TSDeclareFunction:
-        case AST_NODE_TYPES.FunctionDeclaration:
-          return member.id?.name ?? null;
+        case AST_NODE_TYPES.FunctionDeclaration: {
+          const name = member.id?.name ?? null;
+          if (name === null) {
+            return null;
+          }
+          return {
+            name,
+            static: isStatic,
+            callSignature: false,
+          };
+        }
         case AST_NODE_TYPES.TSMethodSignature:
-          return util.getNameFromMember(member, sourceCode);
+          return {
+            name: util.getNameFromMember(member, sourceCode),
+            static: isStatic,
+            callSignature: false,
+          };
         case AST_NODE_TYPES.TSCallSignatureDeclaration:
-          return 'call';
+          return {
+            name: 'call',
+            static: isStatic,
+            callSignature: true,
+          };
         case AST_NODE_TYPES.TSConstructSignatureDeclaration:
-          return 'new';
+          return {
+            name: 'new',
+            static: isStatic,
+            callSignature: false,
+          };
         case AST_NODE_TYPES.MethodDefinition:
-          return util.getNameFromMember(member, sourceCode);
+          return {
+            name: util.getNameFromMember(member, sourceCode),
+            static: isStatic,
+            callSignature: false,
+          };
       }
 
       return null;
     }
 
-    interface Method {
-      name: string;
-      static: boolean;
-    }
     function isSameMethod(method1: Method, method2: Method | null): boolean {
       return (
         !!method2 &&
         method1.name === method2.name &&
-        method1.static === method2.static
+        method1.static === method2.static &&
+        method1.callSignature === method2.callSignature
       );
     }
 
@@ -104,15 +134,11 @@ export default util.createRule({
         const seenMethods: Method[] = [];
 
         members.forEach(member => {
-          const name = getMemberName(member);
-          if (name === null) {
+          const method = getMemberMethod(member);
+          if (method === null) {
             lastMethod = null;
             return;
           }
-          const method = {
-            name,
-            static: 'static' in member && !!member.static,
-          };
 
           const index = seenMethods.findIndex(seenMethod =>
             isSameMethod(method, seenMethod),
diff --git a/packages/eslint-plugin/tests/rules/adjacent-overload-signatures.test.ts b/packages/eslint-plugin/tests/rules/adjacent-overload-signatures.test.ts
index 55fea63fb11..0f034a787f7 100644
--- a/packages/eslint-plugin/tests/rules/adjacent-overload-signatures.test.ts
+++ b/packages/eslint-plugin/tests/rules/adjacent-overload-signatures.test.ts
@@ -131,6 +131,17 @@ interface Foo {
 }
     `,
     `
+interface Foo {
+  (s: string): void;
+  (n: number): void;
+  (sn: string | number): void;
+  foo(n: number): void;
+  bar(): void;
+  baz(): void;
+  call(): void;
+}
+    `,
+    `
 interface Foo {
   foo(s: string): void;
   foo(n: number): void;
@@ -534,6 +545,7 @@ interface Foo {
   (sn: string | number): void;
   bar(): void;
   baz(): void;
+  call(): void;
 }
       `,
       errors: [