TypeScriptToLua
diff --git a/‎src/transformation/utils/function-context.ts‎
Lines changed: 13 additions & 0 deletions b/‎src/transformation/utils/function-context.ts‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎test/unit/functions/__snapshots__/noSelfAnnotation.spec.ts.snap‎
Lines changed: 18 additions & 0 deletions b/‎test/unit/functions/__snapshots__/noSelfAnnotation.spec.ts.snap‎
Lines changed: 18 additions & 0 deletions
diff --git a/‎test/unit/functions/noSelfAnnotation.spec.ts‎
Lines changed: 40 additions & 0 deletions b/‎test/unit/functions/noSelfAnnotation.spec.ts‎
Lines changed: 40 additions & 0 deletions
@@ -143,6 +143,19 @@ function computeDeclarationContextType(context: TransformationContext, signature
         return ContextType.NonVoid;
     }
 
+    // Call signature inside a class or interface respects @noSelf on the enclosing class/interface
+    if (ts.isCallSignatureDeclaration(signatureDeclaration)) {
+        const scopeDeclaration = findFirstNodeAbove(
+            signatureDeclaration,
+            (n): n is ts.ClassLikeDeclaration | ts.InterfaceDeclaration =>
+                ts.isClassDeclaration(n) || ts.isClassExpression(n) || ts.isInterfaceDeclaration(n)
+        );
+
+        if (scopeDeclaration !== undefined && getNodeAnnotations(scopeDeclaration).has(AnnotationKind.NoSelf)) {
+            return ContextType.Void;
+        }
+    }
+
     // When using --noImplicitSelf and the signature is defined in a file targeted by the program apply the @noSelf rule.
     const program = context.program;
     const options = program.getCompilerOptions() as CompilerOptions;
 
@@ -2,6 +2,12 @@
 
 exports[`@noSelf on declared function removes context argument 1`] = `"myFunction()"`;
 
+exports[`@noSelf on interface with call signature removes context argument 1`] = `
+"func = function()
+end
+func()"
+`;
+
 exports[`@noSelf on method inside class declaration removes context argument 1`] = `"holder.myMethod()"`;
 
 exports[`@noSelf on method inside interface declaration removes context argument 1`] = `"holder.myMethod()"`;
@@ -10,6 +16,18 @@ exports[`@noSelf on method inside namespace declaration removes context argument
 
 exports[`@noSelf on parent class declaration removes context argument 1`] = `"holder.myMethod()"`;
 
+exports[`@noSelf on parent interface applies to property with interface call-signature type 1`] = `
+"demo = {func = function()
+end}
+demo.func()"
+`;
+
+exports[`@noSelf on parent interface applies to property with type-literal call signature 1`] = `
+"demo = {func = function()
+end}
+demo.func()"
+`;
+
 exports[`@noSelf on parent interface declaration removes context argument 1`] = `"holder.myMethod()"`;
 
 exports[`@noSelf on parent namespace declaration removes context argument 1`] = `"MyNamespace.myMethod()"`;
 
@@ -65,6 +65,46 @@ test("@noSelf on static class methods with string key access", () => {
     `.expectLuaToMatchSnapshot();
 });
 
+// https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1661
+test("@noSelf on interface with call signature removes context argument", () => {
+    util.testModule`
+        /** @noSelf */
+        interface CallSignature {
+            (): void;
+        }
+        const func: CallSignature = () => {};
+        func();
+    `.expectLuaToMatchSnapshot();
+});
+
+// https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1661
+test("@noSelf on parent interface applies to property with interface call-signature type", () => {
+    util.testModule`
+        /** @noSelf */
+        interface CallSignature {
+            (): void;
+        }
+        /** @noSelf */
+        interface DemoType {
+            func: CallSignature;
+        }
+        const demo: DemoType = { func: () => {} };
+        demo.func();
+    `.expectLuaToMatchSnapshot();
+});
+
+// https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1661
+test("@noSelf on parent interface applies to property with type-literal call signature", () => {
+    util.testModule`
+        /** @noSelf */
+        interface DemoType {
+            func: { (): void };
+        }
+        const demo: DemoType = { func: () => {} };
+        demo.func();
+    `.expectLuaToMatchSnapshot();
+});
+
 // additional coverage for https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1292
 test("explicit this parameter respected over @noSelf", () => {
     util.testModule`