@zzzen/pyright-internal 1.2.0-dev.20261011 → 1.2.0-dev.20261101

package/dist/analyzer/binder.js

@@ -2634,20 +2634,31 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
                             allowDiscriminatedNarrowing: true,
                         });
                     }
-                    // Look for "type(X) is Y" or "type(X) is not Y".
-                    if (isOrIsNotOperator &&
-                        expression.d.leftExpr.nodeType === 9 /* ParseNodeType.Call */ &&
+                    // Look for type(X) on either side without skipping references in the other operand.
+                    let isLeftNarrowing;
+                    if (expression.d.leftExpr.nodeType === 9 /* ParseNodeType.Call */ &&
                         expression.d.leftExpr.d.leftExpr.nodeType === 38 /* ParseNodeType.Name */ &&
                         expression.d.leftExpr.d.leftExpr.d.value === 'type' &&
                         expression.d.leftExpr.d.args.length === 1 &&
                         expression.d.leftExpr.d.args[0].d.argCategory === 0 /* ArgCategory.Simple */) {
-                        return this._isNarrowingExpression(expression.d.leftExpr.d.args[0].d.valueExpr, expressionList, { ...options, isComplexExpression: true });
+                        isLeftNarrowing = this._isNarrowingExpression(expression.d.leftExpr.d.args[0].d.valueExpr, expressionList, { ...options, isComplexExpression: true });
+                    }
+                    else {
+                        isLeftNarrowing = this._isNarrowingExpression(expression.d.leftExpr, expressionList, {
+                            ...options,
+                            isComplexExpression: true,
+                            allowDiscriminatedNarrowing: true,
+                        });
+                    }
+                    // Look for "Y is type(X)", "Y is not type(X)", "Y == type(X)" or "Y != type(X)".
+                    if (expression.d.rightExpr.nodeType === 9 /* ParseNodeType.Call */ &&
+                        expression.d.rightExpr.d.leftExpr.nodeType === 38 /* ParseNodeType.Name */ &&
+                        expression.d.rightExpr.d.leftExpr.d.value === 'type' &&
+                        expression.d.rightExpr.d.args.length === 1 &&
+                        expression.d.rightExpr.d.args[0].d.argCategory === 0 /* ArgCategory.Simple */) {
+                        const isRightNarrowing = this._isNarrowingExpression(expression.d.rightExpr.d.args[0].d.valueExpr, expressionList, { ...options, isComplexExpression: true });
+                        return isLeftNarrowing || isRightNarrowing;
                     }
-                    const isLeftNarrowing = this._isNarrowingExpression(expression.d.leftExpr, expressionList, {
-                        ...options,
-                        isComplexExpression: true,
-                        allowDiscriminatedNarrowing: true,
-                    });
                     // Look for "X is Y" or "X is not Y".
                     // Look for X == <literal> or X != <literal>
                     // Look for len(X) == <literal> or len(X) != <literal>
@@ -2790,6 +2801,10 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
     _createCallFlowNode(node) {
         if (!this._isCodeUnreachable()) {
             this._addExceptTargets(this._currentFlowNode);
+            const deletionCall = ParseTreeUtils.getTypedDictKeyDeletionCall(node);
+            if (deletionCall && (0, codeFlowTypes_1.isCodeFlowSupportedForReference)(deletionCall.d.leftExpr)) {
+                this._currentScopeCodeFlowExpressions.add((0, codeFlowTypes_1.createKeyForReference)(deletionCall.d.leftExpr));
+            }
             const flowNode = {
                 flags: codeFlowTypes_1.FlowFlags.Call,
                 id: this._getUniqueFlowNodeId(),
@@ -2838,6 +2853,10 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             if (isSupportedReference) {
                 this._currentScopeCodeFlowExpressions.add((0, codeFlowTypes_1.createKeyForReference)(node));
             }
+            // Key presence changes the containing TypedDict's narrowed type.
+            if (node.nodeType === 27 /* ParseNodeType.Index */ && (0, codeFlowTypes_1.isCodeFlowSupportedForReference)(node.d.leftExpr)) {
+                this._currentScopeCodeFlowExpressions.add((0, codeFlowTypes_1.createKeyForReference)(node.d.leftExpr));
+            }
             if (unbound) {
                 flowNode.flags |= codeFlowTypes_1.FlowFlags.Unbind;
             }