Skip to content

Incremental compilation in watch mode #488

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 7 commits into from
Mar 21, 2019
Merged

Incremental compilation in watch mode #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3565520
emit only affected files
TheLartians Mar 18, 2019
7e53123
track transpiler errors
TheLartians Mar 18, 2019
e438197
return 0 for success
TheLartians Mar 18, 2019
0f24858
return 0 for declarations
TheLartians Mar 18, 2019
18e69b7
do a full recompile after transpiler error
TheLartians Mar 19, 2019
0aefd1d
forgot about lazy evaluation
TheLartians Mar 19, 2019
7051b14
test if affected file is a SourceFile
TheLartians Mar 21, 2019
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
26 changes: 25 additions & 1 deletion src/Compiler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,34 @@ export function watchWithOptions(fileNames: string[], options: CompilerOptions):
host = ts.createWatchCompilerHost(fileNames, options, ts.sys, ts.createSemanticDiagnosticsBuilderProgram);
}

let fullRecompile = true;
host.afterProgramCreate = program => {
const transpiler = new LuaTranspiler(program.getProgram());
let status = transpiler.reportErrors();

if (status === 0) {
if (fullRecompile) {
status = transpiler.emitFilesAndReportErrors();
} else {
while (true) {
const currentFile = program.getSemanticDiagnosticsOfNextAffectedFile();
if (!currentFile) { break; }

if ("fileName" in currentFile.affected) { // test if currentFile.affected is `ts.SourceFile`
const fileStatus = transpiler.emitSourceFile(currentFile.affected);
status |= fileStatus;
} else {
for (const sourceFile of currentFile.affected.getSourceFiles()) {
const fileStatus = transpiler.emitSourceFile(sourceFile);
status |= fileStatus;
}
}
}
}
// do a full recompile after transpiler error.
fullRecompile = status !== 0;
}

const status = transpiler.emitFilesAndReportErrors();
const errorDiagnostic: ts.Diagnostic = {
category: undefined,
code: 6194,
Expand Down
18 changes: 11 additions & 7 deletions src/LuaTranspiler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export class LuaTranspiler {
return options;
}

private reportErrors(): number {
public reportErrors(): number {
// Get all diagnostics, ignore unsupported extension
const diagnostics = ts.getPreEmitDiagnostics(this.program).filter(diag => diag.code !== 6054);
diagnostics.forEach(diag => this.reportDiagnostic(diag));
Expand All @@ -65,13 +65,15 @@ export class LuaTranspiler {
}

public emitFilesAndReportErrors(): number {
const error = this.reportErrors();
if (error > 0) {
return error;
let status = this.reportErrors();

if (status > 0) {
return status;
}

this.program.getSourceFiles().forEach(sourceFile => {
this.emitSourceFile(sourceFile);
const sourceStatus = this.emitSourceFile(sourceFile);
status |= sourceStatus;
});

// Copy lualib to target dir
Expand All @@ -81,10 +83,10 @@ export class LuaTranspiler {
this.emitLuaLib();
}

return 0;
return status;
}

public emitSourceFile(sourceFile: ts.SourceFile): void {
public emitSourceFile(sourceFile: ts.SourceFile): number {
if (!sourceFile.isDeclarationFile) {
try {
const rootDir = this.options.rootDir;
Expand Down Expand Up @@ -119,11 +121,13 @@ export class LuaTranspiler {
// Graciously handle transpilation errors
console.error("Encountered error parsing file: " + exception.message);
console.error(`${sourceFile.fileName} (${1 + pos.line},${pos.character})\n${exception.stack}`);
return 1;

@Perryvw Perryvw Mar 19, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be nice to make these constants or an enum.

@TheLartians TheLartians Mar 19, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, though we should probably discuss error codes and general error handling of tstl in a separate PR.

} else {
throw exception;
}
}
}
return 0;
}

public transpileSourceFile(sourceFile: ts.SourceFile): string {
Expand Down