Fix failed tests

zhengbli · zhengbli · commit cb46f16406d3 · 2016-03-17T19:57:40.000-07:00
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
@@ -649,6 +649,10 @@ namespace ts {
                 // Get files of supported extensions in their order of resolution
                 for (const extension of supportedExtensions) {
                     for (const fileName of potentialFiles) {
+                        if (!fileExtensionIs(fileName, extension)) {
+                            continue;
+                        }
+
                         // .ts extension would read the .d.ts extension files too but since .d.ts is lower priority extension,
                         // lets pick them when its turn comes up
                         if (extension === ".ts" && fileExtensionIs(fileName, ".d.ts")) {
@@ -669,8 +673,10 @@ namespace ts {
                             }
                         }
 
-                        filesSeen[fileName] = true;
-                        fileNames.push(fileName);
+                        if (!filesSeen[fileName]) {
+                            filesSeen[fileName] = true;
+                            fileNames.push(fileName);
+                        }
                     }
                 }
             }
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
@@ -491,8 +491,7 @@ namespace ts {
                 return fileSystemEntryExists(path, FileSystemEntryKind.Directory);
             }
 
-            function visitDirectory(path: string, extension: string | string[], exclude: string[]) {
-                const result: string[] = [];
+            function visitDirectory(path: string, result: string[], extension: string | string[], exclude: string[]) {
                 const files = _fs.readdirSync(path || ".").sort();
                 const directories: string[] = [];
                 for (const current of files) {
@@ -515,9 +514,8 @@ namespace ts {
                     }
                 }
                 for (const current of directories) {
-                    visitDirectory(current, extension, exclude);
+                    visitDirectory(current, result, extension, exclude);
                 }
-                return result;
 
                 function checkExtension(name: string) {
                     if (!extension) {
@@ -533,13 +531,17 @@ namespace ts {
             }
 
             function readDirectoryWithMultipleExtensions(path: string, extensions: string[], exclude?: string[]): string[] {
+                const result: string[] = [];
                 exclude = map(exclude, s => getCanonicalPath(combinePaths(path, s)));
-                return visitDirectory(path, extensions, exclude);
+                visitDirectory(path, result, extensions, exclude);
+                return result;
             }
 
             function readDirectory(path: string, extension?: string, exclude?: string[]): string[] {
+                const result: string[] = [];
                 exclude = map(exclude, s => getCanonicalPath(combinePaths(path, s)));
-                return visitDirectory(path, extension, exclude);
+                visitDirectory(path, result, extension, exclude);
+                return result;
             }
 
             return {

Original file line number	Diff line number	Diff line change
`@@ -649,6 +649,10 @@ namespace ts {`
`649`	`649`	`// Get files of supported extensions in their order of resolution`
`650`	`650`	`for (const extension of supportedExtensions) {`
`651`	`651`	`for (const fileName of potentialFiles) {`
	`652`	`+ if (!fileExtensionIs(fileName, extension)) {`
	`653`	`+ continue;`
	`654`	`+ }`
	`655`	`+`
`652`	`656`	`// .ts extension would read the .d.ts extension files too but since .d.ts is lower priority extension,`
`653`	`657`	`// lets pick them when its turn comes up`
`654`	`658`	`if (extension === ".ts" && fileExtensionIs(fileName, ".d.ts")) {`
`@@ -669,8 +673,10 @@ namespace ts {`
`669`	`673`	`}`
`670`	`674`	`}`
`671`	`675`
`672`		`- filesSeen[fileName] = true;`
`673`		`- fileNames.push(fileName);`
	`676`	`+ if (!filesSeen[fileName]) {`
	`677`	`+ filesSeen[fileName] = true;`
	`678`	`+ fileNames.push(fileName);`
	`679`	`+ }`
`674`	`680`	`}`
`675`	`681`	`}`
`676`	`682`	`}`
Original file line number	Diff line number	Diff line change
`@@ -491,8 +491,7 @@ namespace ts {`
`491`	`491`	`return fileSystemEntryExists(path, FileSystemEntryKind.Directory);`
`492`	`492`	`}`
`493`	`493`
`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[]) {`
`496`	`495`	`const files = _fs.readdirSync(path \|\| ".").sort();`
`497`	`496`	`const directories: string[] = [];`
`498`	`497`	`for (const current of files) {`
`@@ -515,9 +514,8 @@ namespace ts {`
`515`	`514`	`}`
`516`	`515`	`}`
`517`	`516`	`for (const current of directories) {`
`518`		`- visitDirectory(current, extension, exclude);`
	`517`	`+ visitDirectory(current, result, extension, exclude);`
`519`	`518`	`}`
`520`		`- return result;`
`521`	`519`
`522`	`520`	`function checkExtension(name: string) {`
`523`	`521`	`if (!extension) {`
`@@ -533,13 +531,17 @@ namespace ts {`
`533`	`531`	`}`
`534`	`532`
`535`	`533`	`function readDirectoryWithMultipleExtensions(path: string, extensions: string[], exclude?: string[]): string[] {`
	`534`	`+ const result: string[] = [];`
`536`	`535`	`exclude = map(exclude, s => getCanonicalPath(combinePaths(path, s)));`
`537`		`- return visitDirectory(path, extensions, exclude);`
	`536`	`+ visitDirectory(path, result, extensions, exclude);`
	`537`	`+ return result;`
`538`	`538`	`}`
`539`	`539`
`540`	`540`	`function readDirectory(path: string, extension?: string, exclude?: string[]): string[] {`
	`541`	`+ const result: string[] = [];`
`541`	`542`	`exclude = map(exclude, s => getCanonicalPath(combinePaths(path, s)));`
`542`		`- return visitDirectory(path, extension, exclude);`
	`543`	`+ visitDirectory(path, result, extension, exclude);`
	`544`	`+ return result;`
`543`	`545`	`}`
`544`	`546`
`545`	`547`	`return {`