Skip to content

Commit 8c559a4

Browse files
author
Andy Hanson
committed
Respond to PR comments
1 parent 8313776 commit 8c559a4

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/compiler/commandLineParser.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,9 +1103,9 @@ namespace ts {
11031103

11041104
let options = (() => {
11051105
const { include, exclude, files, options } = parseConfig(json, host, basePath, configFileName, resolutionStack, errors);
1106-
if (include) json.include = include;
1107-
if (exclude) json.exclude = exclude;
1108-
if (files) json.files = files;
1106+
if (include) { json.include = include; }
1107+
if (exclude) { json.exclude = exclude; }
1108+
if (files) { json.files = files; }
11091109
return options;
11101110
})();
11111111

@@ -1203,7 +1203,7 @@ namespace ts {
12031203
host: ParseConfigHost,
12041204
basePath: string,
12051205
configFileName: string,
1206-
resolutionStack: Path[] = [],
1206+
resolutionStack: Path[],
12071207
errors: Diagnostic[],
12081208
): ParsedTsconfig {
12091209

@@ -1251,8 +1251,10 @@ namespace ts {
12511251
return undefined;
12521252
}
12531253

1254+
extended = normalizeSlashes(extended);
1255+
12541256
// If the path isn't a rooted or relative path, don't try to resolve it (we reserve the right to special case module-id like paths in the future)
1255-
if (!(isRootedDiskPath(extended) || startsWith(normalizeSlashes(extended), "./") || startsWith(normalizeSlashes(extended), "../"))) {
1257+
if (!(isRootedDiskPath(extended) || startsWith(extended, "./") || startsWith(extended, "../"))) {
12561258
errors.push(createCompilerDiagnostic(Diagnostics.A_path_in_an_extends_option_must_be_relative_or_rooted_but_0_is_not, extended));
12571259
return undefined;
12581260
}

0 commit comments

Comments
 (0)