microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-15 21:36:50 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

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

Browse Source
This commit is contained in:
zhengbli
2015-10-05 14:07:51 -07:00
parent 9db53f23cf
commit 7741ec0999
3 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/compiler/sys.ts
View File

@@ -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);

2
src/server/editorServices.ts
View File

@@ -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()) {

1
src/server/session.ts
View File

@@ -779,6 +779,7 @@ namespace ts.server {
}
private closeClientFile(fileName: string) {
if (!fileName) { return; }
var file = ts.normalizePath(fileName);
this.projectService.closeClientFile(file);
}