microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-17 01:49:57 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Merge remote-tracking branch 'upstream/master' into javaScriptModules

Browse Source
This commit is contained in:
Ryan Cavanaugh
2015-10-19 13:53:52 -07:00
parent efa63b98bb 28c2887d50
commit eda6eca3c7
95 changed files with 3348 additions and 1259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/services/shims.ts
View File

@@ -991,7 +991,7 @@ namespace ts {
() => {
let text = sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength());
let result = parseConfigFileText(fileName, text);
let result = parseConfigFileTextToJson(fileName, text);
if (result.error) {
return {
@@ -1001,7 +1001,7 @@ namespace ts {
};
}
var configFile = parseConfigFile(result.config, this.host, getDirectoryPath(normalizeSlashes(fileName)));
var configFile = parseJsonConfigFileContent(result.config, this.host, getDirectoryPath(normalizeSlashes(fileName)));
return {
options: configFile.options,