microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-18 07:29:16 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

No iteration type errors during CFA (#37965)

Browse Source 
* No iteration type errors during CFA

* Add regression test
This commit is contained in:
Anders Hejlsberg
2020-04-15 10:34:07 -07:00
committed by GitHub
parent 15c3e99cbd
commit 92cd3ae299
5 changed files with 118 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/compiler/checker.ts
View File

@@ -19793,9 +19793,11 @@ namespace ts {
return getTypeOfSymbol(symbol);
}
if (isVariableDeclaration(declaration) && declaration.parent.parent.kind === SyntaxKind.ForOfStatement) {
const expressionType = getTypeOfDottedName(declaration.parent.parent.expression, /*diagnostic*/ undefined);
const statement = declaration.parent.parent;
const expressionType = getTypeOfDottedName(statement.expression, /*diagnostic*/ undefined);
if (expressionType) {
return getForOfIterationType(declaration.parent.parent, expressionType);
const use = statement.awaitModifier ? IterationUse.ForAwaitOf : IterationUse.ForOf;
return checkIteratedTypeOrElementType(use, expressionType, undefinedType, /*errorNode*/ undefined);
}
}
if (diagnostic) {
@@ -32025,19 +32027,14 @@ namespace ts {
}
function checkRightHandSideOfForOf(statement: ForOfStatement): Type {
return getForOfIterationType(statement, checkNonNullExpression(statement.expression));
}
function getForOfIterationType(statement: ForOfStatement, expressionType: Type) {
const use = statement.awaitModifier ? IterationUse.ForAwaitOf : IterationUse.ForOf;
return checkIteratedTypeOrElementType(use, expressionType, undefinedType, statement.expression);
return checkIteratedTypeOrElementType(use, checkNonNullExpression(statement.expression), undefinedType, statement.expression);
}
function checkIteratedTypeOrElementType(use: IterationUse, inputType: Type, sentType: Type, errorNode: Node | undefined): Type {
if (isTypeAny(inputType)) {
return inputType;
}
return getIteratedTypeOrElementType(use, inputType, sentType, errorNode, /*checkAssignability*/ true) || anyType;
}