From ad56220c4562085b0d638d731269a7b327aeffa8 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 14 Jul 2016 14:17:50 -0700
Subject: [PATCH] Instantiate contextual this parameters if needed

---
 src/compiler/checker.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index aea8c982a95..08ee6bf4b8a 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -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);
             }
         }
@@ -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);