Discriminate jsx contextual types same as object contextual types #27408
Conversation
|
Might fix #27211 as well? |
src/compiler/checker.ts
Outdated
| } | ||
| return contextualType; | ||
| } | ||
|
|
||
| /** | ||
| * Woah! Do you really want to use this function? |
There was a problem hiding this comment.
Pretty sure it's spelled "Whoa" @DanielRosenwasser
src/compiler/checker.ts
Outdated
| if (!(contextualType && contextualType.flags & TypeFlags.Union && isObjectLiteralExpression(node))) { | ||
| return contextualType; | ||
| } | ||
| function discriminateContextualTypeByObjectMembers(node: ObjectLiteralExpression, contextualType: UnionType) { | ||
| // Keep the below up-to-date with the work done within `isRelatedTo` by `findMatchingDiscriminantType` |
There was a problem hiding this comment.
Since this applies to two functions now, enumerate the functions.
Actually, if you can extract the core of this algorithm and call it, that would be better. I'm not sure what you can do with that hilarious use of break propLoop in there. Maybe that could become a return?
|
Looks like there is some assertion lint. |
| } | ||
| } | ||
| if (possiblyDiscriminant) { | ||
| const result = getDiscriminationResultForProperty(contextualType, discriminatingType!, prop.symbol.escapedName, match, isTypeAssignableTo); |
There was a problem hiding this comment.
You could get rid of the nullable assertion if you dropped possiblyDiscriminant and checked discriminatingType above. The no-initialiser case would need to change to discriminatingType = !!isDiscr... && trueType.
Not sure if it's worth the change. Probably?
|
@sandersn I did better; you probably wanna look again (again), since AFAIK none of your last set of comments apply anymore. |
Fixes #26004