@zzzen/pyright-internal 1.2.0-dev.20240317 → 1.2.0-dev.20240324

package/dist/analyzer/staticExpressions.js

@@ -11,6 +11,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.evaluateStaticBoolLikeExpression = exports.evaluateStaticBoolExpression = void 0;
 const configOptions_1 = require("../common/configOptions");
+const pythonVersion_1 = require("../common/pythonVersion");
 // Returns undefined if the expression cannot be evaluated
 // statically as a bool value or true/false if it can.
 function evaluateStaticBoolExpression(node, execEnv, definedConstants, typingImportAliases, sysImportAliases) {
@@ -44,9 +45,9 @@ function evaluateStaticBoolExpression(node, execEnv, definedConstants, typingImp
             node.rightExpression.nodeType === 52 /* ParseNodeType.Tuple */) {
             // Handle the special case of "sys.version_info >= (3, x)"
             const comparisonVersion = _convertTupleToVersion(node.rightExpression);
-            return _evaluateNumericBinaryOperation(node.operator, execEnv.pythonVersion, comparisonVersion);
+            return _evaluateVersionBinaryOperation(node.operator, execEnv.pythonVersion, comparisonVersion);
         }
-        else if (node.leftExpression.nodeType === 24 /* ParseNodeType.Index */ &&
+        if (node.leftExpression.nodeType === 24 /* ParseNodeType.Index */ &&
             _isSysVersionInfoExpression(node.leftExpression.baseExpression, sysImportAliases) &&
             node.leftExpression.items.length === 1 &&
             !node.leftExpression.trailingComma &&
@@ -56,18 +57,19 @@ function evaluateStaticBoolExpression(node, execEnv, definedConstants, typingImp
             !node.leftExpression.items[0].valueExpression.isImaginary &&
             node.leftExpression.items[0].valueExpression.value === 0 &&
             node.rightExpression.nodeType === 40 /* ParseNodeType.Number */ &&
-            node.rightExpression.isInteger) {
+            node.rightExpression.isInteger &&
+            typeof node.rightExpression.value === 'number') {
             // Handle the special case of "sys.version_info[0] >= X"
-            return _evaluateNumericBinaryOperation(node.operator, Math.floor(execEnv.pythonVersion / 256), node.rightExpression.value);
+            return _evaluateVersionBinaryOperation(node.operator, new pythonVersion_1.PythonVersion(execEnv.pythonVersion.major, 0), new pythonVersion_1.PythonVersion(node.rightExpression.value, 0));
         }
-        else if (_isSysPlatformInfoExpression(node.leftExpression, sysImportAliases) &&
+        if (_isSysPlatformInfoExpression(node.leftExpression, sysImportAliases) &&
             node.rightExpression.nodeType === 48 /* ParseNodeType.StringList */) {
             // Handle the special case of "sys.platform != 'X'"
             const comparisonPlatform = node.rightExpression.strings.map((s) => s.value).join('');
             const expectedPlatformName = _getExpectedPlatformNameFromPlatform(execEnv);
             return _evaluateStringBinaryOperation(node.operator, expectedPlatformName, comparisonPlatform);
         }
-        else if (_isOsNameInfoExpression(node.leftExpression) &&
+        if (_isOsNameInfoExpression(node.leftExpression) &&
             node.rightExpression.nodeType === 48 /* ParseNodeType.StringList */) {
             // Handle the special case of "os.name == 'X'"
             const comparisonOsName = node.rightExpression.strings.map((s) => s.value).join('');
@@ -138,49 +140,69 @@ function evaluateStaticBoolLikeExpression(node, execEnv, definedConstants, typin
 }
 exports.evaluateStaticBoolLikeExpression = evaluateStaticBoolLikeExpression;
 function _convertTupleToVersion(node) {
-    let comparisonVersion;
-    // Ignore patch versions.
     if (node.expressions.length >= 2) {
         if (node.expressions[0].nodeType === 40 /* ParseNodeType.Number */ &&
             !node.expressions[0].isImaginary &&
             node.expressions[1].nodeType === 40 /* ParseNodeType.Number */ &&
             !node.expressions[1].isImaginary) {
-            const majorVersion = node.expressions[0];
-            const minorVersion = node.expressions[1];
-            if (typeof majorVersion.value === 'number' && typeof minorVersion.value === 'number') {
-                comparisonVersion = majorVersion.value * 256 + minorVersion.value;
+            const majorNode = node.expressions[0];
+            const minorNode = node.expressions[1];
+            if (typeof majorNode.value !== 'number' || typeof minorNode.value !== 'number') {
+                return undefined;
+            }
+            const major = majorNode.value;
+            const minor = minorNode.value;
+            let micro;
+            if (node.expressions.length >= 3 &&
+                node.expressions[2].nodeType === 40 /* ParseNodeType.Number */ &&
+                !node.expressions[2].isImaginary &&
+                typeof node.expressions[2].value === 'number') {
+                micro = node.expressions[2].value;
+            }
+            let releaseLevel;
+            if (node.expressions.length >= 4 &&
+                node.expressions[3].nodeType === 48 /* ParseNodeType.StringList */ &&
+                node.expressions[3].strings.length === 1 &&
+                node.expressions[3].strings[0].nodeType === 49 /* ParseNodeType.String */) {
+                releaseLevel = node.expressions[3].strings[0].value;
             }
+            let serial;
+            if (node.expressions.length >= 5 &&
+                node.expressions[4].nodeType === 40 /* ParseNodeType.Number */ &&
+                !node.expressions[4].isImaginary &&
+                typeof node.expressions[4].value === 'number') {
+                serial = node.expressions[4].value;
+            }
+            return new pythonVersion_1.PythonVersion(major, minor, micro, releaseLevel, serial);
         }
     }
     else if (node.expressions.length === 1) {
-        const majorVersion = node.expressions[0];
-        if (typeof majorVersion.value === 'number') {
-            comparisonVersion = majorVersion.value * 256;
+        const major = node.expressions[0];
+        if (typeof major.value === 'number') {
+            return new pythonVersion_1.PythonVersion(major.value, 0);
         }
     }
-    return comparisonVersion;
+    return undefined;
 }
-function _evaluateNumericBinaryOperation(operatorType, leftValue, rightValue) {
+function _evaluateVersionBinaryOperation(operatorType, leftValue, rightValue) {
     if (leftValue !== undefined && rightValue !== undefined) {
-        leftValue = BigInt(leftValue);
-        rightValue = BigInt(rightValue);
         if (operatorType === 20 /* OperatorType.LessThan */) {
-            return leftValue < rightValue;
+            return leftValue.isLessThan(rightValue);
         }
-        else if (operatorType === 21 /* OperatorType.LessThanOrEqual */) {
-            return leftValue <= rightValue;
+        if (operatorType === 21 /* OperatorType.LessThanOrEqual */) {
+            return leftValue.isLessOrEqualTo(rightValue);
         }
-        else if (operatorType === 15 /* OperatorType.GreaterThan */) {
-            return leftValue > rightValue;
+        if (operatorType === 15 /* OperatorType.GreaterThan */) {
+            return leftValue.isGreaterThan(rightValue);
         }
-        else if (operatorType === 16 /* OperatorType.GreaterThanOrEqual */) {
-            return leftValue >= rightValue;
+        if (operatorType === 16 /* OperatorType.GreaterThanOrEqual */) {
+            return leftValue.isGreaterOrEqualTo(rightValue);
         }
-        else if (operatorType === 12 /* OperatorType.Equals */) {
-            return leftValue === rightValue;
+        if (operatorType === 12 /* OperatorType.Equals */) {
+            return leftValue.isEqualTo(rightValue);
         }
-        else if (operatorType === 28 /* OperatorType.NotEquals */) {
-            return leftValue !== rightValue;
+        if (operatorType === 28 /* OperatorType.NotEquals */) {
+            return !leftValue.isEqualTo(rightValue);
         }
     }
     return undefined;

package/dist/analyzer/staticExpressions.js.map

@@ -1 +1 @@
-{"version":3,"file":"staticExpressions.js","sourceRoot":"","sources":["../../../../../src/analyzer/staticExpressions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"staticExpressions.js","sourceRoot":"","sources":["../../../../../src/analyzer/staticExpressions.ts"],"names":[],"mappings":"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"}

package/dist/analyzer/typeEvaluator.js

@@ -86,21 +86,21 @@ const types_1 = require("./types");
 // It lists the first version of Python where subscripting is
 // allowed.
 const nonSubscriptableBuiltinTypes = new Map([
-    ['asyncio.futures.Future', pythonVersion_1.PythonVersion.V3_9],
-    ['asyncio.tasks.Task', pythonVersion_1.PythonVersion.V3_9],
-    ['builtins.dict', pythonVersion_1.PythonVersion.V3_9],
-    ['builtins.frozenset', pythonVersion_1.PythonVersion.V3_9],
-    ['builtins.list', pythonVersion_1.PythonVersion.V3_9],
-    ['builtins._PathLike', pythonVersion_1.PythonVersion.V3_9],
-    ['builtins.set', pythonVersion_1.PythonVersion.V3_9],
-    ['builtins.tuple', pythonVersion_1.PythonVersion.V3_9],
-    ['collections.ChainMap', pythonVersion_1.PythonVersion.V3_9],
-    ['collections.Counter', pythonVersion_1.PythonVersion.V3_9],
-    ['collections.defaultdict', pythonVersion_1.PythonVersion.V3_9],
-    ['collections.DefaultDict', pythonVersion_1.PythonVersion.V3_9],
-    ['collections.deque', pythonVersion_1.PythonVersion.V3_9],
-    ['collections.OrderedDict', pythonVersion_1.PythonVersion.V3_9],
-    ['queue.Queue', pythonVersion_1.PythonVersion.V3_9],
+    ['asyncio.futures.Future', pythonVersion_1.pythonVersion3_9],
+    ['asyncio.tasks.Task', pythonVersion_1.pythonVersion3_9],
+    ['builtins.dict', pythonVersion_1.pythonVersion3_9],
+    ['builtins.frozenset', pythonVersion_1.pythonVersion3_9],
+    ['builtins.list', pythonVersion_1.pythonVersion3_9],
+    ['builtins._PathLike', pythonVersion_1.pythonVersion3_9],
+    ['builtins.set', pythonVersion_1.pythonVersion3_9],
+    ['builtins.tuple', pythonVersion_1.pythonVersion3_9],
+    ['collections.ChainMap', pythonVersion_1.pythonVersion3_9],
+    ['collections.Counter', pythonVersion_1.pythonVersion3_9],
+    ['collections.defaultdict', pythonVersion_1.pythonVersion3_9],
+    ['collections.DefaultDict', pythonVersion_1.pythonVersion3_9],
+    ['collections.deque', pythonVersion_1.pythonVersion3_9],
+    ['collections.OrderedDict', pythonVersion_1.pythonVersion3_9],
+    ['queue.Queue', pythonVersion_1.pythonVersion3_9],
 ]);
 // Some types that do not inherit from others are still considered
 // "compatible" based on the Python spec. These are sometimes referred
@@ -3662,7 +3662,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     if (usage.method === 'get') {
                         const getAttrSymbol = types_1.ModuleType.getField(baseType, '__getattr__');
                         if (getAttrSymbol) {
-                            const isModuleGetAttrSupported = fileInfo.executionEnvironment.pythonVersion >= pythonVersion_1.PythonVersion.V3_7 ||
+                            const isModuleGetAttrSupported = fileInfo.executionEnvironment.pythonVersion.isGreaterOrEqualTo(pythonVersion_1.pythonVersion3_7) ||
                                 getAttrSymbol.getDeclarations().some((decl) => decl.uri.hasExtension('.pyi'));
                             if (isModuleGetAttrSupported) {
                                 const getAttrTypeResult = getEffectiveTypeOfSymbolForUsage(getAttrSymbol);
@@ -4385,7 +4385,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     !baseTypeResult.type.aliasName) {
                     const minPythonVersion = nonSubscriptableBuiltinTypes.get(baseTypeResult.type.details.fullName);
                     if (minPythonVersion !== undefined &&
-                        fileInfo.executionEnvironment.pythonVersion < minPythonVersion &&
+                        fileInfo.executionEnvironment.pythonVersion.isLessThan(minPythonVersion) &&
                         !fileInfo.isStubFile) {
                         addError(localize_1.LocMessage.classNotRuntimeSubscriptable().format({
                             name: baseTypeResult.type.aliasName || baseTypeResult.type.details.name,
@@ -8696,7 +8696,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     typeVar.details.isDefaultExplicit = true;
                     const fileInfo = AnalyzerNodeInfo.getFileInfo(errorNode);
                     if (!fileInfo.isStubFile &&
-                        fileInfo.executionEnvironment.pythonVersion < pythonVersion_1.PythonVersion.V3_13 &&
+                        fileInfo.executionEnvironment.pythonVersion.isLessThan(pythonVersion_1.pythonVersion3_13) &&
                         classType.details.moduleName !== 'typing_extensions') {
                         addError(localize_1.LocMessage.typeVarDefaultIllegal(), defaultValueNode);
                     }
@@ -8796,7 +8796,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     }
                     const fileInfo = AnalyzerNodeInfo.getFileInfo(errorNode);
                     if (!fileInfo.isStubFile &&
-                        fileInfo.executionEnvironment.pythonVersion < pythonVersion_1.PythonVersion.V3_13 &&
+                        fileInfo.executionEnvironment.pythonVersion.isLessThan(pythonVersion_1.pythonVersion3_13) &&
                         classType.details.moduleName !== 'typing_extensions') {
                         addError(localize_1.LocMessage.typeVarDefaultIllegal(), expr);
                     }
@@ -8855,7 +8855,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     }
                     const fileInfo = AnalyzerNodeInfo.getFileInfo(errorNode);
                     if (!fileInfo.isStubFile &&
-                        fileInfo.executionEnvironment.pythonVersion < pythonVersion_1.PythonVersion.V3_13 &&
+                        fileInfo.executionEnvironment.pythonVersion.isLessThan(pythonVersion_1.pythonVersion3_13) &&
                         classType.details.moduleName !== 'typing_extensions') {
                         addError(localize_1.LocMessage.typeVarDefaultIllegal(), expr);
                     }
@@ -9755,7 +9755,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     }
     function inferTypeArgFromExpectedEntryType(inferenceContext, entryTypes, isNarrowable) {
         // If the expected type is Any, the resulting type becomes Any.
-        if ((0, types_1.isAnyOrUnknown)(inferenceContext.expectedType)) {
+        if ((0, types_1.isAny)(inferenceContext.expectedType)) {
             return inferenceContext.expectedType;
         }
         const typeVarContext = new typeVarContext_1.TypeVarContext((0, typeUtils_1.getTypeVarScopeId)(inferenceContext.expectedType));
@@ -11552,7 +11552,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             if (types_1.ClassType.isBuiltIn(argType, 'Protocol')) {
                                 if (!fileInfo.isStubFile &&
                                     !types_1.ClassType.isTypingExtensionClass(argType) &&
-                                    fileInfo.executionEnvironment.pythonVersion < pythonVersion_1.PythonVersion.V3_7) {
+                                    fileInfo.executionEnvironment.pythonVersion.isLessThan(pythonVersion_1.pythonVersion3_7)) {
                                     addError(localize_1.LocMessage.protocolIllegal(), arg.valueExpression);
                                 }
                                 classType.details.flags |= 16384 /* ClassTypeFlags.ProtocolClass */;
@@ -11562,7 +11562,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                             }
                             // If the class directly derives from NamedTuple (in Python 3.6 or
                             // newer), it's considered a (read-only) dataclass.
-                            if (fileInfo.executionEnvironment.pythonVersion >= pythonVersion_1.PythonVersion.V3_6) {
+                            if (fileInfo.executionEnvironment.pythonVersion.isGreaterOrEqualTo(pythonVersion_1.pythonVersion3_6)) {
                                 if (types_1.ClassType.isBuiltIn(argType, 'NamedTuple')) {
                                     classType.details.flags |=
                                         4 /* ClassTypeFlags.DataClass */ |
@@ -12249,7 +12249,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                                 const paramInfo = paramListDetails.params[paramIndex];
                                 const argParam = {
                                     paramCategory: paramInfo.param.category,
-                                    paramType: types_1.FunctionType.getEffectiveParameterType(newMethodType, paramInfo.index),
+                                    paramType: paramInfo.type,
                                     requiresTypeVarMatching: false,
                                     argument: arg,
                                     errorNode: (_b = arg.valueExpression) !== null && _b !== void 0 ? _b : errorNode,
@@ -12741,17 +12741,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
     // Callable, these type variables are "rescoped" from the function to
     // the Callable.
     function rescopeTypeVarsForCallableReturnType(returnType, functionType, typeParametersSeen) {
-        const typeVarsInReturnType = (0, typeUtils_1.getTypeVarArgumentsRecursive)(returnType);
+        const typeVarsInReturnType = (0, typeUtils_1.getTypeVarArgumentsRecursive)(returnType).filter((t) => t.scopeId === functionType.details.typeVarScopeId);
         const rescopedTypeVars = [];
         typeVarsInReturnType.forEach((typeVar) => {
             if (types_1.TypeBase.isInstantiable(typeVar)) {
                 typeVar = types_1.TypeVarType.cloneAsInstance(typeVar);
             }
-            // If this type variable isn't scoped to this function, it is probably
-            // associated with an outer scope.
-            if (typeVar.scopeId !== functionType.details.typeVarScopeId) {
-                return;
-            }
             // If this type variable was already seen in one or more input parameters,
             // don't attempt to rescope it.
             if (typeParametersSeen.some((tp) => (0, types_1.isTypeSame)((0, typeUtils_1.convertToInstance)(tp), typeVar))) {
@@ -13349,7 +13344,8 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
                     reportError = true;
                     // Handle PEP 562 support for module-level __getattr__ function,
                     // introduced in Python 3.7.
-                    if (fileInfo.executionEnvironment.pythonVersion >= pythonVersion_1.PythonVersion.V3_7 || fileInfo.isStubFile) {
+                    if (fileInfo.executionEnvironment.pythonVersion.isGreaterOrEqualTo(pythonVersion_1.pythonVersion3_7) ||
+                        fileInfo.isStubFile) {
                         const getAttrSymbol = importLookupInfo.symbolTable.get('__getattr__');
                         if (getAttrSymbol) {
                             const getAttrType = getEffectiveTypeOfSymbol(getAttrSymbol);
@@ -14155,7 +14151,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions) {
         }
         const fileInfo = AnalyzerNodeInfo.getFileInfo(errorNode);
         if (fileInfo.isStubFile ||
-            fileInfo.executionEnvironment.pythonVersion >= pythonVersion_1.PythonVersion.V3_9 ||
+            fileInfo.executionEnvironment.pythonVersion.isGreaterOrEqualTo(pythonVersion_1.pythonVersion3_9) ||
             (0, analyzerFileInfo_1.isAnnotationEvaluationPostponed)(AnalyzerNodeInfo.getFileInfo(errorNode)) ||
             (flags & 4 /* EvaluatorFlags.AllowForwardReferences */) !== 0) {
             // Handle "type" specially, since it needs to act like "Type"