omril1
diff --git a/‎packages/eslint-plugin/src/rules/prefer-optional-chain.ts
Lines changed: 16 additions & 5 deletions b/‎packages/eslint-plugin/src/rules/prefer-optional-chain.ts
Lines changed: 16 additions & 5 deletions
diff --git a/‎packages/eslint-plugin/tests/rules/prefer-optional-chain.test.ts
Lines changed: 30 additions & 2 deletions b/‎packages/eslint-plugin/tests/rules/prefer-optional-chain.test.ts
Lines changed: 30 additions & 2 deletions
@@ -113,11 +113,13 @@ export default util.createRule({
       },
       [[
         'LogicalExpression[operator="||"] > UnaryExpression[operator="!"] > Identifier',
+        'LogicalExpression[operator="||"] > UnaryExpression[operator="!"] > PrivateIdentifier',
         'LogicalExpression[operator="||"] > UnaryExpression[operator="!"] > MemberExpression',
         'LogicalExpression[operator="||"] > UnaryExpression[operator="!"] > ChainExpression > MemberExpression',
       ].join(',')](
         initialIdentifierOrNotEqualsExpr:
           | TSESTree.Identifier
+          | TSESTree.PrivateIdentifier
           | TSESTree.MemberExpression,
       ): void {
         // selector guarantees this cast
@@ -425,7 +427,12 @@ export default util.createRule({
 
           /* istanbul ignore next */
           default:
-            if (![AST_NODE_TYPES.Identifier, AST_NODE_TYPES.ThisExpression].includes(node.object.type)) {
+            if (
+              ![
+                AST_NODE_TYPES.Identifier,
+                AST_NODE_TYPES.ThisExpression,
+              ].includes(node.object.type)
+            ) {
               throw new Error(
                 `Unexpected member property type: ${node.object.type}`,
               );
@@ -442,17 +449,20 @@ export default util.createRule({
 const ALLOWED_MEMBER_OBJECT_TYPES: ReadonlySet<AST_NODE_TYPES> = new Set([
   AST_NODE_TYPES.CallExpression,
   AST_NODE_TYPES.Identifier,
+  AST_NODE_TYPES.PrivateIdentifier,
   AST_NODE_TYPES.MemberExpression,
   AST_NODE_TYPES.ThisExpression,
 ]);
 const ALLOWED_COMPUTED_PROP_TYPES: ReadonlySet<AST_NODE_TYPES> = new Set([
   AST_NODE_TYPES.Identifier,
+  AST_NODE_TYPES.PrivateIdentifier,
   AST_NODE_TYPES.Literal,
   AST_NODE_TYPES.MemberExpression,
   AST_NODE_TYPES.TemplateLiteral,
 ]);
 const ALLOWED_NON_COMPUTED_PROP_TYPES: ReadonlySet<AST_NODE_TYPES> = new Set([
   AST_NODE_TYPES.Identifier,
+  AST_NODE_TYPES.PrivateIdentifier,
 ]);
 
 interface ReportIfMoreThanOneOptions {
@@ -487,18 +497,19 @@ function reportIfMoreThanOne({
         previous.right.operator
       } ${sourceCode.getText(previous.right.right)}`;
     }
+    const newText = `${
+      shouldHandleChainedAnds ? '' : '!'
+    }${optionallyChainedCode}`;
 
     context.report({
       node: previous,
       messageId: 'preferOptionalChain',
       suggest: [
         {
           messageId: 'optionalChainSuggest',
+          // For some reason the fixer either doesn't accept it or accepts and reverts? :shrug:
           fix: (fixer): TSESLint.RuleFix[] => [
-            fixer.replaceText(
-              previous,
-              `${shouldHandleChainedAnds ? '' : '!'}${optionallyChainedCode}`,
-            ),
+            fixer.replaceText(previous, newText),
           ],
         },
       ],
 
@@ -197,8 +197,6 @@ ruleTester.run('prefer-optional-chain', rule, {
     // private properties
     'this.#a && this.#b;',
     '!this.#a || !this.#b;',
-    'a.#foo && a.#foo.bar;',
-    '!a.#foo || !a.#foo.bar;',
     'a.#foo?.bar;',
     '!a.#foo?.bar;',
     // currently do not handle complex computed properties
@@ -1328,5 +1326,35 @@ foo?.bar(/* comment */a,
         },
       ],
     },
+    {
+      code: 'a.#foo && a.#foo.bar;',
+      output: 'a.#foo?.bar;',
+      errors: [
+        {
+          messageId: 'preferOptionalChain',
+          suggestions: [
+            {
+              messageId: 'optionalChainSuggest',
+              output: 'a.#foo?.bar;',
+            },
+          ],
+        },
+      ],
+    },
+    {
+      code: '!a.#foo || !a.#foo.bar;',
+      output: '!a.#foo?.bar;',
+      errors: [
+        {
+          messageId: 'preferOptionalChain',
+          suggestions: [
+            {
+              messageId: 'optionalChainSuggest',
+              output: '!a.#foo?.bar;',
+            },
+          ],
+        },
+      ],
+    },
   ],
 });