Revert "Do not watch child directories of the sym link folders"

This reverts commit 3280865.

Author: sheetalkamat

src/compiler/sys.ts

@@ -337,7 +337,6 @@ namespace ts {
         getAccessileSortedChildDirectories(path: string): ReadonlyArray<string>;
         directoryExists(dir: string): boolean;
         filePathComparer: Comparer<string>;
-        realpath(s: string): string;
     }
 
     /**
@@ -393,12 +392,9 @@ namespace ts {
         function watchChildDirectories(parentDir: string, existingChildWatches: ChildWatches, callback: DirectoryWatcherCallback): ChildWatches {
             let newChildWatches: DirectoryWatcher[] | undefined;
             enumerateInsertsAndDeletes<string, DirectoryWatcher>(
-                host.directoryExists(parentDir) ? mapDefined(host.getAccessileSortedChildDirectories(parentDir), child => {
-                    const childFullName = getNormalizedAbsolutePath(child, parentDir);
-                    return host.filePathComparer(childFullName, host.realpath(childFullName)) === Comparison.EqualTo ? childFullName : undefined;
-                }) : emptyArray,
+                host.directoryExists(parentDir) ? host.getAccessileSortedChildDirectories(parentDir) : emptyArray,
                 existingChildWatches,
-                (child, childWatcher) => host.filePathComparer(child, childWatcher.dirName),
+                (child, childWatcher) => host.filePathComparer(getNormalizedAbsolutePath(child, parentDir), childWatcher.dirName),
                 createAndAddChildDirectoryWatcher,
                 closeFileWatcher,
                 addChildDirectoryWatcher
@@ -410,7 +406,7 @@ namespace ts {
              * Create new childDirectoryWatcher and add it to the new ChildDirectoryWatcher list
              */
             function createAndAddChildDirectoryWatcher(childName: string) {
-                const result = createDirectoryWatcher(childName, callback);
+                const result = createDirectoryWatcher(getNormalizedAbsolutePath(childName, parentDir), callback);
                 addChildDirectoryWatcher(result);
             }
 
