Merge branch 'experimental'

Perryvw · Perryvw · commit 54839d7169a0 · 2018-02-11T16:26:32.000+01:00
diff --git a/dist/Transpiler.js b/dist/Transpiler.js
@@ -538,7 +538,8 @@ var LuaTranspiler = /** @class */ (function () {
                         return this.transpileArrayCallExpression(node);
             }
             // Include context parameter if present
-            var callPath_1 = this.transpileExpression(node.expression);
+            var expType = this.checker.getTypeAtLocation(node.expression.expression);
+            var callPath_1 = (expType && expType.symbol) ? expType.symbol.name + "." + node.expression.name.escapedText : this.transpileExpression(node.expression);
             var params_1 = this.transpileArguments(node.arguments, node.expression.expression);
             return callPath_1 + "(" + params_1 + ")";
         }
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -589,8 +589,10 @@ export class LuaTranspiler {
             }
 
             // Include context parameter if present
-            let callPath = this.transpileExpression(node.expression);
-            const params = this.transpileArguments(node.arguments, node.expression.expression);
+            const expType = this.checker.getTypeAtLocation(node.expression.expression);
+            let callPath = (expType && expType.symbol) ? `${expType.symbol.name}.${node.expression.name.escapedText}` : this.transpileExpression(node.expression);
+            let params = this.transpileArguments(node.arguments, node.expression.expression);
+            
             return `${callPath}(${params})`;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -538,7 +538,8 @@ var LuaTranspiler = /** @class */ (function () {`
`538`	`538`	`return this.transpileArrayCallExpression(node);`
`539`	`539`	`}`
`540`	`540`	`// Include context parameter if present`
`541`		`- var callPath_1 = this.transpileExpression(node.expression);`
	`541`	`+ var expType = this.checker.getTypeAtLocation(node.expression.expression);`
	`542`	`+ var callPath_1 = (expType && expType.symbol) ? expType.symbol.name + "." + node.expression.name.escapedText : this.transpileExpression(node.expression);`
`542`	`543`	`var params_1 = this.transpileArguments(node.arguments, node.expression.expression);`
`543`	`544`	`return callPath_1 + "(" + params_1 + ")";`
`544`	`545`	`}`
Original file line number	Diff line number	Diff line change
`@@ -589,8 +589,10 @@ export class LuaTranspiler {`
`589`	`589`	`}`
`590`	`590`
`591`	`591`	`// Include context parameter if present`
`592`		`- let callPath = this.transpileExpression(node.expression);`
`593`		`- const params = this.transpileArguments(node.arguments, node.expression.expression);`
	`592`	`+ const expType = this.checker.getTypeAtLocation(node.expression.expression);`
	`593`	+ let callPath = (expType && expType.symbol) ? `${expType.symbol.name}.${node.expression.name.escapedText}` : this.transpileExpression(node.expression);
	`594`	`+ let params = this.transpileArguments(node.arguments, node.expression.expression);`
	`595`	`+`
`594`	`596`	return `${callPath}(${params})`;
`595`	`597`	`}`
`596`	`598`