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

Fixed a bug that resulted in a false negative when assigning a T | None type to object | None in an invariant context. This same bug led to issues with the validation of TypeVar variance within a Protocol. This addresses https://github.com/microsoft/pylance-release/issues/4613. (#5518)

Browse Source 
Co-authored-by: Eric Traut <erictr@microsoft.com>
This commit is contained in:
Eric Traut 2023-07-16 17:42:06 -07:00 committed by GitHub
parent bfe2128ee9
commit 7fcdc92320
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20904,6 +20904,10 @@ export function createTypeEvaluator(importLookup: ImportLookup, evaluatorOptions
}
});
if (!isAssignable) {
return false;
}
// Now handle generic base classes.
destType.details.baseClasses.forEach((baseClass) => {
if (
@ -21652,42 +21656,40 @@ export function createTypeEvaluator(importLookup: ImportLookup, evaluatorOptions
}
if (isUnion(destType)) {
// If both the source and dest are unions, use assignFromUnionType which has
// special-case logic to handle this case.
if (isUnion(srcType)) {
if (
assignFromUnionType(
destType,
srcType,
/* diag */ undefined,
destTypeVarContext,
srcTypeVarContext,
originalFlags,
recursionCount
)
) {
return true;
return assignFromUnionType(
destType,
srcType,
/* diag */ undefined,
destTypeVarContext,
srcTypeVarContext,
originalFlags,
recursionCount
);
}
const clonedDestTypeVarContext = destTypeVarContext?.clone();
const clonedSrcTypeVarContext = srcTypeVarContext?.clone();
if (
assignToUnionType(
destType,
srcType,
/* diag */ undefined,
clonedDestTypeVarContext,
clonedSrcTypeVarContext,
originalFlags,
recursionCount
)
) {
if (destTypeVarContext && clonedDestTypeVarContext) {
destTypeVarContext.copyFromClone(clonedDestTypeVarContext);
}
} else {
const clonedDestTypeVarContext = destTypeVarContext?.clone();
const clonedSrcTypeVarContext = srcTypeVarContext?.clone();
if (
assignToUnionType(
destType,
srcType,
/* diag */ undefined,
clonedDestTypeVarContext,
clonedSrcTypeVarContext,
originalFlags,
recursionCount
)
) {
if (destTypeVarContext && clonedDestTypeVarContext) {
destTypeVarContext.copyFromClone(clonedDestTypeVarContext);
}
if (srcTypeVarContext && clonedSrcTypeVarContext) {
srcTypeVarContext.copyFromClone(clonedSrcTypeVarContext);
}
return true;
if (srcTypeVarContext && clonedSrcTypeVarContext) {
srcTypeVarContext.copyFromClone(clonedSrcTypeVarContext);
}
return true;
}
}
@ -22429,7 +22431,7 @@ export function createTypeEvaluator(importLookup: ImportLookup, evaluatorOptions
!isSubtypeSubsumed &&
!assignType(
destType,
concreteSubtype,
subtype,
diag?.createAddendum(),
destTypeVarContext,
srcTypeVarContext,

4
packages/pyright-internal/src/tests/samples/protocol17.py
View File

@ -97,3 +97,7 @@ class Protocol9(Protocol[_T1_co]):
class Protocol10(Protocol[_T1_co]):
def m1(self) -> type[_T1_co]:
...
class Protocol11(Protocol[_T1]):
x: _T1 | None