refactor: only ever handle one node per iteration

typescript-eslint · Mar 30, 2021 · cee1fb1 · cee1fb1
1 parent be72c43
commit cee1fb1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/packages/eslint-plugin/src/util/getThisExpression.ts b/packages/eslint-plugin/src/util/getThisExpression.ts
@@ -9,14 +9,12 @@ export function getThisExpression(
   while (node) {
     if (node.type === AST_NODE_TYPES.CallExpression) {
       node = node.callee;
-    }
-
-    if (node.type === AST_NODE_TYPES.ThisExpression) {
+    } else if (node.type === AST_NODE_TYPES.ThisExpression) {
       return node;
-    }
-
-    if ('object' in node) {
+    } else if (node.type === AST_NODE_TYPES.MemberExpression) {
       node = node.object;
+    } else if (node.type === AST_NODE_TYPES.ChainExpression) {
+      node = node.expression;
     } else {
       break;
     }

diff --git a/packages/eslint-plugin/tests/rules/no-unsafe-member-access.test.ts b/packages/eslint-plugin/tests/rules/no-unsafe-member-access.test.ts
@@ -215,6 +215,9 @@ const methods = {
   methodC() {
     return true
   },
+  methodD() {
+    return (this?.methodA)?.()
+  }
 };
       `,
       errors: [
@@ -230,6 +233,12 @@ const methods = {
           column: 12,
           endColumn: 31,
         },
+        {
+          messageId: 'unsafeThisMemberExpression',
+          line: 14,
+          column: 13,
+          endColumn: 26,
+        },
       ],
     },
   ],