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

Changed the tuple inference behavior to retain literals (as it did prior to 1.1.365) when a tuple expression is used within a generator expression. This addresses #8035. (#8036)

Browse Source
This commit is contained in:
Eric Traut 2024-05-31 17:37:06 -07:00 committed by GitHub
parent e69974cee0
commit 03ddb0917b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13810,7 +13810,7 @@ export function createTypeEvaluator(
} else if (entryNode.nodeType === ParseNodeType.ListComprehension) {
const dictEntryTypeResult = getElementTypeFromListComprehension(
entryNode,
flags,
flags | EvaluatorFlags.StripLiteralTypeForTuple,
expectedValueType,
expectedKeyType
);
@ -13950,7 +13950,11 @@ export function createTypeEvaluator(
let entryTypeResult: TypeResult;
if (entry.nodeType === ParseNodeType.ListComprehension) {
entryTypeResult = getElementTypeFromListComprehension(entry, flags, expectedEntryType);
entryTypeResult = getElementTypeFromListComprehension(
entry,
flags | EvaluatorFlags.StripLiteralTypeForTuple,
expectedEntryType
);
} else {
entryTypeResult = getTypeOfExpression(
entry,
@ -14065,7 +14069,10 @@ export function createTypeEvaluator(
let entryTypeResult: TypeResult;
if (entry.nodeType === ParseNodeType.ListComprehension && !entry.isGenerator) {
entryTypeResult = getElementTypeFromListComprehension(entry, flags);
entryTypeResult = getElementTypeFromListComprehension(
entry,
flags | EvaluatorFlags.StripLiteralTypeForTuple
);
} else {
entryTypeResult = getTypeOfExpression(entry, flags | EvaluatorFlags.StripLiteralTypeForTuple);
}
@ -14642,7 +14649,7 @@ export function createTypeEvaluator(
// Create a tuple with the key/value types.
const keyTypeResult = getTypeOfExpression(
node.expression.keyExpression,
flags | EvaluatorFlags.StripLiteralTypeForTuple,
flags,
makeInferenceContext(expectedKeyType)
);
if (keyTypeResult.isIncomplete) {
@ -14658,7 +14665,7 @@ export function createTypeEvaluator(
const valueTypeResult = getTypeOfExpression(
node.expression.valueExpression,
flags | EvaluatorFlags.StripLiteralTypeForTuple,
flags,
makeInferenceContext(expectedValueOrElementType)
);
if (valueTypeResult.isIncomplete) {
@ -14680,13 +14687,13 @@ export function createTypeEvaluator(
// The parser should have reported an error in this case because it's not allowed.
getTypeOfExpression(
node.expression.expandExpression,
flags | EvaluatorFlags.StripLiteralTypeForTuple,
flags,
makeInferenceContext(expectedValueOrElementType)
);
} else if (isExpressionNode(node)) {
const exprTypeResult = getTypeOfExpression(
node.expression as ExpressionNode,
flags | EvaluatorFlags.StripLiteralTypeForTuple,
flags,
makeInferenceContext(expectedValueOrElementType)
);
if (exprTypeResult.isIncomplete) {

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[int, int], None]")
reveal_type(v5, expected_text="AsyncGenerator[tuple[Literal[0], int], None]")
v6 = (x for x in [1, 2] if (x, await foo()))
reveal_type(v6, expected_text="AsyncGenerator[int, None]")