Enable the commented out test and convert folder entries to sorted list

This commit is contained in:
Sheetal Nandi 2018-03-09 13:46:55 -08:00
parent 6959bda3c9
commit a20a00e222
2 changed files with 6 additions and 6 deletions

View file

@ -2333,9 +2333,9 @@ declare module "fs" {
verifyRenamingFileInSubFolder(TestFSWithWatch.Tsc_WatchDirectory.NonRecursiveWatchDirectory);
});
// it("uses non recursive dynamic polling when renaming file in subfolder", () => {
// verifyRenamingFileInSubFolder(TestFSWithWatch.Tsc_WatchDirectory.DynamicPolling);
// });
it("uses non recursive dynamic polling when renaming file in subfolder", () => {
verifyRenamingFileInSubFolder(TestFSWithWatch.Tsc_WatchDirectory.DynamicPolling);
});
});
});
}

View file

@ -88,7 +88,7 @@ interface Array<T> {}`
}
interface Folder extends FSEntry {
entries: FSEntry[];
entries: SortedArray<FSEntry>;
}
interface SymLink extends FSEntry {
@ -504,7 +504,7 @@ interface Array<T> {}`
}
private addFileOrFolderInFolder(folder: Folder, fileOrDirectory: File | Folder | SymLink, ignoreWatch?: boolean) {
folder.entries.push(fileOrDirectory);
insertSorted(folder.entries, fileOrDirectory, (a, b) => compareStringsCaseSensitive(getBaseFileName(a.path), getBaseFileName(b.path)));
folder.modifiedTime = new Date();
this.fs.set(fileOrDirectory.path, fileOrDirectory);
@ -606,7 +606,7 @@ interface Array<T> {}`
private toFolder(path: string): Folder {
const folder = this.toFsEntry(path) as Folder;
folder.entries = [];
folder.entries = [] as SortedArray<FSEntry>;
return folder;
}