Skip to content

Commit e45334b

Browse files
Timer00Timer00
committed
run prettier
1 parent 5974b59 commit e45334b

7 files changed

Lines changed: 31 additions & 13 deletions

File tree

‎src/CompilerOptions.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export enum LuaTarget {
6464
Lua54 = "5.4",
6565
LuaJIT = "JIT",
6666
Cobalt = "CC",
67-
Cobalt52 = "CC-5.2"
67+
Cobalt52 = "CC-5.2",
6868
}
6969

7070
export enum BuildMode {

‎src/transformation/utils/diagnostics.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,12 @@ export const unsupportedRightShiftOperator = createErrorDiagnosticFactory(
8585
"Right shift operator is not supported for target Lua 5.3. Use `>>>` instead."
8686
);
8787

88-
const getLuaTargetName = (version: LuaTarget) => (version === LuaTarget.LuaJIT ? "LuaJIT" : ((version === LuaTarget.Cobalt || version === LuaTarget.Cobalt52) ? "Cobalt" : `Lua ${version}`));
88+
const getLuaTargetName = (version: LuaTarget) =>
89+
version === LuaTarget.LuaJIT
90+
? "LuaJIT"
91+
: version === LuaTarget.Cobalt || version === LuaTarget.Cobalt52
92+
? "Cobalt"
93+
: `Lua ${version}`;
8994
export const unsupportedForTarget = createErrorDiagnosticFactory(
9095
(functionality: string, version: LuaTarget) =>
9196
`${functionality} is/are not supported for target ${getLuaTargetName(version)}.`

‎src/transpilation/bundle.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,11 @@ export function getBundleResult(program: ts.Program, files: ProcessedFile[]): [t
115115
const footers: string[] = [];
116116
if (options.sourceMapTraceback) {
117117
// Generates SourceMapTraceback for the entire file
118-
footers.push(`local __TS__SourceMapTraceBack = require("${options.luaLibName ?? "lualib_bundle"}").__TS__SourceMapTraceBack\n`);
118+
footers.push(
119+
`local __TS__SourceMapTraceBack = require("${
120+
options.luaLibName ?? "lualib_bundle"
121+
}").__TS__SourceMapTraceBack\n`
122+
);
119123
footers.push(`${sourceMapTracebackBundlePlaceholder}\n`);
120124
}
121125

‎src/transpilation/resolve.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,10 @@ class ResolutionContext {
6969
public resolveImport(file: ProcessedFile, required: LuaRequire): void {
7070
// Do no resolve lualib - always use the lualib of the application entry point, not the lualib from external packages
7171
if (required.requirePath === (this.options.luaLibName ?? "lualib_bundle")) {
72-
this.resolvedFiles.set(this.options.luaLibName ?? "lualib_bundle", { fileName: this.options.luaLibName ?? "lualib_bundle", code: "" });
72+
this.resolvedFiles.set(this.options.luaLibName ?? "lualib_bundle", {
73+
fileName: this.options.luaLibName ?? "lualib_bundle",
74+
code: "",
75+
});
7376
return;
7477
}
7578

‎src/transpilation/transpiler.ts‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,16 +123,22 @@ export class Transpiler {
123123
const resolutionResult = resolveDependencies(program, files, this.emitHost, plugins);
124124
diagnostics.push(...resolutionResult.diagnostics);
125125

126-
const lualibRequired = resolutionResult.resolvedFiles.some(f => f.fileName === (options.luaLibName ?? "lualib_bundle"));
126+
const lualibRequired = resolutionResult.resolvedFiles.some(
127+
f => f.fileName === (options.luaLibName ?? "lualib_bundle")
128+
);
127129
if (lualibRequired) {
128130
// Remove lualib placeholders from resolution result
129-
resolutionResult.resolvedFiles = resolutionResult.resolvedFiles.filter(f => f.fileName !== (options.luaLibName ?? "lualib_bundle"));
131+
resolutionResult.resolvedFiles = resolutionResult.resolvedFiles.filter(
132+
f => f.fileName !== (options.luaLibName ?? "lualib_bundle")
133+
);
130134

131135
if (options.tstlVerbose) {
132136
console.log("Including lualib bundle");
133137
}
134138
// Add lualib bundle to source dir 'virtually', will be moved to correct output dir in emitPlan
135-
const fileName = normalizeSlashes(path.resolve(getSourceDir(program), (options.luaLibName ?? "lualib_bundle") + ".lua"));
139+
const fileName = normalizeSlashes(
140+
path.resolve(getSourceDir(program), (options.luaLibName ?? "lualib_bundle") + ".lua")
141+
);
136142
const code = this.getLuaLibBundleContent(options, resolutionResult.resolvedFiles);
137143
resolutionResult.resolvedFiles.unshift({ fileName, code });
138144
}

‎test/cli/parse.spec.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ describe("command line", () => {
127127
["luaTarget", "5.2", { luaTarget: tstl.LuaTarget.Lua52 }],
128128
["luaTarget", "5.3", { luaTarget: tstl.LuaTarget.Lua53 }],
129129
["luaTarget", "jit", { luaTarget: tstl.LuaTarget.LuaJIT }],
130-
["luaTarget", "cc", { luaTarget: tstl.LuaTarget.Cobalt }],
131-
["luaTarget", "cc-5.2", { luaTarget: tstl.LuaTarget.Cobalt52 }],
130+
["luaTarget", "cc", { luaTarget: tstl.LuaTarget.Cobalt }],
131+
["luaTarget", "cc-5.2", { luaTarget: tstl.LuaTarget.Cobalt52 }],
132132

133133
["luaBundle", "foo", { luaBundle: "foo" }],
134134
["luaBundleEntry", "bar", { luaBundleEntry: "bar" }],
@@ -250,8 +250,8 @@ describe("tsconfig", () => {
250250
["luaTarget", "5.3", { luaTarget: tstl.LuaTarget.Lua53 }],
251251
["luaTarget", "5.4", { luaTarget: tstl.LuaTarget.Lua54 }],
252252
["luaTarget", "jit", { luaTarget: tstl.LuaTarget.LuaJIT }],
253-
["luaTarget", "cc", { luaTarget: tstl.LuaTarget.Cobalt }],
254-
["luaTarget", "cc-5.2", { luaTarget: tstl.LuaTarget.Cobalt52 }],
253+
["luaTarget", "cc", { luaTarget: tstl.LuaTarget.Cobalt }],
254+
["luaTarget", "cc-5.2", { luaTarget: tstl.LuaTarget.Cobalt52 }],
255255

256256
["luaBundle", "foo", { luaBundle: "foo" }],
257257
["luaBundleEntry", "bar", { luaBundleEntry: "bar" }],

‎test/util.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,9 +457,9 @@ export abstract class TestBuilder {
457457
// Lua lib
458458
if (
459459
this.options.luaLibImport === tstl.LuaLibImportKind.Require ||
460-
mainFile.includes(`require("${(this.options.luaLibName ?? "lualib_bundle")}")`)
460+
mainFile.includes(`require("${this.options.luaLibName ?? "lualib_bundle"}")`)
461461
) {
462-
this.injectLuaFile(L, lua, lauxlib, (this.options.luaLibName ?? "lualib_bundle"), readLuaLib(luaTarget));
462+
this.injectLuaFile(L, lua, lauxlib, this.options.luaLibName ?? "lualib_bundle", readLuaLib(luaTarget));
463463
}
464464

465465
// Load all transpiled files into Lua's package cache

0 commit comments

Comments
 (0)