microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-06 02:33:53 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Simplify the code for actually compiling within tsc.

Browse Source
This commit is contained in:
Cyrus Najmabadi 2015-02-04 22:26:03 -08:00
parent 28c1a23e7c
commit de30866460
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/compiler/tsc.ts
View File

@ -328,28 +328,11 @@ module ts {
ts.emitTime = 0;
var start = new Date().getTime();
var program = createProgram(fileNames, compilerOptions, compilerHost);
var errors: Diagnostic[] = program.getDiagnostics();
var exitStatus: EmitReturnStatus;
if (errors.length) {
exitStatus = EmitReturnStatus.AllOutputGenerationSkipped;
}
else {
errors = program.getTypeCheckerDiagnostics();
if (compilerOptions.noEmit) {
exitStatus = EmitReturnStatus.Succeeded;
}
else {
var emitOutput = program.emit();
exitStatus = emitOutput.emitResultStatus;
errors = concatenate(errors, emitOutput.diagnostics);
}
}
var exitStatus = compileProgram();
var end = start - new Date().getTime();
reportDiagnostics(errors);
if (compilerOptions.listFiles) {
forEach(program.getSourceFiles(), file => {
@ -378,6 +361,29 @@ module ts {
}
return { program, exitStatus };
function compileProgram(): EmitReturnStatus {
// First get any syntactic errors.
var errors = program.getDiagnostics();
reportDiagnostics(errors);
// If we didn't have any syntactic errors, then also try getting the semantic errors.
if (errors.length === 0) {
var errors = program.getTypeCheckerDiagnostics();
reportDiagnostics(errors);
}
// If the user doesn't want us to emit, then we're done at this point.
if (compilerOptions.noEmit) {
return EmitReturnStatus.Succeeded;
}
// Otherwise, emit and report any errors we ran into.
var emitOutput = program.emit();
reportDiagnostics(emitOutput.diagnostics);
return emitOutput.emitResultStatus;
}
}
function printVersion() {