Responding to PR feedback

riknoll · riknoll · commit 95072aab824b · 2016-06-17T17:32:10.000-07:00
diff --git a/src/compiler/commandLineParser.ts b/src/compiler/commandLineParser.ts
@@ -672,7 +672,7 @@ namespace ts {
 
     // Skip over any minified JavaScript files (ending in ".min.js")
     // Skip over dotted files and folders as well
-    const IgnoreFileNamePattern = /(\.min\.js$)|([\\/]\.[\w.])/;
+    const ignoreFileNamePattern = /(\.min\.js$)|([\\/]\.[\w.])/;
     /**
       * Parse the contents of a config file (tsconfig.json).
       * @param json The contents of the config file to parse
@@ -969,7 +969,7 @@ namespace ts {
                     continue;
                 }
 
-                if (IgnoreFileNamePattern.test(file)) {
+                if (ignoreFileNamePattern.test(file)) {
                     continue;
                 }
 
@@ -1055,8 +1055,8 @@ namespace ts {
             // Remove any subpaths under an existing recursively watched directory.
             for (const key in wildcardDirectories) {
                 if (hasProperty(wildcardDirectories, key)) {
-                    for (const recursiveKey in recursiveKeys) {
-                        if (containsPath(recursiveKey, key, path, !useCaseSensitiveFileNames)) {
+                    for (const recursiveKey of recursiveKeys) {
+                        if (key !== recursiveKey && containsPath(recursiveKey, key, path, !useCaseSensitiveFileNames)) {
                             delete wildcardDirectories[key];
                         }
                     }
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -1211,7 +1211,7 @@ namespace ts {
     export function isJsxOrTsxExtension(ext: string): boolean {
         return ext === ".jsx" || ext === ".tsx";
     }
-    
+
     export function changeExtension<T extends string | Path>(path: T, newExtension: string): T {
         return <T>(removeFileExtension(path) + newExtension);
     }
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
@@ -381,7 +381,15 @@ namespace ts {
                             continue;
                         }
                         const name = combinePaths(path, entry);
-                        const stat = _fs.statSync(name);
+
+                        let stat: any;
+                        try {
+                            stat = _fs.statSync(name);
+                        }
+                        catch (e) {
+                            continue;
+                        }
+
                         if (stat.isFile()) {
                             files.push(entry);
                         }
diff --git a/tests/cases/unittests/cachingInServerLSHost.ts b/tests/cases/unittests/cachingInServerLSHost.ts
@@ -82,7 +82,7 @@ namespace ts {
         const projectService = new server.ProjectService(serverHost, logger);
         const rootScriptInfo = projectService.openFile(rootFile, /* openedByClient */true);
         const project = projectService.createInferredProject(rootScriptInfo);
-        project.setProjectOptions( {files: [rootScriptInfo.fileName], compilerOptions: {module: ts.ModuleKind.AMD} } );
+        project.setProjectOptions({ files: [rootScriptInfo.fileName], compilerOptions: { module: ts.ModuleKind.AMD } });
         return {
             project,
             rootScriptInfo

Original file line number	Diff line number	Diff line change
`@@ -672,7 +672,7 @@ namespace ts {`
`672`	`672`
`673`	`673`	`// Skip over any minified JavaScript files (ending in ".min.js")`
`674`	`674`	`// Skip over dotted files and folders as well`
`675`		`- const IgnoreFileNamePattern = /(\.min\.js$)\|([\\/]\.[\w.])/;`
	`675`	`+ const ignoreFileNamePattern = /(\.min\.js$)\|([\\/]\.[\w.])/;`
`676`	`676`	`/**`
`677`	`677`	`* Parse the contents of a config file (tsconfig.json).`
`678`	`678`	`* @param json The contents of the config file to parse`
`@@ -969,7 +969,7 @@ namespace ts {`
`969`	`969`	`continue;`
`970`	`970`	`}`
`971`	`971`
`972`		`- if (IgnoreFileNamePattern.test(file)) {`
	`972`	`+ if (ignoreFileNamePattern.test(file)) {`
`973`	`973`	`continue;`
`974`	`974`	`}`
`975`	`975`
`@@ -1055,8 +1055,8 @@ namespace ts {`
`1055`	`1055`	`// Remove any subpaths under an existing recursively watched directory.`
`1056`	`1056`	`for (const key in wildcardDirectories) {`
`1057`	`1057`	`if (hasProperty(wildcardDirectories, key)) {`
`1058`		`- for (const recursiveKey in recursiveKeys) {`
`1059`		`- if (containsPath(recursiveKey, key, path, !useCaseSensitiveFileNames)) {`
	`1058`	`+ for (const recursiveKey of recursiveKeys) {`
	`1059`	`+ if (key !== recursiveKey && containsPath(recursiveKey, key, path, !useCaseSensitiveFileNames)) {`
`1060`	`1060`	`delete wildcardDirectories[key];`
`1061`	`1061`	`}`
`1062`	`1062`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1211,7 +1211,7 @@ namespace ts {`
`1211`	`1211`	`export function isJsxOrTsxExtension(ext: string): boolean {`
`1212`	`1212`	`return ext === ".jsx" \|\| ext === ".tsx";`
`1213`	`1213`	`}`
`1214`		`-`
	`1214`	`+`
`1215`	`1215`	`export function changeExtension<T extends string \| Path>(path: T, newExtension: string): T {`
`1216`	`1216`	`return <T>(removeFileExtension(path) + newExtension);`
`1217`	`1217`	`}`