Skip to content

Commit 72da472

Browse files
committed
More fixes, addressed PR comments
1 parent c428ee5 commit 72da472

File tree

4 files changed

+117
-56
lines changed

4 files changed

+117
-56
lines changed

src/LuaAST.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -892,12 +892,13 @@ export function isFunctionDefinition(statement: VariableDeclarationStatement | A
892892
}
893893

894894
export type InlineFunctionExpression = FunctionExpression & {
895-
body: { statements: [ReturnStatement]; };
895+
body: { statements: [ReturnStatement & { expressions: Expression[] }]; };
896896
};
897897

898898
export function isInlineFunctionExpression(expression: FunctionExpression) : expression is InlineFunctionExpression {
899-
return expression.body.statements !== undefined
899+
return expression.body.statements
900900
&& expression.body.statements.length === 1
901901
&& isReturnStatement(expression.body.statements[0])
902+
&& (expression.body.statements[0] as ReturnStatement).expressions !== undefined
902903
&& (expression.flags & FunctionExpressionFlags.Inline) !== 0;
903904
}

src/LuaPrinter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ export class LuaPrinter {
517517
chunks.push(" ");
518518
const returnNode: SourceChunk[] = [
519519
"return ",
520-
...this.joinChunks(", ", returnStatement.expressions!.map(e => this.printExpression(e))),
520+
...this.joinChunks(", ", returnStatement.expressions.map(e => this.printExpression(e))),
521521
];
522522
chunks.push(this.createSourceNode(returnStatement, returnNode));
523523
chunks.push(" end");

0 commit comments

Comments
 (0)