Fix call context (#1294)

GlassBricks · web-flow · commit 70b61d9ab6db · 2022-06-24T20:38:48.000+02:00
* Add tests for #1292 * Fix #1292 * Always use noImplicitSelf for node without signature declaration
diff --git a/src/transformation/visitors/call.ts b/src/transformation/visitors/call.ts
@@ -271,12 +271,9 @@ export const transformCallExpression: FunctionVisitor<ts.CallExpression> = (node
         );
     }
 
-    const signatureDeclaration = signature?.getDeclaration();
-
     let callPath: lua.Expression;
     let parameters: lua.Expression[];
-    const isContextualCall =
-        !signatureDeclaration || getDeclarationContextType(context, signatureDeclaration) !== ContextType.Void;
+    const isContextualCall = isContextualCallExpression(context, signature);
     if (!isContextualCall) {
         [callPath, parameters] = transformCallAndArguments(context, calledExpression, node.arguments, signature);
     } else {
@@ -288,8 +285,7 @@ export const transformCallExpression: FunctionVisitor<ts.CallExpression> = (node
             calledExpression,
             node.arguments,
             signature,
-            // Only pass context if noImplicitSelf is not configured
-            context.options.noImplicitSelf ? undefined : callContext
+            callContext
         );
     }
 
@@ -300,6 +296,14 @@ export const transformCallExpression: FunctionVisitor<ts.CallExpression> = (node
     return wrapResultInTable ? wrapInTable(callExpression) : callExpression;
 };
 
+function isContextualCallExpression(context: TransformationContext, signature: ts.Signature | undefined): boolean {
+    const declaration = signature?.getDeclaration();
+    if (!declaration) {
+        return !context.options.noImplicitSelf;
+    }
+    return getDeclarationContextType(context, declaration) !== ContextType.Void;
+}
+
 export function getCalledExpression(node: ts.CallExpression): ts.Expression {
     function unwrapExpression(expression: ts.Expression): ts.Expression {
         expression = ts.skipOuterExpressions(expression);
diff --git a/test/unit/functions/noImplicitSelfOption.spec.ts b/test/unit/functions/noImplicitSelfOption.spec.ts
@@ -79,3 +79,17 @@ test("generates declaration files with @noSelfInFile", () => {
         .ignoreDiagnostics([couldNotResolveRequire.code]) // no foo implementation in the project to create foo.lua
         .expectToHaveNoDiagnostics();
 });
+
+// https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1292
+test("explicit this parameter respected over noImplicitSelf", () => {
+    util.testModule`
+        function foo(this: unknown, arg: any) {
+            return {self: this, arg};
+        }
+        export const result = foo(1);
+    `
+        .setOptions({
+            noImplicitSelf: true,
+        })
+        .expectToMatchJsResult();
+});
diff --git a/test/unit/functions/noSelfAnnotation.spec.ts b/test/unit/functions/noSelfAnnotation.spec.ts
@@ -51,3 +51,14 @@ test("@noSelf on parent namespace declaration removes context argument", () => {
         MyNamespace.myMethod();
     `.expectLuaToMatchSnapshot();
 });
+
+// additional coverage for https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1292
+test("explicit this parameter respected over @noSelf", () => {
+    util.testModule`
+        /** @noSelfInFile */
+        function foo(this: unknown, arg: any) {
+            return {self: this, arg};
+        }
+        export const result = foo(1);
+    `.expectToMatchJsResult();
+});
