Sourcemap super call (#1322)

Perryvw · web-flow · commit 244b5687bd13 · 2022-08-03T22:38:21.000+02:00
* Fix super call source mapping

* Fixed some more missing source mappings in call expressions

* Remove stray debug
diff --git a/src/transformation/visitors/call.ts b/src/transformation/visitors/call.ts
@@ -183,7 +183,7 @@ function transformPropertyCall(
     if (calledMethod.expression.kind === ts.SyntaxKind.SuperKeyword) {
         // Super calls take the format of super.call(self,...)
         const parameters = transformArguments(context, node.arguments, signature, ts.factory.createThis());
-        return lua.createCallExpression(context.transformExpression(node.expression), parameters);
+        return lua.createCallExpression(context.transformExpression(node.expression), parameters, node);
     }
 
     const signatureDeclaration = signature?.getDeclaration();
@@ -207,7 +207,7 @@ function transformElementCall(context: TransformationContext, node: ts.CallExpre
     } else {
         // No context
         const [expression, parameters] = transformCallAndArguments(context, node.expression, node.arguments, signature);
-        return lua.createCallExpression(expression, parameters);
+        return lua.createCallExpression(expression, parameters, node);
     }
 }
 
@@ -257,7 +257,8 @@ export const transformCallExpression: FunctionVisitor<ts.CallExpression> = (node
                 context.transformExpression(ts.factory.createSuper()),
                 lua.createStringLiteral("____constructor")
             ),
-            parameters
+            parameters,
+            node
         );
     }
 
diff --git a/test/transpile/module-resolution.spec.ts b/test/transpile/module-resolution.spec.ts
@@ -583,7 +583,6 @@ test("supports complicated paths configuration", () => {
     util.testProject(projectTsConfig)
         .setMainFileName(mainFile)
         .setOptions({ luaBundle: "bundle.lua", luaBundleEntry: mainFile })
-        .debug()
         .expectToEqual({ foo: 314, bar: 271 });
 });
 

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ function transformPropertyCall(`
`183`	`183`	`if (calledMethod.expression.kind === ts.SyntaxKind.SuperKeyword) {`
`184`	`184`	`// Super calls take the format of super.call(self,...)`
`185`	`185`	`const parameters = transformArguments(context, node.arguments, signature, ts.factory.createThis());`
`186`		`- return lua.createCallExpression(context.transformExpression(node.expression), parameters);`
	`186`	`+ return lua.createCallExpression(context.transformExpression(node.expression), parameters, node);`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`const signatureDeclaration = signature?.getDeclaration();`
`@@ -207,7 +207,7 @@ function transformElementCall(context: TransformationContext, node: ts.CallExpre`
`207`	`207`	`} else {`
`208`	`208`	`// No context`
`209`	`209`	`const [expression, parameters] = transformCallAndArguments(context, node.expression, node.arguments, signature);`
`210`		`- return lua.createCallExpression(expression, parameters);`
	`210`	`+ return lua.createCallExpression(expression, parameters, node);`
`211`	`211`	`}`
`212`	`212`	`}`
`213`	`213`
`@@ -257,7 +257,8 @@ export const transformCallExpression: FunctionVisitor<ts.CallExpression> = (node`
`257`	`257`	`context.transformExpression(ts.factory.createSuper()),`
`258`	`258`	`lua.createStringLiteral("____constructor")`
`259`	`259`	`),`
`260`		`- parameters`
	`260`	`+ parameters,`
	`261`	`+ node`
`261`	`262`	`);`
`262`	`263`	`}`
`263`	`264`