Skip to content

Fix synthetic transformer nodes throwing on getChildren when transforming switch statements #1465

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
Jul 5, 2023
Merged

Fix synthetic transformer nodes throwing on getChildren when transforming switch statements #1465

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
12 changes: 9 additions & 3 deletions src/transformation/visitors/switch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,16 @@ const containsBreakOrReturn = (nodes: Iterable<ts.Node>): boolean => {
for (const s of nodes) {
if (ts.isBreakStatement(s) || ts.isReturnStatement(s)) {
return true;
} else if (ts.isBlock(s) && containsBreakOrReturn(s.getChildren())) {
return true;
} else if (s.kind === ts.SyntaxKind.SyntaxList && containsBreakOrReturn(s.getChildren())) {
} else if (ts.isBlock(s) && containsBreakOrReturn(s.statements)) {
return true;
} else if (s.kind === ts.SyntaxKind.SyntaxList) {
// We cannot use getChildren() because that breaks when using synthetic nodes from transformers
// So get children the long way
const children: ts.Node[] = [];
ts.forEachChild(s, c => children.push(c));
if (containsBreakOrReturn(children)) {
return true;
}
}
}

Expand Down
19 changes: 19 additions & 0 deletions test/transpile/transformers/transformers.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,22 @@ describe("factory types", () => {
.expectToEqual(true);
});
});

// https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1464
test("transformer with switch does not break (#1464)", () => {
util.testFunction`
const foo: number = 3;
switch (foo) {
case 2: {
return 10;
}
case 3: {
return false;
}
}
`
.setOptions({
plugins: [{ transform: path.join(__dirname, "fixtures.ts"), import: "program", value: true }],
})
.expectToEqual(true);
});