Adding sourceFiles to the Program emit callback

chuckjaz · chuckjaz · commit 8bf9da614f80 · 2016-03-15T13:25:18.000-07:00
This implements microsoft#7438
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -604,7 +604,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                     write(`//# sourceMappingURL=${sourceMappingURL}`);
                 }
 
-                writeEmittedFiles(writer.getText(), jsFilePath, sourceMapFilePath, /*writeByteOrderMark*/ compilerOptions.emitBOM);
+                writeEmittedFiles(writer.getText(), jsFilePath, sourceMapFilePath, /*writeByteOrderMark*/ compilerOptions.emitBOM, sourceFiles);
 
                 // reset the state
                 sourceMap.reset();
@@ -748,16 +748,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
             }
 
             /** Write emitted output to disk */
-            function writeEmittedFiles(emitOutput: string, jsFilePath: string, sourceMapFilePath: string, writeByteOrderMark: boolean) {
+            function writeEmittedFiles(emitOutput: string, jsFilePath: string, sourceMapFilePath: string, writeByteOrderMark: boolean, sourceFiles: SourceFile[]) {
                 if (compilerOptions.sourceMap && !compilerOptions.inlineSourceMap) {
-                    writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(), /*writeByteOrderMark*/ false);
+                    writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(), /*writeByteOrderMark*/ false, sourceFiles);
                 }
 
                 if (sourceMapDataList) {
                     sourceMapDataList.push(sourceMap.getSourceMapData());
                 }
 
-                writeFile(host, emitterDiagnostics, jsFilePath, emitOutput, writeByteOrderMark);
+                writeFile(host, emitterDiagnostics, jsFilePath, emitOutput, writeByteOrderMark, sourceFiles);
             }
 
             // Create a temporary variable with a unique unused name.
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -931,7 +931,7 @@ namespace ts {
                 getSourceFile: program.getSourceFile,
                 getSourceFiles: program.getSourceFiles,
                 writeFile: writeFileCallback || (
-                    (fileName, data, writeByteOrderMark, onError) => host.writeFile(fileName, data, writeByteOrderMark, onError)),
+                    (fileName, data, writeByteOrderMark, onError, sourceFiles) => host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles)),
                 isEmitBlocked,
             };
         }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -1584,7 +1584,7 @@ namespace ts {
     }
 
     export interface WriteFileCallback {
-        (fileName: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void): void;
+        (fileName: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void, sourceFiles?: SourceFile[]): void;
     }
 
     export class OperationCanceledException { }
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -2110,10 +2110,10 @@ namespace ts {
         return combinePaths(newDirPath, sourceFilePath);
     }
 
