@zzzen/pyright-internal 1.2.0-dev.20250209 → 1.2.0-dev.20250216

package/dist/analyzer/sourceFileInfoUtils.js

@@ -9,6 +9,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isUserCode = isUserCode;
 exports.collectImportedByCells = collectImportedByCells;
+exports.collectImportedByRecursively = collectImportedByRecursively;
 exports.verifyNoCyclesInChainedFiles = verifyNoCyclesInChainedFiles;
 exports.createChainedByList = createChainedByList;
 const debug_1 = require("../common/debug");
@@ -25,9 +26,19 @@ function collectImportedByCells(program, fileInfo) {
     // `semantic tokens` or `checkers`.
     _parseAllOpenCells(program);
     const importedByCells = new Set();
-    _collectImportedByCells(fileInfo, importedByCells);
+    collectImportedByRecursively(fileInfo, importedByCells);
     return importedByCells;
 }
+function collectImportedByRecursively(fileInfo, importedBy) {
+    fileInfo.importedBy.forEach((dep) => {
+        if (importedBy.has(dep)) {
+            // Already visited.
+            return;
+        }
+        importedBy.add(dep);
+        collectImportedByRecursively(dep, importedBy);
+    });
+}
 function verifyNoCyclesInChainedFiles(program, fileInfo) {
     let nextChainedFile = fileInfo.chainedSourceFile;
     if (!nextChainedFile) {
@@ -80,14 +91,4 @@ function _parseAllOpenCells(program) {
         program.handleMemoryHighUsage();
     }
 }
-function _collectImportedByCells(fileInfo, importedByCells) {
-    fileInfo.importedBy.forEach((dep) => {
-        if (importedByCells.has(dep)) {
-            // Already visited.
-            return;
-        }
-        importedByCells.add(dep);
-        _collectImportedByCells(dep, importedByCells);
-    });
-}
 //# sourceMappingURL=sourceFileInfoUtils.js.map

package/dist/analyzer/sourceFileInfoUtils.js.map

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

package/dist/analyzer/typeEvaluator.js

@@ -2554,6 +2554,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                             sourceEntryTypes.splice(unboundedIndex, 0, typeToReplicate);
                         }
                     }
+                    if (sourceEntryTypes.length > targetTypes.length) {
+                        // Remove elements to make the count match the target count.
+                        sourceEntryTypes.splice(unboundedIndex, 1);
+                    }
                 }
                 // If there's an unpack operator in the target and we have too many source elements,
                 // combine them to assign to the unpacked target.
