maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix declaring function for writer and setting writer to undefined

Browse source
This commit is contained in:
Yui T 2014-09-12 13:19:26 -07:00
parent 0b06ddcc9a
commit 2ad20d2e6b
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/services/services.ts
View file

@ -2830,8 +2830,7 @@ module ts {
}
function containErrors(diagnostics: Diagnostic[]): boolean {
var hasError = forEach(diagnostics, diagnostic => diagnostic.category === DiagnosticCategory.Error);
return hasError;
return forEach(diagnostics, diagnostic => diagnostic.category === DiagnosticCategory.Error);
}
function getEmitOutput(filename: string): EmitOutput {
@ -2846,15 +2845,17 @@ module ts {
emitOutputStatus: undefined,
};
// Initialize writer for CompilerHost.writeFile
writer = function (fileName: string, data: string, writeByteOrderMark: boolean) {
function getEmitOutputWriter(filename: string, data: string, writeByteOrderMark: boolean) {
emitOutput.outputFiles.push({
name: fileName,
name: filename,
writeByteOrderMark: writeByteOrderMark,
text: data
});
}
// Initialize writer for CompilerHost.writeFile
writer = getEmitOutputWriter;
var syntacticDiagnostics: Diagnostic[] = [];
if (emitToSingleFile) {
// Check only the file we want to emit
@ -2873,6 +2874,8 @@ module ts {
// If there is any syntactic error, terminate the process
if (containErrors(syntacticDiagnostics)) {
emitOutput.emitOutputStatus = EmitReturnStatus.AllOutputGenerationSkipped;
// Reset writer back to undefined to make sure that we produce an error message if CompilerHost.writeFile method is called when we are not in getEmitOutput
writer = undefined;
return emitOutput;
}
@ -2890,7 +2893,7 @@ module ts {
emitOutput.emitOutputStatus = emitFilesResult.emitResultStatus;
// Reset writer back to undefined to make sure that we produce an error message if CompilerHost.writeFile method is called when we are not in getEmitOutput
this.writer = undefined;
writer = undefined;
return emitOutput;
}