Skip to content

Infer contextual types from generic return types #29478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahejlsberg merged 15 commits into from
Feb 1, 2019
Merged

Infer contextual types from generic return types #29478

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1b4bce2
Infer contextual types from return types through generic functions
ahejlsberg Jan 17, 2019
da9feca
Accept new baselines
ahejlsberg Jan 17, 2019
bb1c91f
Remove literal freshness when contextual type is a literal type
ahejlsberg Jan 18, 2019
4163d2d
Add tests
ahejlsberg Jan 18, 2019
c809002
Accept new baselines
ahejlsberg Jan 18, 2019
0b366ce
Address CR feedback
ahejlsberg Jan 18, 2019
0b1da02
Add missing return statements (ugh)
ahejlsberg Jan 19, 2019
60e7528
No union type reductions in contextual types
ahejlsberg Jan 20, 2019
dbea08f
Accept new baselines
ahejlsberg Jan 20, 2019
cf479fc
Add regression test for #29168
ahejlsberg Jan 20, 2019
2ea0251
Accept new baselines
ahejlsberg Jan 20, 2019
7c1bb14
Merge branch 'master' into fixContextualReturnTypes
ahejlsberg Jan 26, 2019
fffd774
Merge branch 'master' into fixContextualReturnTypes
ahejlsberg Feb 1, 2019
c581575
Add breaking change repros
ahejlsberg Feb 1, 2019
42be36d
Accept new baselines
ahejlsberg Feb 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove literal freshness when contextual type is a literal type
  • Loading branch information
@ahejlsberg
ahejlsberg committed Jan 18, 2019
commit bb1c91fac6945481e0a56cebce98b855482377e4
4 changes: 3 additions & 1 deletion src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22962,7 +22962,9 @@ namespace ts {
context.contextualMapper = contextualMapper;
const checkMode = contextualMapper === identityMapper ? CheckMode.SkipContextSensitive :
contextualMapper ? CheckMode.Inferential : CheckMode.Contextual;
const result = checkExpression(node, checkMode);
const type = checkExpression(node, checkMode);
const result = maybeTypeOfKind(type, TypeFlags.Literal) && isLiteralOfContextualType(type, instantiateContextualType(contextualType, node)) ?

@weswigham weswigham Jan 18, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do you need to strip literal freshness here? Minimally that'd deserve a comment, IMO.

getRegularTypeOfLiteralType(type) : type;
context.contextualType = saveContextualType;
context.contextualMapper = saveContextualMapper;
return result;
Expand Down