@@ -7500,7 +7504,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 }
                 else {
                     let tooManyPositionals = false;
-                    if (foundUnpackedListArg && argList[argIndex].argCategory === 1 /* ArgCategory.UnpackedList */) {
+                    if (argList[argIndex].argCategory === 1 /* ArgCategory.UnpackedList */) {
                         // If this is an unpacked iterable, we will conservatively assume that it
                         // might have zero iterations unless we can tell from its type that it
                         // definitely has at least one iterable value.
@@ -7512,9 +7516,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                             argType.priv.tupleTypeArgs.length > 0) {
                             tooManyPositionals = true;
                         }
-                        else {
-                            matchedUnpackedListOfUnknownLength = true;
-                        }
                     }
                     else {
                         tooManyPositionals = true;
@@ -7603,6 +7604,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     listElementType = getTypeOfIterator({ type: argType, isIncomplete: argTypeResult.isIncomplete }, 
                     /* isAsync */ false, errorNode, 
                     /* emitNotIterableError */ false)?.type;
+                    if (paramInfo.param.category === 1 /* ParamCategory.ArgsList */) {
+                        matchedUnpackedListOfUnknownLength = true;
+                    }
                 }
                 const funcArg = listElementType
                     ? {
@@ -8107,25 +8111,20 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                     const param = paramInfo.param;
                     if (param.category === 0 /* ParamCategory.Simple */ && param.name) {
                         const entry = paramMap.get(param.name);
-                        if (entry && entry.argsNeeded === 0 && entry.argsReceived === 0) {
-                            const defaultArgType = paramInfo.defaultType;
-                            if (defaultArgType &&
-                                !(0, typeUtils_1.isEllipsisType)(defaultArgType) &&
-                                (0, typeUtils_1.requiresSpecialization)(paramInfo.declaredType)) {
-                                validateArgTypeParams.push({
-                                    paramCategory: param.category,
-                                    paramType: paramInfo.type,
-                                    requiresTypeVarMatching: true,
-                                    argument: {
-                                        argCategory: 0 /* ArgCategory.Simple */,
-                                        typeResult: { type: defaultArgType },
-                                    },
-                                    isDefaultArg: true,
-                                    errorNode,
-                                    paramName: param.name,
-                                    isParamNameSynthesized: types_1.FunctionParam.isNameSynthesized(param),
-                                });
-                            }
+                        if (entry && entry.argsNeeded === 0 && entry.argsReceived === 0 && paramInfo.defaultType) {
+                            validateArgTypeParams.push({
+                                paramCategory: param.category,
+                                paramType: paramInfo.type,
+                                requiresTypeVarMatching: true,
+                                argument: {
+                                    argCategory: 0 /* ArgCategory.Simple */,
+                                    typeResult: { type: paramInfo.defaultType },
+                                },
+                                isDefaultArg: true,
+                                errorNode,
+                                paramName: param.name,
+                                isParamNameSynthesized: types_1.FunctionParam.isNameSynthesized(param),
+                            });
                         }
                     }
                 });
@@ -8200,10 +8199,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         }
         let relevance = 0;
         if (matchedUnpackedListOfUnknownLength) {
-            // Lower the relevance if we made assumptions about the length
+            // Increase the relevance if we made assumptions about the length
             // of an unpacked argument. This will favor overloads that
             // associate this case with a *args parameter.
-            relevance--;
+            relevance++;
         }
         // Special-case the builtin isinstance and issubclass functions.
         if (types_1.FunctionType.isBuiltIn(overload, ['isinstance', 'issubclass']) && validateArgTypeParams.length === 2) {
@@ -16899,13 +16898,6 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 if (!(0, typedDicts_1.assignTypedDictToTypedDict)(evaluatorInterface, destType, srcType, diag, constraints, flags, recursionCount)) {
                     return false;
                 }
-                if (types_1.ClassType.isFinal(destType) !== types_1.ClassType.isFinal(srcType)) {
-                    diag?.addMessage(localize_1.LocAddendum.typedDictFinalMismatch().format({
-                        sourceType: printType((0, typeUtils_1.convertToInstance)(srcType)),
-                        destType: printType((0, typeUtils_1.convertToInstance)(destType)),
-                    }));
-                    return false;
-                }
                 // If invariance is being enforced, the two TypedDicts must be assignable to each other.
                 if ((flags & 1 /* AssignTypeFlags.Invariant */) !== 0) {
                     return (0, typedDicts_1.assignTypedDictToTypedDict)(evaluatorInterface, srcType, destType, 
@@ -17791,7 +17783,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
                 const typeVarSignatures = [];
                 overloads.forEach((overload) => {
                     const overloadScopeId = (0, typeUtils_1.getTypeVarScopeId)(overload) ?? '';
-                    const constraintsClone = constraints?.cloneWithSignature(overloadScopeId);
+                    const constraintsClone = constraints?.cloneWithSignature([overloadScopeId]);
                     if (assignType(destType, overload, /* diag */ undefined, constraintsClone, flags, recursionCount)) {
                         filteredOverloads.push(overload);
                         if (constraintsClone) {
@@ -17950,6 +17942,10 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         if ((0, types_1.isTypeSame)(srcType, destType, {}, recursionCount)) {
             return true;
         }
+        if ((flags & 16 /* AssignTypeFlags.OverloadOverlap */) !== 0 &&
+            srcType.priv.subtypes.some((subtype) => (0, types_1.isAnyOrUnknown)(subtype))) {
+            return false;
+        }
         // Sort the subtypes so we have a deterministic order for unions.
         let sortedSrcTypes = (0, typeUtils_1.sortTypes)(srcType.priv.subtypes);
         let matchedSomeSubtypes = false;
@@ -18196,6 +18192,95 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             /* diag */ undefined, 
             /* constraints */ undefined, 0 /* AssignTypeFlags.Default */, recursionCount));
     }
+    // Determines whether the two types are potentially comparable -- i.e.
+    // their types overlap in such a way that it makes sense for them to
+    // be compared with an == or != operator.
+    function isTypeComparable(leftType, rightType) {
+        if ((0, types_1.isAnyOrUnknown)(leftType) || (0, types_1.isAnyOrUnknown)(rightType)) {
+            return true;
+        }
+        if ((0, types_1.isNever)(leftType) || (0, types_1.isNever)(rightType)) {
+            return false;
+        }
+        if ((0, types_1.isModule)(leftType) || (0, types_1.isModule)(rightType)) {
+            return (0, types_1.isTypeSame)(leftType, rightType, { ignoreConditions: true });
+        }
+        const isLeftCallable = (0, types_1.isFunction)(leftType) || (0, types_1.isOverloaded)(leftType);
+        const isRightCallable = (0, types_1.isFunction)(rightType) || (0, types_1.isOverloaded)(rightType);
+        if (isLeftCallable !== isRightCallable) {
+            return false;
+        }
+        if ((0, types_1.isInstantiableClass)(leftType) || ((0, types_1.isClassInstance)(leftType) && types_1.ClassType.isBuiltIn(leftType, 'type'))) {
+            if ((0, types_1.isInstantiableClass)(rightType) ||
+                ((0, types_1.isClassInstance)(rightType) && types_1.ClassType.isBuiltIn(rightType, 'type'))) {
+                const genericLeftType = types_1.ClassType.specialize(leftType, /* typeArgs */ undefined);
+                const genericRightType = types_1.ClassType.specialize(rightType, /* typeArgs */ undefined);
+                if (assignType(genericLeftType, genericRightType) || assignType(genericRightType, genericLeftType)) {
+                    return true;
+                }
+            }
+            // Does the class have an operator overload for eq?
+            const metaclass = leftType.shared.effectiveMetaclass;
+            if (metaclass && (0, types_1.isClass)(metaclass)) {
+                if ((0, typeUtils_1.lookUpClassMember)(metaclass, '__eq__', 4 /* MemberAccessFlags.SkipObjectBaseClass */)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        if ((0, types_1.isClassInstance)(leftType)) {
+            if ((0, types_1.isClass)(rightType)) {
+                const genericLeftType = types_1.ClassType.specialize(leftType, /* typeArgs */ undefined);
+                const genericRightType = types_1.ClassType.specialize(rightType, /* typeArgs */ undefined);
+                if (assignType(genericLeftType, genericRightType) || assignType(genericRightType, genericLeftType)) {
+                    return true;
+                }
+                // Assume that if the types are disjoint and built-in classes that they
+                // will never be comparable.
+                if (types_1.ClassType.isBuiltIn(leftType) && types_1.ClassType.isBuiltIn(rightType) && types_1.TypeBase.isInstance(rightType)) {
+                    // We need to be careful with bool and int literals because
+                    // they are comparable under certain circumstances.
+                    let boolType;
+                    let intType;
+                    if (types_1.ClassType.isBuiltIn(leftType, 'bool') && types_1.ClassType.isBuiltIn(rightType, 'int')) {
+                        boolType = leftType;
+                        intType = rightType;
+                    }
+                    else if (types_1.ClassType.isBuiltIn(rightType, 'bool') && types_1.ClassType.isBuiltIn(leftType, 'int')) {
+                        boolType = rightType;
+                        intType = leftType;
+                    }
+                    if (boolType && intType) {
+                        const intVal = intType.priv?.literalValue;
+                        if (intVal === undefined) {
+                            return true;
+                        }
+                        if (intVal !== 0 && intVal !== 1) {
+                            return false;
+                        }
+                        const boolVal = boolType.priv?.literalValue;
+                        if (boolVal === undefined) {
+                            return true;
+                        }
+                        return boolVal === (intVal === 1);
+                    }
+                    return false;
+                }
+            }
+            // Does the class have an operator overload for eq?
+            const eqMethod = (0, typeUtils_1.lookUpClassMember)(types_1.ClassType.cloneAsInstantiable(leftType), '__eq__', 4 /* MemberAccessFlags.SkipObjectBaseClass */);
+            if (eqMethod) {
+                // If this is a synthesized method for a dataclass, we can assume
+                // that other dataclass types will not be comparable.
+                if (types_1.ClassType.isDataClass(leftType) && eqMethod.symbol.getSynthesizedType()) {
+                    return false;
+                }
+                return true;
+            }
+            return false;
+        }
+        return true;
+    }
     function assignToUnionType(destType, srcType, diag, constraints, flags, recursionCount) {
         // If we need to enforce invariance, the source needs to be compatible
         // with all subtypes in the dest, unless those subtypes are subclasses
@@ -18378,17 +18463,26 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         for (const mroClass of objType.shared.mro) {
             if ((0, types_1.isClass)(mroClass) && types_1.ClassType.isProtocolClass(mroClass)) {
                 for (const field of types_1.ClassType.getSymbolTable(mroClass)) {
-                    if (field[0] !== '__call__' && !field[1].isIgnoredForProtocolMatch()) {
-                        let fieldIsPartOfFunction = false;
-                        if (prefetched?.functionClass && (0, types_1.isClass)(prefetched.functionClass)) {
-                            if (types_1.ClassType.getSymbolTable(prefetched.functionClass).has(field[0])) {
-                                fieldIsPartOfFunction = true;
-                            }
-                        }
-                        if (!fieldIsPartOfFunction) {
-                            return undefined;
+                    const fieldName = field[0];
+                    const fieldSymbol = field[1];
+                    // We're expecting a __call__ method. We will also ignore a
+                    // __slots__ definition, which is (by convention) ignored for
+                    // protocol matching.
+                    if (fieldName === '__call__' || fieldName === '__slots__') {
+                        continue;
+                    }
+                    if (fieldSymbol.isIgnoredForProtocolMatch()) {
+                        continue;
+                    }
+                    let fieldIsPartOfFunction = false;
+                    if (prefetched?.functionClass && (0, types_1.isClass)(prefetched.functionClass)) {
+                        if (types_1.ClassType.getSymbolTable(prefetched.functionClass).has(field[0])) {
+                            fieldIsPartOfFunction = true;
                         }
                     }
+                    if (!fieldIsPartOfFunction) {
+                        return undefined;
+                    }
                 }
             }
         }
@@ -18539,6 +18633,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         const destPositionalCount = destParamDetails.firstKeywordOnlyIndex ?? destParamDetails.params.length;
         const srcPositionalCount = srcParamDetails.firstKeywordOnlyIndex ?? srcParamDetails.params.length;
         const positionalsToMatch = Math.min(destPositionalCount, srcPositionalCount);
+        const skippedPosParamIndices = [];
         // Match positional parameters.
         for (let paramIndex = 0; paramIndex < positionalsToMatch; paramIndex++) {
             if (paramIndex === 0 &&
@@ -18550,6 +18645,9 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             }
             // Skip over the *args parameter since it's handled separately below.
             if (paramIndex === destParamDetails.argsIndex) {
+                if (!(0, types_1.isUnpackedTypeVarTuple)(destParamDetails.params[destParamDetails.argsIndex].type)) {
+                    skippedPosParamIndices.push(paramIndex);
+                }
                 continue;
             }
             const destParam = destParamDetails.params[paramIndex];
@@ -18642,7 +18740,12 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
             canAssign = false;
         }
         if (destPositionalCount < srcPositionalCount && !targetIncludesParamSpec) {
+            // Add any remaining positional parameter indices to the list that
+            // need to be validated.
             for (let i = destPositionalCount; i < srcPositionalCount; i++) {
+                skippedPosParamIndices.push(i);
+            }
+            for (const i of skippedPosParamIndices) {
                 // If the dest has an *args parameter, make sure it can accept the remaining
                 // positional arguments in the source.
                 if (destParamDetails.argsIndex !== undefined) {
@@ -20104,6 +20207,7 @@ function createTypeEvaluator(importLookup, evaluatorOptions, wrapWithLogger) {
         getCallSignatureInfo,
         getAbstractSymbols,
         narrowConstrainedTypeVar,
+        isTypeComparable,
         assignType,
         validateOverrideMethod,
         validateCallArgs,