Skip to content

Fix incorrect context passing when super is used in contextual call #1587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Perryvw merged 1 commit into from
Sep 21, 2024
Merged

Fix incorrect context passing when super is used in contextual call #1587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions src/transformation/visitors/optional-chaining.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,19 @@ export function transformOptionalChainWithCapture(
return result;
}
);

// handle super calls by passing self as context
function getLeftMostChainItem(node: ts.Node): ts.Node {
if (ts.isPropertyAccessExpression(node)) {
return getLeftMostChainItem(node.expression);
} else {
return node;
}
}
if (getLeftMostChainItem(tsLeftExpression).kind === ts.SyntaxKind.SuperKeyword) {
capturedThisValue = lua.createIdentifier("self");
}

// handle context
if (rightContextualCall) {
if (capturedThisValue) {
Expand Down
19 changes: 19 additions & 0 deletions test/unit/optionalChaining.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,3 +438,22 @@ describe("Non-null chain", () => {
`.expectToMatchJsResult();
});
});

// https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1585
test("optional chaining of super call (#1585)", () => {
util.testFunction`
class Parent {
private name = "foo";
M2() { return this.name; }
}

class Child extends Parent {
M2() {
return super.M2?.();
}
}

const c = new Child();
return c.M2();
`.expectToMatchJsResult();
});