Skip to content

Commit d8bf95f

Browse files
committed
PR feedback
1 parent f885cd9 commit d8bf95f

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/compiler/sys.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ namespace ts {
334334
/*@internal*/
335335
export interface RecursiveDirectoryWatcherHost {
336336
watchDirectory: HostWatchDirectory;
337-
getAccessileSortedChildDirectories(path: string): ReadonlyArray<string>;
337+
getAccessibleSortedChildDirectories(path: string): ReadonlyArray<string>;
338338
directoryExists(dir: string): boolean;
339339
filePathComparer: Comparer<string>;
340340
realpath(s: string): string;
@@ -393,8 +393,10 @@ namespace ts {
393393
function watchChildDirectories(parentDir: string, existingChildWatches: ChildWatches, callback: DirectoryWatcherCallback): ChildWatches {
394394
let newChildWatches: DirectoryWatcher[] | undefined;
395395
enumerateInsertsAndDeletes<string, DirectoryWatcher>(
396-
host.directoryExists(parentDir) ? mapDefined(host.getAccessileSortedChildDirectories(parentDir), child => {
396+
host.directoryExists(parentDir) ? mapDefined(host.getAccessibleSortedChildDirectories(parentDir), child => {
397397
const childFullName = getNormalizedAbsolutePath(child, parentDir);
398+
// Filter our the symbolic link directories since those arent included in recursive watch
399+
// which is same behaviour when recursive: true is passed to fs.watch
398400
return host.filePathComparer(childFullName, host.realpath(childFullName)) === Comparison.EqualTo ? childFullName : undefined;
399401
}) : emptyArray,
400402
existingChildWatches,
@@ -696,7 +698,7 @@ namespace ts {
696698
const watchDirectoryRecursively = createRecursiveDirectoryWatcher({
697699
filePathComparer: useCaseSensitiveFileNames ? compareStringsCaseSensitive : compareStringsCaseInsensitive,
698700
directoryExists,
699-
getAccessileSortedChildDirectories: path => getAccessibleFileSystemEntries(path).directories,
701+
getAccessibleSortedChildDirectories: path => getAccessibleFileSystemEntries(path).directories,
700702
watchDirectory,
701703
realpath
702704
});

src/harness/virtualFileSystemWithWatch.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ interface Array<T> {}`
312312
const watchDirectory: HostWatchDirectory = (directory, cb) => this.watchFile(directory, () => cb(directory), PollingInterval.Medium);
313313
this.customRecursiveWatchDirectory = createRecursiveDirectoryWatcher({
314314
directoryExists: path => this.directoryExists(path),
315-
getAccessileSortedChildDirectories: path => this.getDirectories(path),
315+
getAccessibleSortedChildDirectories: path => this.getDirectories(path),
316316
filePathComparer: this.useCaseSensitiveFileNames ? compareStringsCaseSensitive : compareStringsCaseInsensitive,
317317
watchDirectory,
318318
realpath: s => this.realpath(s)
@@ -322,7 +322,7 @@ interface Array<T> {}`
322322
const watchDirectory: HostWatchDirectory = (directory, cb) => this.watchDirectory(directory, fileName => cb(fileName), /*recursive*/ false);
323323
this.customRecursiveWatchDirectory = createRecursiveDirectoryWatcher({
324324
directoryExists: path => this.directoryExists(path),
325-
getAccessileSortedChildDirectories: path => this.getDirectories(path),
325+
getAccessibleSortedChildDirectories: path => this.getDirectories(path),
326326
filePathComparer: this.useCaseSensitiveFileNames ? compareStringsCaseSensitive : compareStringsCaseInsensitive,
327327
watchDirectory,
328328
realpath: s => this.realpath(s)
@@ -333,7 +333,7 @@ interface Array<T> {}`
333333
const watchDirectory: HostWatchDirectory = (directory, cb) => watchFile(directory, () => cb(directory), PollingInterval.Medium);
334334
this.customRecursiveWatchDirectory = createRecursiveDirectoryWatcher({
335335
directoryExists: path => this.directoryExists(path),
336-
getAccessileSortedChildDirectories: path => this.getDirectories(path),
336+
getAccessibleSortedChildDirectories: path => this.getDirectories(path),
337337
filePathComparer: this.useCaseSensitiveFileNames ? compareStringsCaseSensitive : compareStringsCaseInsensitive,
338338
watchDirectory,
339339
realpath: s => this.realpath(s)

0 commit comments

Comments
 (0)