Merge branch 'master' into tscJsFiles

This commit is contained in:
Sheetal Nandi
2015-10-08 14:40:40 -07:00
513 changed files with 3985 additions and 2886 deletions

View File

@@ -529,7 +529,13 @@ namespace ts {
let opt = optionNameMap[id];
let { hasValidValue, value } = parseJsonCompilerOption(opt, jsonOptions[id], errors);
if (hasValidValue) {
options[opt.name] = opt.isFilePath ? normalizePath(combinePaths(basePath, <string>value)) : value;
if (opt.isFilePath) {
value = normalizePath(combinePaths(basePath, <string>value));
if (value === "") {
value = ".";
}
}
options[opt.name] = value;
}
}
else {
@@ -594,4 +600,4 @@ namespace ts {
return fileNames;
}
}
}
}