Use fs.watch for all directory watchers and some bug fixes

zhengbli · zhengbli · commit 7741ec09999a · 2015-10-05T14:07:51.000-07:00
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
@@ -410,30 +410,19 @@ namespace ts {
                 watchDirectory: (path, callback, recursive) => {
                     // Node 4.0 `fs.watch` function supports the "recursive" option on both OSX and Windows 
                     // (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
-                    // therefore if the current node.js version is newer than 4, use `fs.watch` instead.
-
-                    // In watchDirectory we only care about adding and removing files (when event name is
-                    // "rename"); changes made within files are handled by corresponding fileWatchers (when
-                    // event name is "change")
-
-                    if (isNode4OrLater()) {
-                        return _fs.watch(
-                            path,
-                            { persisten: true, recursive: !!recursive },
-                            (eventName: string, relativeFileName: string) => {
-                                if (eventName == "rename") {
-                                    // when deleting a file, the passed baseFileName is null
-                                    callback(relativeFileName == null ? null : normalizePath(ts.combinePaths(path, relativeFileName)))
-                                };
-                            }
-                        );
-                    }
-
-                    // If Node version is older than 4.0, the "recursive" parameter will be ignored
-                    var watchedFile = watchedFileSet.addFile(path, callback);
-                    return {
-                        close: () => watchedFileSet.removeFile(watchedFile)
-                    }
+                    return _fs.watch(
+                        path,
+                        { persisten: true, recursive: !!recursive },
+                        (eventName: string, relativeFileName: string) => {
+                            // In watchDirectory we only care about adding and removing files (when event name is
+                            // "rename"); changes made within files are handled by corresponding fileWatchers (when
+                            // event name is "change")
+                            if (eventName == "rename") {
+                                // When deleting a file, the passed baseFileName is null
+                                callback(relativeFileName == null ? null : normalizePath(ts.combinePaths(path, relativeFileName)))
+                            };
+                        }
+                    );
                 },
                 resolvePath: function (path: string): string {
                     return _path.resolve(path);
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -927,7 +927,7 @@ namespace ts.server {
                 var rootedProject = rootFile.defaultProject;
                 var referencingProjects = this.findReferencingProjects(rootFile, rootedProject);
 
-                if (rootFile.defaultProject.isConfiguredProject()) {
+                if (rootFile.defaultProject && rootFile.defaultProject.isConfiguredProject()) {
                     // If the root file has already been added into a configured project,
                     // meaning the original inferred project is gone already. 
                     if (!rootedProject.isConfiguredProject()) {
diff --git a/src/server/session.ts b/src/server/session.ts
@@ -779,6 +779,7 @@ namespace ts.server {
         }
 
         private closeClientFile(fileName: string) {
+            if (!fileName) { return; }
             var file = ts.normalizePath(fileName);
             this.projectService.closeClientFile(file);
         }

Original file line number	Diff line number	Diff line change
`@@ -779,6 +779,7 @@ namespace ts.server {`
`779`	`779`	`}`
`780`	`780`
`781`	`781`	`private closeClientFile(fileName: string) {`
	`782`	`+ if (!fileName) { return; }`
`782`	`783`	`var file = ts.normalizePath(fileName);`
`783`	`784`	`this.projectService.closeClientFile(file);`
`784`	`785`	`}`