Skip to content

Commit cb46f16

Browse files
committed
Fix failed tests
1 parent d7e1d34 commit cb46f16

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

src/compiler/commandLineParser.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,10 @@ namespace ts {
649649
// Get files of supported extensions in their order of resolution
650650
for (const extension of supportedExtensions) {
651651
for (const fileName of potentialFiles) {
652+
if (!fileExtensionIs(fileName, extension)) {
653+
continue;
654+
}
655+
652656
// .ts extension would read the .d.ts extension files too but since .d.ts is lower priority extension,
653657
// lets pick them when its turn comes up
654658
if (extension === ".ts" && fileExtensionIs(fileName, ".d.ts")) {
@@ -669,8 +673,10 @@ namespace ts {
669673
}
670674
}
671675

672-
filesSeen[fileName] = true;
673-
fileNames.push(fileName);
676+
if (!filesSeen[fileName]) {
677+
filesSeen[fileName] = true;
678+
fileNames.push(fileName);
679+
}
674680
}
675681
}
676682
}

src/compiler/sys.ts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -491,8 +491,7 @@ namespace ts {
491491
return fileSystemEntryExists(path, FileSystemEntryKind.Directory);
492492
}
493493

494-
function visitDirectory(path: string, extension: string | string[], exclude: string[]) {
495-
const result: string[] = [];
494+
function visitDirectory(path: string, result: string[], extension: string | string[], exclude: string[]) {
496495
const files = _fs.readdirSync(path || ".").sort();
497496
const directories: string[] = [];
498497
for (const current of files) {
@@ -515,9 +514,8 @@ namespace ts {
515514
}
516515
}
517516
for (const current of directories) {
518-
visitDirectory(current, extension, exclude);
517+
visitDirectory(current, result, extension, exclude);
519518
}
520-
return result;
521519

522520
function checkExtension(name: string) {
523521
if (!extension) {
@@ -533,13 +531,17 @@ namespace ts {
533531
}
534532

535533
function readDirectoryWithMultipleExtensions(path: string, extensions: string[], exclude?: string[]): string[] {
534+
const result: string[] = [];
536535
exclude = map(exclude, s => getCanonicalPath(combinePaths(path, s)));
537-
return visitDirectory(path, extensions, exclude);
536+
visitDirectory(path, result, extensions, exclude);
537+
return result;
538538
}
539539

540540
function readDirectory(path: string, extension?: string, exclude?: string[]): string[] {
541+
const result: string[] = [];
541542
exclude = map(exclude, s => getCanonicalPath(combinePaths(path, s)));
542-
return visitDirectory(path, extension, exclude);
543+
visitDirectory(path, result, extension, exclude);
544+
return result;
543545
}
544546

545547
return {

0 commit comments

Comments
 (0)