Fixed regression in the handling of certain __init__ methods with a…

…n explicit type annotation for `self`.
microsoft · Jun 11, 2024 · d34d9cc · d34d9cc
1 parent add2193
commit d34d9cc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/packages/pyright-internal/src/analyzer/typeEvaluator.ts b/packages/pyright-internal/src/analyzer/typeEvaluator.ts
@@ -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 {

diff --git a/packages/pyright-internal/src/analyzer/types.ts b/packages/pyright-internal/src/analyzer/types.ts
@@ -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;
     }