Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address more PR comments

Browse Source
This commit is contained in:
Nathan Shively-Sanders
2022-04-20 07:53:36 -07:00
parent 9e665753e1
commit 6929642c98
10 changed files with 52 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vfs/virtualFileSystemWithWatch.ts
+9 -9
View File
@@ -337,7 +337,7 @@ namespace ts.TestFSWithWatch {
}
if (options && options.invokeFileDeleteCreateAsPartInsteadOfChange) {
this.removeFileOrFolder(currentEntry, returnFalse);
this.removeFileOrFolder(currentEntry, false);
this.ensureFileOrFolder({ path: filePath, content });
}
else {
@@ -363,7 +363,7 @@ namespace ts.TestFSWithWatch {
Debug.assert(!!file);
// Only remove the file
this.removeFileOrFolder(file, returnFalse, /*isRenaming*/ true);
this.removeFileOrFolder(file, false, /*isRenaming*/ true);
// Add updated folder with new folder name
const newFullPath = getNormalizedAbsolutePath(newFileName, this.currentDirectory);
@@ -383,7 +383,7 @@ namespace ts.TestFSWithWatch {
Debug.assert(!!folder);
// Only remove the folder
this.removeFileOrFolder(folder, returnFalse, /*isRenaming*/ true);
this.removeFileOrFolder(folder, false, /*isRenaming*/ true);
// Add updated folder with new folder name
const newFullPath = getNormalizedAbsolutePath(newFolderName, this.currentDirectory);
@@ -474,7 +474,7 @@ namespace ts.TestFSWithWatch {
this.invokeFileAndFsWatches(folder.fullPath, FileWatcherEventKind.Changed);
}
private removeFileOrFolder(fileOrDirectory: FsFile | FsFolder | FsSymLink, isRemovableLeafFolder: (folder: FsFolder) => boolean, isRenaming = false) {
private removeFileOrFolder(fileOrDirectory: FsFile | FsFolder | FsSymLink, isRemovableLeafFolder: boolean, isRenaming = false) {
const basePath = getDirectoryPath(fileOrDirectory.path);
const baseFolder = this.fs.get(basePath) as FsFolder;
if (basePath !== fileOrDirectory.path) {
@@ -491,16 +491,16 @@ namespace ts.TestFSWithWatch {
this.invokeFileAndFsWatches(baseFolder.fullPath, FileWatcherEventKind.Changed);
if (basePath !== fileOrDirectory.path &&
baseFolder.entries.length === 0 &&
isRemovableLeafFolder(baseFolder)) {
isRemovableLeafFolder) {
this.removeFileOrFolder(baseFolder, isRemovableLeafFolder);
}
}
deleteFile(filePath: string) {
deleteFile(filePath: string, deleteEmptyParentFolders = false) {
const path = this.toFullPath(filePath);
const currentEntry = this.fs.get(path) as FsFile;
Debug.assert(isFsFile(currentEntry));
this.removeFileOrFolder(currentEntry, returnFalse);
this.removeFileOrFolder(currentEntry, deleteEmptyParentFolders);
}
deleteFolder(folderPath: string, recursive?: boolean) {
@@ -514,11 +514,11 @@ namespace ts.TestFSWithWatch {
this.deleteFolder(fsEntry.fullPath, recursive);
}
else {
this.removeFileOrFolder(fsEntry, returnFalse);
this.removeFileOrFolder(fsEntry, false);
}
});
}
this.removeFileOrFolder(currentEntry, returnFalse);
this.removeFileOrFolder(currentEntry, false);
}
private watchFileWorker(fileName: string, cb: FileWatcherCallback, pollingInterval: PollingInterval) {