Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/transformation/utils/function-context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ function computeDeclarationContextType(context: TransformationContext, signature
ts.isConstructSignatureDeclaration(signatureDeclaration) ||
ts.isConstructorDeclaration(signatureDeclaration) ||
(signatureDeclaration.parent && ts.isPropertyDeclaration(signatureDeclaration.parent)) ||
(signatureDeclaration.parent && ts.isPropertySignature(signatureDeclaration.parent))
(signatureDeclaration.parent && ts.isPropertySignature(signatureDeclaration.parent)) ||
(signatureDeclaration.parent && ts.isIndexSignatureDeclaration(signatureDeclaration.parent))
) {
// Class/interface methods only respect @noSelf on their parent
const scopeDeclaration = findFirstNodeAbove(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,8 @@ exports[`@noSelf on parent class declaration removes context argument 1`] = `"ho
exports[`@noSelf on parent interface declaration removes context argument 1`] = `"holder.myMethod()"`;

exports[`@noSelf on parent namespace declaration removes context argument 1`] = `"MyNamespace.myMethod()"`;

exports[`@noSelf on static class methods with string key access 1`] = `
"TestClass.myMethod()
TestClass.myKey()"
`;
13 changes: 13 additions & 0 deletions test/unit/functions/noSelfAnnotation.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,19 @@ test("@noSelf on parent namespace declaration removes context argument", () => {
`.expectLuaToMatchSnapshot();
});

test("@noSelf on static class methods with string key access", () => {
util.testModule`
/** @noSelf */
declare class TestClass {
static [key: string]: () => void;
static myMethod(): void;
}

TestClass.myMethod();
TestClass.myKey();
`.expectLuaToMatchSnapshot();
});

// additional coverage for https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1292
test("explicit this parameter respected over @noSelf", () => {
util.testModule`
Expand Down
Loading