@@ -605,7 +601,14 @@ namespace ts {
                 exit(exitCode?: number): void {
                     process.exit(exitCode);
                 },
-                realpath,
+                realpath(path: string): string {
+                    try {
+                        return _fs.realpathSync(path);
+                    }
+                    catch {
+                        return path;
+                    }
+                },
                 debugMode: some(<string[]>process.execArgv, arg => /^--(inspect|debug)(-brk)?(=\d+)?$/i.test(arg)),
                 tryEnableSourceMapsForHost() {
                     try {
@@ -697,8 +700,7 @@ namespace ts {
                     filePathComparer: useCaseSensitiveFileNames ? compareStringsCaseSensitive : compareStringsCaseInsensitive,
                     directoryExists,
                     getAccessileSortedChildDirectories: path => getAccessibleFileSystemEntries(path).directories,
-                    watchDirectory,
-                    realpath
+                    watchDirectory
                 });
 
                 return (directoryName, callback, recursive) => {
@@ -1041,15 +1043,6 @@ namespace ts {
                 return filter<string>(_fs.readdirSync(path), dir => fileSystemEntryExists(combinePaths(path, dir), FileSystemEntryKind.Directory));
             }
 
-            function realpath(path: string): string {
-                try {
-                    return _fs.realpathSync(path);
-                }
-                catch {
-                    return path;
-                }
-            }
-
             function getModifiedTime(path: string) {
                 try {
                     return _fs.statSync(path).mtime;

src/harness/unittests/tscWatchMode.ts

@@ -2358,50 +2358,6 @@ declare module "fs" {
             it("uses non recursive dynamic polling when renaming file in subfolder", () => {
                 verifyRenamingFileInSubFolder(TestFSWithWatch.Tsc_WatchDirectory.DynamicPolling);
             });
-
-            it("when there are symlinks to folders in recursive folders", () => {
-                const cwd = "/home/user/projects/myproject";
-                const file1: FileOrFolder = {
-                    path: `${cwd}/src/file.ts`,
-                    content: `import * as a from "a"`
-                };
-                const tsconfig: FileOrFolder = {
-                    path: `${cwd}/tsconfig.json`,
-                    content: `{ "compilerOptions": { "extendedDiagnostics": true, "traceResolution": true }}`
-                };
-                const realA: FileOrFolder = {
-                    path: `${cwd}/node_modules/reala/index.d.ts`,
-                    content: `export {}`
-                };
-                const realB: FileOrFolder = {
-                    path: `${cwd}/node_modules/realb/index.d.ts`,
-                    content: `export {}`
-                };
-                const symLinkA: FileOrFolder = {
-                    path: `${cwd}/node_modules/a`,
-                    symLink: `${cwd}/node_modules/reala`
-                };
-                const symLinkB: FileOrFolder = {
-                    path: `${cwd}/node_modules/b`,
-                    symLink: `${cwd}/node_modules/realb`
-                };
-                const symLinkBInA: FileOrFolder = {
-                    path: `${cwd}/node_modules/reala/node_modules/b`,
-                    symLink: `${cwd}/node_modules/b`
-                };
-                const symLinkAInB: FileOrFolder = {
-                    path: `${cwd}/node_modules/realb/node_modules/a`,
-                    symLink: `${cwd}/node_modules/a`
-                };
-                const files = [file1, tsconfig, realA, realB, symLinkA, symLinkB, symLinkBInA, symLinkAInB];
-                const environmentVariables = createMap<string>();
-                environmentVariables.set("TSC_WATCHDIRECTORY", TestFSWithWatch.Tsc_WatchDirectory.NonRecursiveWatchDirectory);
-                const host = createWatchedSystem(files, { environmentVariables, currentDirectory: cwd });
-                createWatchOfConfigFile("tsconfig.json", host);
-                checkWatchedDirectories(host, emptyArray, /*recursive*/ true);
-                checkWatchedDirectories(host, [cwd, `${cwd}/node_modules`, `${cwd}/node_modules/@types`, `${cwd}/node_modules/reala`, `${cwd}/node_modules/realb`,
-                    `${cwd}/node_modules/reala/node_modules`, `${cwd}/node_modules/realb/node_modules`, `${cwd}/src`], /*recursive*/ false);
-            });
         });
     });
 }

src/harness/virtualFileSystemWithWatch.ts

@@ -314,8 +314,7 @@ interface Array<T> {}`
                     directoryExists: path => this.directoryExists(path),
                     getAccessileSortedChildDirectories: path => this.getDirectories(path),
                     filePathComparer: this.useCaseSensitiveFileNames ? compareStringsCaseSensitive : compareStringsCaseInsensitive,
-                    watchDirectory,
-                    realpath: s => this.realpath(s)
+                    watchDirectory
                 });
             }
             else if (tscWatchDirectory === Tsc_WatchDirectory.NonRecursiveWatchDirectory) {
@@ -324,8 +323,7 @@ interface Array<T> {}`
                     directoryExists: path => this.directoryExists(path),
                     getAccessileSortedChildDirectories: path => this.getDirectories(path),
                     filePathComparer: this.useCaseSensitiveFileNames ? compareStringsCaseSensitive : compareStringsCaseInsensitive,
-                    watchDirectory,
-                    realpath: s => this.realpath(s)
+                    watchDirectory
                 });
             }
             else if (tscWatchDirectory === Tsc_WatchDirectory.DynamicPolling) {
@@ -335,8 +333,7 @@ interface Array<T> {}`
                     directoryExists: path => this.directoryExists(path),
                     getAccessileSortedChildDirectories: path => this.getDirectories(path),
                     filePathComparer: this.useCaseSensitiveFileNames ? compareStringsCaseSensitive : compareStringsCaseInsensitive,
-                    watchDirectory,
-                    realpath: s => this.realpath(s)
+                    watchDirectory
                 });
             }
         }
@@ -652,7 +649,7 @@ interface Array<T> {}`
 
             const realpath = this.realpath(path);
             if (path !== realpath) {
-                return this.getRealFsEntry(isFsEntry, this.toPath(realpath));
+                return this.getRealFsEntry(isFsEntry, realpath as Path);
             }
 
             return undefined;