Skip to content

Instantiate this for contextually typed type parameters #9746

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
sandersn merged 6 commits into from
Aug 22, 2016
Merged

Instantiate this for contextually typed type parameters #9746

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ad56220
Instantiate contextual this parameters if needed
sandersn Jul 14, 2016
78f807c
Test that contextually typed generic this parameters are instantiated
sandersn Jul 14, 2016
271ffc8
Merge branch 'master' into instantiate-this-for-contextually-typed-ty…
sandersn Aug 17, 2016
0f483d6
Assign and instantiate contextual this type if not present
sandersn Aug 17, 2016
5aafc2c
Contextually type this in getDeclFromSig, not checkThisExpr
sandersn Aug 22, 2016
fc1d6a8
Rename getContextuallyTypedThisParameter to getContextualThisParameter
sandersn Aug 22, 2016
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
Next Next commit
Instantiate contextual this parameters if needed
  • Loading branch information
@sandersn
sandersn committed Jul 14, 2016
commit ad56220c4562085b0d638d731269a7b327aeffa8
7 changes: 7 additions & 0 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4632,6 +4632,9 @@ namespace ts {

function getThisTypeOfSignature(signature: Signature): Type | undefined {
if (signature.thisParameter) {
if (signature.mapper) {
signature = instantiateSignature(signature, signature.mapper);
}
return getTypeOfSymbol(signature.thisParameter);
}
}
Expand Down Expand Up @@ -11770,6 +11773,10 @@ namespace ts {

function assignContextualParameterTypes(signature: Signature, context: Signature, mapper: TypeMapper) {
const len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
if (context.thisParameter) {
// save the mapper in case we need to type `this` later
context.mapper = mapper;
}
for (let i = 0; i < len; i++) {
const parameter = signature.parameters[i];
const contextualParameterType = getTypeAtPosition(context, i);
Expand Down