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

Remove handling for multiple inheritance for config files

Browse Source
This commit is contained in:
Mohamed Hegazy
2016-08-29 17:18:04 -07:00
parent 19f62a41de
commit d8ff546512
2 changed files with 3 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/compiler/commandLineParser.ts
View File

@@ -822,17 +822,8 @@ namespace ts {
if (typeof json["extends"] === "string") {
[include, exclude, files, baseOptions] = (tryExtendsName(json["extends"]) || [include, exclude, files, baseOptions]);
}
else if (typeof json["extends"] === "object" && json["extends"].length) {
for (const name of json["extends"]) {
const [tempinclude, tempexclude, tempfiles, tempBase]: [string[], string[], string[], CompilerOptions] = (tryExtendsName(name) || [include, exclude, files, baseOptions]);
include = tempinclude || include;
exclude = tempexclude || exclude;
files = tempfiles || files;
baseOptions = assign({}, baseOptions, tempBase);
}
}
else {
errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "extends", "string or string[]"));
errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "extends", "string"));
}
if (include && !json["include"]) {
json["include"] = include;