Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into bom

Browse Source 
Conflicts:
	src/compiler/commandLineParser.ts
	src/compiler/emitter.ts
This commit is contained in:
Mohamed Hegazy
2014-08-06 12:55:57 -07:00
parent a4a773a352 891d379aac
commit f125ee20bb
41 changed files with 5748 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/harness/harness.ts
+4 -4
View File
@@ -740,13 +740,13 @@ module Harness {
checker.checkProgram();
// only emit if there weren't parse errors
var sourceMapData: ts.SourceMapData[];
var emitResult: ts.EmitResult;
if (!hadParseErrors) {
sourceMapData = checker.emitFiles().sourceMaps;
emitResult = checker.emitFiles();
}
var errors: MinimalDiagnostic[] = [];
program.getDiagnostics().concat(checker.getDiagnostics()).forEach(err => {
program.getDiagnostics().concat(checker.getDiagnostics()).concat(emitResult ? emitResult.errors : []).forEach(err => {
// TODO: new compiler formats errors after this point to add . and newlines so we'll just do it manually for now
errors.push({ filename: err.file && err.file.filename, start: err.start, end: err.start + err.length, line: 0, character: 0, message: err.messageText });
});
@@ -754,7 +754,7 @@ module Harness {
var result = new CompilerResult(fileOutputs, errors, []);
// Covert the source Map data into the baseline
result.updateSourceMapRecord(program, sourceMapData);
result.updateSourceMapRecord(program, emitResult ? emitResult.sourceMaps : undefined);
onComplete(result);
// reset what newline means in case the last test changed it