Merge pull request #4497 from weswigham/patch-4

Add system argument to readConfigFile
This commit is contained in:
Daniel Rosenwasser 2015-09-04 18:10:46 -07:00
commit 4a85546f94
2 changed files with 3 additions and 3 deletions

View File

@ -379,10 +379,10 @@ namespace ts {
* Read tsconfig.json file
* @param fileName The path to the config file
*/
export function readConfigFile(fileName: string): { config?: any; error?: Diagnostic } {
export function readConfigFile(fileName: string, readFile: (path: string) => string): { config?: any; error?: Diagnostic } {
let text = "";
try {
text = sys.readFile(fileName);
text = readFile(fileName);
}
catch (e) {
return { error: createCompilerDiagnostic(Diagnostics.Cannot_read_file_0_Colon_1, fileName, e.message) };

View File

@ -216,7 +216,7 @@ namespace ts {
if (!cachedProgram) {
if (configFileName) {
let result = readConfigFile(configFileName);
let result = readConfigFile(configFileName, sys.readFile);
if (result.error) {
reportDiagnostic(result.error);
return sys.exit(ExitStatus.DiagnosticsPresent_OutputsSkipped);