Skip to content

Omit tostring from template literal spans if they are strings #948

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
Dec 21, 2020
Merged

Omit tostring from template literal spans if they are strings #948

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
f486220
Omit tostring from template literal spans if they are a definite stri…
hazzard993 Dec 19, 2020
56ad42d
Add negative tests
hazzard993 Dec 19, 2020
d833b2e
Simplify and split templateLiteral tests
hazzard993 Dec 20, 2020
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
8 changes: 7 additions & 1 deletion src/transformation/visitors/template.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import * as lua from "../../LuaAST";
import { FunctionVisitor } from "../context";
import { ContextType, getDeclarationContextType } from "../utils/function-context";
import { wrapInToStringForConcat } from "../utils/lua-ast";
import { isStringType } from "../utils/typescript/types";
import { transformArguments, transformContextualCallExpression } from "./call";

// TODO: Source positions
Expand All @@ -25,7 +26,12 @@ export const transformTemplateExpression: FunctionVisitor<ts.TemplateExpression>

for (const span of node.templateSpans) {
const expression = context.transformExpression(span.expression);
parts.push(wrapInToStringForConcat(expression));
const spanType = context.checker.getTypeAtLocation(span.expression);
if (isStringType(context, spanType)) {
parts.push(expression);
} else {
parts.push(wrapInToStringForConcat(expression));
}

const text = span.literal.text;
if (text.length > 0) {
Expand Down
23 changes: 23 additions & 0 deletions test/unit/templateLiterals.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,26 @@ test.each(["func`noSelfParameter`", "obj.func`noSelfParameter`", "obj[`func`]`no
`.expectToMatchJsResult();
}
);

test.each(["number", "string | any"])("template span expect tostring for non string type (%p)", type => {
util.testFunction`
// @ts-ignore
const msg = "" as ${type};
return \`\${msg}\`;
`
.tap(builder => expect(builder.getMainLuaCodeChunk()).toContain("tostring"))
.expectToMatchJsResult();
});

test.each(["string", "'string literal type'", "string & unknown"])(
"template span expect no tostring for string-like type (%p)",
type => {
util.testFunction`
// @ts-ignore
const msg = "" as ${type};
return \`\${msg}\`;
`
.tap(builder => expect(builder.getMainLuaCodeChunk()).not.toContain("tostring"))
.expectToMatchJsResult();
}
);