10000 Fix element access exception caused by invalid TS by Perryvw · Pull Request #1410 · TypeScriptToLua/TypeScriptToLua · GitHub
[go: up one dir, main page]

Skip to content

Fix element access exception caused by invalid TS #1410

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.

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
merged 2 commits into from
Feb 26, 2023
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
5 changes: 5 additions & 0 deletions src/transformation/utils/diagnostics.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import * as ts from "typescript";
import * as lua from "../../LuaAST";
import { LuaTarget, TypeScriptToLuaOptions } from "../../CompilerOptions";
import { createSerialDiagnosticFactory } from "../../utils";
import { AnnotationKind } from "./annotations";
Expand Down Expand Up @@ -163,3 +164,7 @@ export const invalidMethodCallExtensionUse = createErrorDiagnosticFactory(
export const invalidSpreadInCallExtension = createErrorDiagnosticFactory(
"Spread elements are not supported in call extensions."
);

export const cannotAssignToNodeOfKind = createErrorDiagnosticFactory(
(kind: lua.SyntaxKind) => `Cannot create assignment assigning to a node of type ${lua.SyntaxKind[kind]}.`
);
16 changes: 11 additions & 5 deletions src/transformation/visitors/binary-expression/assignments.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import * as ts from "typescript";
import * as lua from "../../../LuaAST";
import { cast } from "../../../utils";
import { TransformationContext } from "../../context";
import { validateAssignment } from "../../utils/assignment-validation";
import { createExportedIdentifier, getDependenciesOfSymbol, isSymbolExported } from "../../utils/export";
Expand All @@ -9,7 +8,7 @@ import { LuaLibFeature, transformLuaLibFunction } from "../../utils/lualib";
import { isArrayType, isDestructuringAssignment } from "../../utils/typescript";
import { isArrayLength, transformDestructuringAssignment } from "./destructuring-assignments";
import { isMultiReturnCall } from "../language-extensions/multi";
import { notAllowedOptionalAssignment } from "../../utils/diagnostics";
import { cannotAssignToNodeOfKind, notAllowedOptionalAssignment } from "../../utils/diagnostics";
import { transformElementAccessArgument } from "../access";
import { moveToPrecedingTemp, transformExpressionList } from "../expression-list";
import { transformInPrecedingStatementScope } from "../../utils/preceding-statements";
Expand Down Expand Up @@ -37,9 +36,16 @@ export function transformAssignmentLeftHandSideExpression(
const symbol = context.checker.getSymbolAtLocation(node);
const left = context.transformExpression(node);

return lua.isIdentifier(left) && symbol && isSymbolExported(context, symbol)
? createExportedIdentifier(context, left)
: cast(left, lua.isAssignmentLeftHandSideExpression);
if (lua.isIdentifier(left) && symbol && isSymbolExported(context, symbol)) {
return createExportedIdentifier(context, left);
}

if (lua.isAssignmentLeftHandSideExpression(left)) {
return left;
} else {
context.diagnostics.push(cannotAssignToNodeOfKind(node, left.kind));
return lua.createAnonymousIdentifier();
}
}

export function transformAssignment(
Expand Down
6 changes: 2 additions & 4 deletions test/unit/builtins/string.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -401,12 +401,10 @@ test.each(["string | undefined", "string | null", "null | string", "null | undef

// https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1406
test("string.indexOf without arguments (#1406)", () => {
// Just test we do not throw here
util.testExpression`"".indexOf()`.expectToHaveDiagnostics();
util.testExpression`"".indexOf()`.expectNoTranspileException();
});

// https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1406
test("string.repeat without arguments (#1406)", () => {
// Just test we do not throw here
util.testExpression`"".repeat()`.expectToHaveDiagnostics();
util.testExpression`"".repeat()`.expectNoTranspileException();
});
12 changes: 12 additions & 0 deletions test/unit/destructuring.spec.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { cannotAssignToNodeOfKind, invalidMultiReturnAccess } from "../../src/transformation/utils/diagnostics";
import * as util from "../util";

const allBindings = "x, y, z, rest";
Expand Down Expand Up @@ -225,3 +226,14 @@ describe("array destructuring optimization", () => {
.expectToMatchJsResult();
});
});

test("no exception from semantically invalid TS", () => {
util.testModule`
declare function testFunc(value: number): LuaMultiReturn<[number, number]>;
let [a, b] = testFunc(5) // Missing ;
[a, b] = testFunc(b) // Interpreted as testFunc(5)[a, b]
`
.withLanguageExtensions()
.disableSemanticCheck()
.expectToHaveDiagnostics([invalidMultiReturnAccess.code, cannotAssignToNodeOfKind.code]);
});
5 changes: 5 additions & 0 deletions test/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,11 @@ export abstract class TestBuilder {
return this;
}

public expectNoTranspileException(): this {
expect(() => this.getLuaResult()).not.toThrow();
return this;
}

public expectNoExecutionError(): this {
const luaResult = this.getLuaExecutionResult();
if (luaResult instanceof ExecutionError) {
Expand Down
0