@zzzen/pyright-internal 1.2.0-dev.20261018 → 1.2.0-dev.20261108

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>
@@ -3675,9 +3686,9 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
         });
     }
     // Handles some special-case assignment statements that are found
-    // within the typings.pyi file.
+    // within typing.pyi, and annotation modifiers in typing_extensions.pyi.
     _handleTypingStubAssignmentOrAnnotation(node) {
-        if (!this._fileInfo.isTypingStubFile) {
+        if (!this._fileInfo.isTypingStubFile && !this._fileInfo.isTypingExtensionsStubFile) {
             return false;
         }
         let annotationNode;
@@ -3717,9 +3728,15 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
             'LiteralString',
             'OrderedDict',
             'TypeIs',
+            'TypeForm',
+            'Required',
+            'NotRequired',
+            'ReadOnly',
         ]);
         const assignedName = assignedNameNode.d.value;
-        if (!specialTypes.has(assignedName)) {
+        if (!specialTypes.has(assignedName) ||
+            (!this._fileInfo.isTypingStubFile &&
+                !['TypeForm', 'Required', 'NotRequired', 'ReadOnly'].includes(assignedName))) {
             return false;
         }
         const specialBuiltInClassDeclaration = {