Fix 'this' confusion when inferring generic calls (#913)

dcodeIO · web-flow · commit 4f13a737c2d3 · 2019-10-16T18:21:31.000+02:00
diff --git a/src/compiler.ts b/src/compiler.ts
@@ -5830,6 +5830,7 @@ export class Compiler extends DiagnosticEmitter {
         }
 
         let instance: Function | null = null;
+        let thisExpression = this.resolver.currentThisExpression;
 
         // resolve generic call if type arguments have been provided
         if (typeArguments) {
@@ -5917,7 +5918,7 @@ export class Compiler extends DiagnosticEmitter {
         // compile 'this' expression if an instance method
         let thisExpr: ExpressionRef = 0;
         if (instance.is(CommonFlags.INSTANCE)) {
-          thisExpr = this.compileExpression(assert(this.resolver.currentThisExpression), this.options.usizeType);
+          thisExpr = this.compileExpression(assert(thisExpression), this.options.usizeType);
         }
 
         return this.compileCallDirect(

Original file line number	Diff line number	Diff line change
`@@ -5830,6 +5830,7 @@ export class Compiler extends DiagnosticEmitter {`
`5830`	`5830`	`}`
`5831`	`5831`
`5832`	`5832`	`let instance: Function \| null = null;`
	`5833`	`+ let thisExpression = this.resolver.currentThisExpression;`
`5833`	`5834`
`5834`	`5835`	`// resolve generic call if type arguments have been provided`
`5835`	`5836`	`if (typeArguments) {`
`@@ -5917,7 +5918,7 @@ export class Compiler extends DiagnosticEmitter {`
`5917`	`5918`	`// compile 'this' expression if an instance method`
`5918`	`5919`	`let thisExpr: ExpressionRef = 0;`
`5919`	`5920`	`if (instance.is(CommonFlags.INSTANCE)) {`
`5920`		`- thisExpr = this.compileExpression(assert(this.resolver.currentThisExpression), this.options.usizeType);`
	`5921`	`+ thisExpr = this.compileExpression(assert(thisExpression), this.options.usizeType);`
`5921`	`5922`	`}`
`5922`	`5923`
`5923`	`5924`	`return this.compileCallDirect(`