-    export function writeFile(host: EmitHost, diagnostics: DiagnosticCollection, fileName: string, data: string, writeByteOrderMark: boolean) {
+    export function writeFile(host: EmitHost, diagnostics: DiagnosticCollection, fileName: string, data: string, writeByteOrderMark: boolean, sourceFiles?: SourceFile[]) {
         host.writeFile(fileName, data, writeByteOrderMark, hostErrorMessage => {
             diagnostics.add(createCompilerDiagnostic(Diagnostics.Could_not_write_file_0_Colon_1, fileName, hostErrorMessage));
-        });
+        }, sourceFiles);
     }
 
     export function getLineOfLocalPosition(currentSourceFile: SourceFile, pos: number) {

Original file line number	Diff line number	Diff line change
`@@ -604,7 +604,7 @@ var __awaiter = (this && this.__awaiter) \|\| function (thisArg, _arguments, P, ge`
`604`	`604`	write(`//# sourceMappingURL=${sourceMappingURL}`);
`605`	`605`	`}`
`606`	`606`
`607`		`- writeEmittedFiles(writer.getText(), jsFilePath, sourceMapFilePath, /writeByteOrderMark/ compilerOptions.emitBOM);`
	`607`	`+ writeEmittedFiles(writer.getText(), jsFilePath, sourceMapFilePath, /writeByteOrderMark/ compilerOptions.emitBOM, sourceFiles);`
`608`	`608`
`609`	`609`	`// reset the state`
`610`	`610`	`sourceMap.reset();`
`@@ -748,16 +748,16 @@ var __awaiter = (this && this.__awaiter) \|\| function (thisArg, _arguments, P, ge`
`748`	`748`	`}`
`749`	`749`
`750`	`750`	`/** Write emitted output to disk */`
`751`		`- function writeEmittedFiles(emitOutput: string, jsFilePath: string, sourceMapFilePath: string, writeByteOrderMark: boolean) {`
	`751`	`+ function writeEmittedFiles(emitOutput: string, jsFilePath: string, sourceMapFilePath: string, writeByteOrderMark: boolean, sourceFiles: SourceFile[]) {`
`752`	`752`	`if (compilerOptions.sourceMap && !compilerOptions.inlineSourceMap) {`
`753`		`- writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(), /writeByteOrderMark/ false);`
	`753`	`+ writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(), /writeByteOrderMark/ false, sourceFiles);`
`754`	`754`	`}`
`755`	`755`
`756`	`756`	`if (sourceMapDataList) {`
`757`	`757`	`sourceMapDataList.push(sourceMap.getSourceMapData());`
`758`	`758`	`}`
`759`	`759`
`760`		`- writeFile(host, emitterDiagnostics, jsFilePath, emitOutput, writeByteOrderMark);`
	`760`	`+ writeFile(host, emitterDiagnostics, jsFilePath, emitOutput, writeByteOrderMark, sourceFiles);`
`761`	`761`	`}`
`762`	`762`
`763`	`763`	`// Create a temporary variable with a unique unused name.`
Original file line number	Diff line number	Diff line change
`@@ -931,7 +931,7 @@ namespace ts {`
`931`	`931`	`getSourceFile: program.getSourceFile,`
`932`	`932`	`getSourceFiles: program.getSourceFiles,`
`933`	`933`	`writeFile: writeFileCallback \|\| (`
`934`		`- (fileName, data, writeByteOrderMark, onError) => host.writeFile(fileName, data, writeByteOrderMark, onError)),`
	`934`	`+ (fileName, data, writeByteOrderMark, onError, sourceFiles) => host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles)),`
`935`	`935`	`isEmitBlocked,`
`936`	`936`	`};`
`937`	`937`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1584,7 +1584,7 @@ namespace ts {`
`1584`	`1584`	`}`
`1585`	`1585`
`1586`	`1586`	`export interface WriteFileCallback {`
`1587`		`- (fileName: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void): void;`
	`1587`	`+ (fileName: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void, sourceFiles?: SourceFile[]): void;`
`1588`	`1588`	`}`
`1589`	`1589`
`1590`	`1590`	`export class OperationCanceledException { }`
Original file line number	Diff line number	Diff line change
`@@ -2110,10 +2110,10 @@ namespace ts {`
`2110`	`2110`	`return combinePaths(newDirPath, sourceFilePath);`
`2111`	`2111`	`}`
`2112`	`2112`
`2113`		`- export function writeFile(host: EmitHost, diagnostics: DiagnosticCollection, fileName: string, data: string, writeByteOrderMark: boolean) {`
	`2113`	`+ export function writeFile(host: EmitHost, diagnostics: DiagnosticCollection, fileName: string, data: string, writeByteOrderMark: boolean, sourceFiles?: SourceFile[]) {`
`2114`	`2114`	`host.writeFile(fileName, data, writeByteOrderMark, hostErrorMessage => {`
`2115`	`2115`	`diagnostics.add(createCompilerDiagnostic(Diagnostics.Could_not_write_file_0_Colon_1, fileName, hostErrorMessage));`
`2116`		`- });`
	`2116`	`+ }, sourceFiles);`
`2117`	`2117`	`}`
`2118`	`2118`
`2119`	`2119`	`export function getLineOfLocalPosition(currentSourceFile: SourceFile, pos: number) {`