Skip to content

Changed handling of Self within a protocol. #10212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
erictraut wants to merge 2 commits into from
Closed

Changed handling of Self within a protocol. #10212

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f3030d
Changed handling of `Self` within a protocol.
erictraut Mar 30, 2025
87c33b1
Merge branch 'main' into TestProtocolSelf
erictraut Mar 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 14 additions & 19 deletions packages/pyright-internal/src/analyzer/protocols.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,25 +364,25 @@ function assignToProtocolInternal(
const protocolConstraints = createProtocolConstraints(evaluator, destType, constraints);
const selfSolution = new ConstraintSolution();

let selfType: ClassType | TypeVarType | undefined;
let srcSelfType: ClassType | TypeVarType | undefined;
if (isClass(srcType)) {
// If the srcType is conditioned on "self", use "Self" as the selfType.
// Otherwise use the class type for selfType.
const synthCond = srcType.props?.condition?.find((c) => TypeVarType.isSelf(c.typeVar));
if (synthCond) {
selfType = synthesizeTypeVarForSelfCls(
srcSelfType = synthesizeTypeVarForSelfCls(
TypeBase.cloneForCondition(srcType, undefined),
/* isClsType */ false
);

if (TypeVarType.isBound(synthCond.typeVar)) {
selfType = TypeVarType.cloneAsBound(selfType);
srcSelfType = TypeVarType.cloneAsBound(srcSelfType);
}
} else {
selfType = srcType;
srcSelfType = srcType;
}

addSolutionForSelfType(selfSolution, destType, selfType);
addSolutionForSelfType(selfSolution, destType, srcSelfType);
}

// If the source is a TypedDict, use the _TypedDict placeholder class
Expand Down Expand Up @@ -479,17 +479,12 @@ function assignToProtocolInternal(

srcSymbol = srcMemberInfo.symbol;

// Partially specialize the type of the symbol based on the MRO class.
// We can skip this if it's the dest class because it is already
// specialized.
if (!ClassType.isSameGenericClass(mroClass, destType)) {
destMemberType = partiallySpecializeType(
destMemberType,
mroClass,
evaluator.getTypeClassType(),
selfType
);
}
destMemberType = partiallySpecializeType(
destMemberType,
mroClass,
evaluator.getTypeClassType(),
destType
);

if (isInstantiableClass(srcMemberInfo.classType)) {
const symbolType = evaluator.getEffectiveTypeOfSymbol(srcMemberInfo.symbol);
Expand All @@ -503,7 +498,7 @@ function assignToProtocolInternal(
symbolType,
srcMemberInfo.classType,
evaluator.getTypeClassType(),
selfType
srcSelfType
);
} else {
srcMemberType = UnknownType.create();
Expand Down Expand Up @@ -535,7 +530,7 @@ function assignToProtocolInternal(
srcMemberType,
isMemberFromMetaclass ? undefined : (srcMemberInfo.classType as ClassType),
/* treatConstructorAsClassMethod */ undefined,
isMemberFromMetaclass ? srcType : selfType,
isMemberFromMetaclass ? srcType : srcSelfType,
diag?.createAddendum(),
recursionCount
);
Expand Down Expand Up @@ -584,7 +579,7 @@ function assignToProtocolInternal(
destMemberType,
isMemberFromMetaclass ? undefined : (srcMemberInfo.classType as ClassType),
/* treatConstructorAsClassMethod */ undefined,
isMemberFromMetaclass ? srcType : selfType,
isMemberFromMetaclass ? srcType : srcSelfType,
diag,
recursionCount
);
Expand Down