Merge branch 'master' of https://github.com/Microsoft/TypeScript into…

… fixLargeProjectTry2 # Conflicts: # src/compiler/sys.ts
microsoft · zhengbli · Jun 16, 2016 · Mar 11, 2016 · Mar 12, 2016 · Mar 14, 2016
commit 5c9ce9e8ecb02d8556d16f22db3980eecb848a26
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
@@ -495,6 +495,11 @@ namespace ts {
                 const files = _fs.readdirSync(path || ".").sort();
                 const directories: string[] = [];
                 for (const current of files) {
+                        // This is necessary because on some file system node fails to exclude 
+                        // "." and "..". See https://github.com/nodejs/node/issues/4002
+                        if (current === "." || current === "..") {
+                            continue;
+                        }
                     const name = combinePaths(path, current);
                     if (!contains(exclude, getCanonicalPath(name))) {
                         // fs.statSync would throw an exception if the file is a symlink
@@ -559,7 +564,7 @@ namespace ts {
                     // and https://github.com/Microsoft/TypeScript/issues/4643), therefore
                     // if the current node.js version is newer than 4, use `fs.watch` instead.
                     const watchSet = isNode4OrLater() ? watchedFileSet : pollingWatchedFileSet;
-                    const watchedFile = watchSet.addFile(filePath, callback);
+                    const watchedFile =  watchSet.addFile(fileName, callback);
                     return {
                         close: () => watchSet.removeFile(watchedFile)
                     };