Merge pull request microsoft#12445 from tlancina/master

mhegazy · web-flow · commit a8ef77c33cb1 · 2016-11-22T12:41:39.000-08:00
Re-add sourceFiles to program emit callback
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -143,7 +143,7 @@ namespace ts {
 
             // Write the source map
             if (compilerOptions.sourceMap && !compilerOptions.inlineSourceMap) {
-                writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(),  /*writeByteOrderMark*/ false);
+                writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(),  /*writeByteOrderMark*/ false, sourceFiles);
             }
 
             // Record source map data for the test harness.
@@ -152,7 +152,7 @@ namespace ts {
             }
 
             // Write the output file
-            writeFile(host, emitterDiagnostics, jsFilePath, writer.getText(), compilerOptions.emitBOM);
+            writeFile(host, emitterDiagnostics, jsFilePath, writer.getText(), compilerOptions.emitBOM, sourceFiles);
 
             // Reset state
             sourceMap.reset();

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ namespace ts {`
`143`	`143`
`144`	`144`	`// Write the source map`
`145`	`145`	`if (compilerOptions.sourceMap && !compilerOptions.inlineSourceMap) {`
`146`		`- writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(), /writeByteOrderMark/ false);`
	`146`	`+ writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(), /writeByteOrderMark/ false, sourceFiles);`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`// Record source map data for the test harness.`
`@@ -152,7 +152,7 @@ namespace ts {`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`// Write the output file`
`155`		`- writeFile(host, emitterDiagnostics, jsFilePath, writer.getText(), compilerOptions.emitBOM);`
	`155`	`+ writeFile(host, emitterDiagnostics, jsFilePath, writer.getText(), compilerOptions.emitBOM, sourceFiles);`
`156`	`156`
`157`	`157`	`// Reset state`
`158`	`158`	`sourceMap.reset();`