Skip to content

Fix exception when unwrapping parenthesised multireturn calls #1408

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 3 commits into from
Feb 25, 2023
+23 −10
Merged

Fix exception when unwrapping parenthesised multireturn calls #1408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f617bba
Fix exception when unwrapping parenthesised multireturn calls
Perryvw Feb 25, 2023
5020aa7
reorder
Perryvw Feb 25, 2023
8d1bed5
Update test/unit/language-extensions/multi.spec.ts
Perryvw Feb 25, 2023
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
22 changes: 12 additions & 10 deletions src/transformation/visitors/language-extensions/multi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
IterableExtensionKind,
} from "../../utils/language-extensions";
import { TransformationContext } from "../../context";
import { findFirstNodeAbove } from "../../utils/typescript";
import { findFirstNodeAbove, findFirstNonOuterParent } from "../../utils/typescript";

const multiReturnExtensionName = "__tstlMultiReturn";
export function isMultiReturnType(type: ts.Type): boolean {
Expand Down Expand Up @@ -58,46 +58,48 @@ export function shouldMultiReturnCallBeWrapped(context: TransformationContext, n
return false;
}

const parent = findFirstNonOuterParent(node);

// Variable declaration with destructuring
if (ts.isVariableDeclaration(node.parent) && ts.isArrayBindingPattern(node.parent.name)) {
if (ts.isVariableDeclaration(parent) && ts.isArrayBindingPattern(parent.name)) {
return false;
}

// Variable assignment with destructuring
if (
ts.isBinaryExpression(node.parent) &&
node.parent.operatorToken.kind === ts.SyntaxKind.EqualsToken &&
ts.isArrayLiteralExpression(node.parent.left)
ts.isBinaryExpression(parent) &&
parent.operatorToken.kind === ts.SyntaxKind.EqualsToken &&
ts.isArrayLiteralExpression(parent.left)
) {
return false;
}

// Spread operator
if (ts.isSpreadElement(node.parent)) {
if (ts.isSpreadElement(parent)) {
return false;
}

// Stand-alone expression
if (ts.isExpressionStatement(node.parent)) {
if (ts.isExpressionStatement(parent)) {
return false;
}

// Forwarded multi-return call
if (
(ts.isReturnStatement(node.parent) || ts.isArrowFunction(node.parent)) && // Body-less arrow func
(ts.isReturnStatement(parent) || ts.isArrowFunction(parent)) && // Body-less arrow func
isInMultiReturnFunction(context, node)
) {
return false;
}

// Element access expression 'foo()[0]' will be optimized using 'select'
if (ts.isElementAccessExpression(node.parent)) {
if (ts.isElementAccessExpression(parent)) {
return false;
}

// LuaIterable in for...of
if (
ts.isForOfStatement(node.parent) &&
ts.isForOfStatement(parent) &&
getIterableExtensionKindForNode(context, node) === IterableExtensionKind.Iterable
) {
return false;
Expand Down
11 changes: 11 additions & 0 deletions test/unit/language-extensions/multi.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,3 +327,14 @@ test("return LuaMultiReturn from catch", () => {
.withLanguageExtensions()
.expectToEqual(2);
});

// https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1404
test("LuaMultiReturn applies after casting a function (#1404)", () => {
util.testFunction`
let swap: any = (a: number, b: number) => $multi(b, a);
let [a, b] = (swap as (...args: any) => LuaMultiReturn<[number, number]>)(4, 3);
return [a, b];
`
.withLanguageExtensions()
.expectToEqual([3, 4]);
});