microsoft/pyright
1
1
Fork 0
mirror of https://github.com/microsoft/pyright.git synced 2024-08-16 11:20:22 +03:00
Code Issues Projects Releases Wiki Activity

Fixed regression in the handling of certain __init__ methods with an explicit type annotation for self.

Browse Source
This commit is contained in:
Eric Traut 2024-06-11 13:27:02 -07:00
parent add2193101
commit d34d9ccc27
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/pyright-internal/src/analyzer/typeEvaluator.ts
View File

@ -27006,7 +27006,14 @@ export function createTypeEvaluator(
const specializedFunction = applySolvedTypeVars(memberType, typeVarContext) as FunctionType;
return FunctionType.clone(specializedFunction, stripFirstParam, baseType, getTypeVarScopeId(baseType));
// If this is a constructor method, provide the base type's TypeVar scope ID
// so any TypeVars in this type can be solved.
let baseTypeTypeVarScopeId: TypeVarScopeId | undefined;
if (FunctionType.isConstructorMethod(specializedFunction) || specializedFunction.details.name === '__init__') {
baseTypeTypeVarScopeId = getTypeVarScopeId(baseType);
}
return FunctionType.clone(specializedFunction, stripFirstParam, baseType, baseTypeTypeVarScopeId);
}
function isFinalVariable(symbol: Symbol): boolean {

5
packages/pyright-internal/src/analyzer/types.ts
View File

@ -1658,10 +1658,7 @@ export namespace FunctionType {
}
newFunction.inferredReturnType = type.inferredReturnType;
if (newFunction.preBoundFlags & FunctionTypeFlags.ConstructorMethod) {
newFunction.boundTypeVarScopeId = boundTypeVarScopeId ?? type.boundTypeVarScopeId;
}
newFunction.boundTypeVarScopeId = boundTypeVarScopeId ?? type.boundTypeVarScopeId;
return newFunction;
}