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

Reversed the change for #8035. Tuple expressions used in generators will not retain literal types.

Browse Source
This commit is contained in:
Eric Traut 2024-05-31 20:45:50 -07:00
parent d5b6abad59
commit c7fbc82337
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14521,15 +14521,21 @@ export function createTypeEvaluator(
const builtInIteratorType = getTypingType(node, isAsync ? 'AsyncGenerator' : 'Generator');
const expectedEntryType = getExpectedEntryTypeForIterable(node, builtInIteratorType, inferenceContext);
const elementTypeResult = getElementTypeFromComprehension(node, flags, expectedEntryType);
const elementTypeResult = getElementTypeFromComprehension(
node,
flags | EvaluatorFlags.StripLiteralTypeForTuple,
expectedEntryType
);
if (elementTypeResult.isIncomplete) {
isIncomplete = true;
}
if (elementTypeResult.typeErrors) {
typeErrors = true;
}
let elementType = elementTypeResult.type;
let elementType = elementTypeResult.type;
if (!expectedEntryType || !containsLiteralType(expectedEntryType)) {
elementType = stripLiteralValue(elementType);
}

2
packages/pyright-internal/src/tests/samples/generator14.py
View File

@ -18,7 +18,7 @@ async def main() -> None:
reveal_type(v4, expected_text="AsyncGenerator[int, None]")
v5 = ((0, await foo()) for _ in [1, 2])
reveal_type(v5, expected_text="AsyncGenerator[tuple[Literal[0], int], None]")
reveal_type(v5, expected_text="AsyncGenerator[tuple[int, int], None]")
v6 = (x for x in [1, 2] if (x, await foo()))
reveal_type(v6, expected_text="AsyncGenerator[int, None]")