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

Merge pull request #22090 from Microsoft/fileDeletedWatchClose

Browse Source 
In tsc--watch, fix the leaking watch when old source file is not part of program any more
This commit is contained in:
Sheetal Nandi
2018-02-22 16:04:17 -08:00
committed by GitHub
parent a299d2dd1c 2777c3a890
commit 86dca7bada
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/compiler/watch.ts
View File

@@ -749,6 +749,9 @@ namespace ts {
(missingFilePathsRequestedForRelease || (missingFilePathsRequestedForRelease = [])).push(oldSourceFile.path);
}
else if ((hostSourceFileInfo as FilePresentOnHost).sourceFile === oldSourceFile) {
if ((hostSourceFileInfo as FilePresentOnHost).fileWatcher) {
(hostSourceFileInfo as FilePresentOnHost).fileWatcher.close();
}
sourceFilesCache.delete(oldSourceFile.path);
resolutionCache.removeResolutionsOfFile(oldSourceFile.path);
}

28
src/harness/unittests/tscWatchMode.ts
View File

@@ -1113,6 +1113,34 @@ namespace ts.tscWatch {
checkProgramActualFiles(watch(), files.map(file => file.path));
checkOutputErrors(host, [], ExpectedOutputErrorsPosition.AfterFileChangeDetected);
});
it("watched files when file is deleted and new file is added as part of change", () => {
const projectLocation = "/home/username/project";
const file: FileOrFolder = {
path: `${projectLocation}/src/file1.ts`,
content: "var a = 10;"
};
const configFile: FileOrFolder = {
path: `${projectLocation}/tsconfig.json`,
content: "{}"
};
const files = [file, libFile, configFile];
const host = createWatchedSystem(files);
const watch = createWatchOfConfigFile(configFile.path, host);
verifyProgram();
file.path = file.path.replace("file1", "file2");
host.reloadFS(files);
host.runQueuedTimeoutCallbacks();
verifyProgram();
function verifyProgram() {
checkProgramActualFiles(watch(), mapDefined(files, f => f === configFile ? undefined : f.path));
checkWatchedDirectories(host, [], /*recursive*/ false);
checkWatchedDirectories(host, [projectLocation, `${projectLocation}/node_modules/@types`], /*recursive*/ true);
checkWatchedFiles(host, files.map(f => f.path));
}
});
});
describe("tsc-watch emit with outFile or out setting", () => {