From c40dd13df76b77052c85254622df5533307dc07e Mon Sep 17 00:00:00 2001
From: Evgeny Stepanovych <undsoft@gmail.com>
Date: Mon, 4 Oct 2021 00:52:15 +0300
Subject: [PATCH] fix(eslint-plugin): [no-confusing-void-expression] support
 optional chaining (#3937)

---
 .../src/rules/no-confusing-void-expression.ts |  5 +++++
 .../no-confusing-void-expression.test.ts      | 19 +++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/packages/eslint-plugin/src/rules/no-confusing-void-expression.ts b/packages/eslint-plugin/src/rules/no-confusing-void-expression.ts
index fd4e97e7360..0579fb44254 100644
--- a/packages/eslint-plugin/src/rules/no-confusing-void-expression.ts
+++ b/packages/eslint-plugin/src/rules/no-confusing-void-expression.ts
@@ -268,6 +268,11 @@ export default util.createRule<Options, MessageId>({
         }
       }
 
+      if (parent.type === AST_NODE_TYPES.ChainExpression) {
+        // e.g. `console?.log('foo')`
+        return findInvalidAncestor(parent);
+      }
+
       // any other parent is invalid
       return parent;
     }
diff --git a/packages/eslint-plugin/tests/rules/no-confusing-void-expression.test.ts b/packages/eslint-plugin/tests/rules/no-confusing-void-expression.test.ts
index 3586c3388f4..e0bdd183a0e 100644
--- a/packages/eslint-plugin/tests/rules/no-confusing-void-expression.test.ts
+++ b/packages/eslint-plugin/tests/rules/no-confusing-void-expression.test.ts
@@ -27,6 +27,7 @@ ruleTester.run('no-confusing-void-expression', rule, {
         foo && console.log(foo);
         foo || console.log(foo);
         foo ? console.log(true) : console.log(false);
+        console?.log('foo');
       `,
     }),
 
@@ -61,6 +62,7 @@ ruleTester.run('no-confusing-void-expression', rule, {
     ...batchedSingleLineTests<MessageId, Options>({
       code: `
         const x = console.log('foo');
+        const x = console?.log('foo');
         console.error(console.log('foo'));
         [console.log('foo')];
         ({ x: console.log('foo') });
@@ -72,14 +74,15 @@ ruleTester.run('no-confusing-void-expression', rule, {
       `,
       errors: [
         { line: 2, column: 11, messageId: 'invalidVoidExpr' },
-        { line: 3, column: 23, messageId: 'invalidVoidExpr' },
-        { line: 4, column: 10, messageId: 'invalidVoidExpr' },
-        { line: 5, column: 15, messageId: 'invalidVoidExpr' },
-        { line: 6, column: 14, messageId: 'invalidVoidExpr' },
-        { line: 7, column: 9, messageId: 'invalidVoidExpr' },
-        { line: 8, column: 10, messageId: 'invalidVoidExpr' },
-        { line: 9, column: 18, messageId: 'invalidVoidExpr' },
-        { line: 10, column: 10, messageId: 'invalidVoidExpr' },
+        { line: 3, column: 19, messageId: 'invalidVoidExpr' },
+        { line: 4, column: 23, messageId: 'invalidVoidExpr' },
+        { line: 5, column: 10, messageId: 'invalidVoidExpr' },
+        { line: 6, column: 15, messageId: 'invalidVoidExpr' },
+        { line: 7, column: 14, messageId: 'invalidVoidExpr' },
+        { line: 8, column: 9, messageId: 'invalidVoidExpr' },
+        { line: 9, column: 10, messageId: 'invalidVoidExpr' },
+        { line: 10, column: 18, messageId: 'invalidVoidExpr' },
+        { line: 11, column: 10, messageId: 'invalidVoidExpr' },
       ],
     }),