fix(eslint-plugin): improve safeuse check

typescript-eslint · Feb 8, 2021 · 1a24d0c · 1a24d0c
1 parent c047e51
commit 1a24d0c
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 11 deletions.
diff --git a/packages/eslint-plugin/src/rules/unbound-method.ts b/packages/eslint-plugin/src/rules/unbound-method.ts
@@ -309,7 +309,9 @@ function isSafeUse(node: TSESTree.Node): boolean {
         parent.operator === '=' &&
         (node === parent.left ||
           (node.type === AST_NODE_TYPES.MemberExpression &&
-            node.object.type === AST_NODE_TYPES.Super))
+            node.object.type === AST_NODE_TYPES.Super &&
+            parent.left.type === AST_NODE_TYPES.MemberExpression &&
+            parent.left.object.type === AST_NODE_TYPES.ThisExpression))
       );
 
     case AST_NODE_TYPES.ChainExpression:

diff --git a/packages/eslint-plugin/tests/rules/unbound-method.test.ts b/packages/eslint-plugin/tests/rules/unbound-method.test.ts
@@ -269,9 +269,7 @@ const { bound } = new Foo();
     `
 class BaseClass {
   x: number = 42;
-  logThis() {
-    console.log('x is ');
-  }
+  logThis() {}
 }
 class OtherClass extends BaseClass {
   superLogThis: any;
@@ -551,26 +549,44 @@ const { log } = console;
     {
       code: `
 class BaseClass {
-  x: number = 42;
-  logThis() {
-    console.log('x is ');
-  }
+  logThis() {}
 }
 class OtherClass extends BaseClass {
-  superLogThis: any;
   constructor() {
     super();
-    const x = super.logThis; // ERROR - unbound method
+    const x = super.logThis;
   }
 }
       `,
       errors: [
         {
-          line: 12,
+          line: 8,
           column: 15,
           messageId: 'unbound',
         },
       ],
     },
+    // https://github.com/typescript-eslint/typescript-eslint/issues/1866
+    {
+      code: `
+class BaseClass {
+  logThis() {}
+}
+class OtherClass extends BaseClass {
+  constructor() {
+    super();
+    let x;
+    x = super.logThis;
+  }
+}
+      `,
+      errors: [
+        {
+          line: 9,
+          column: 9,
+          messageId: 'unbound',
+        },
+      ],
+    },
   ],
 });