Make single per directory native watchers now that we are using it as…

… default
microsoft · sheetalkamat · Sep 6, 2022 · Aug 15, 2022 · Aug 15, 2022 · Aug 15, 2022
commit 61a99bf49426ddd6c6e883a8856f161afa47b4a3
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
@@ -418,50 +418,41 @@ namespace ts {
         }
     }
 
-    function createSingleFileWatcherPerName(
-        watchFile: HostWatchFile,
-        useCaseSensitiveFileNames: boolean
-    ): HostWatchFile {
-        interface SingleFileWatcher {
-            watcher: FileWatcher;
-            refCount: number;
-        }
-        const cache = new Map<string, SingleFileWatcher>();
-        const callbacksCache = createMultiMap<FileWatcherCallback>();
+    interface SingleFileWatcher<T extends FileWatcherCallback | FsWatchCallback>{
+        watcher: FileWatcher;
+        callbacks: T[];
+    }
+    function createSingleWatcherPerName<T extends FileWatcherCallback | FsWatchCallback>(
+        cache: Map<SingleFileWatcher<T>>,
+        useCaseSensitiveFileNames: boolean,
+        name: string,
+        callback: T,
+        createWatcher: (callback: T) => FileWatcher,
+    ): FileWatcher {
         const toCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames);
+        const path = toCanonicalFileName(name);
+        const existing = cache.get(path);
+        if (existing) {
+            existing.callbacks.push(callback);
+        }
+        else {
+            cache.set(path, {
+                watcher: createWatcher((
+                    // Cant infer types correctly so lets satisfy checker
+                    (param1: any, param2: never, param3: any) => cache.get(path)?.callbacks.slice().forEach(cb => cb(param1, param2, param3))
+                ) as T),
+                callbacks: [callback]
+            });
+        }
 
-        return (fileName, callback, pollingInterval, options) => {
-            const path = toCanonicalFileName(fileName);
-            const existing = cache.get(path);
-            if (existing) {
-                existing.refCount++;
-            }
-            else {
-                cache.set(path, {
-                    watcher: watchFile(
-                        fileName,
-                        (fileName, eventKind, modifiedTime) => forEach(
-                            callbacksCache.get(path),
-                            cb => cb(fileName, eventKind, modifiedTime)
-                        ),
-                        pollingInterval,
-                        options
-                    ),
-                    refCount: 1
-                });
+        return {
+            close: () => {
+                const watcher = cache.get(path);
+                if (!watcher) return;
+                if (!orderedRemoveItem(watcher.callbacks, callback) || watcher.callbacks.length) return;
+                cache.delete(path);
+                closeFileWatcherOf(watcher);
             }
-            callbacksCache.add(path, callback);
-
-            return {
-                close: () => {
-                    const watcher = Debug.checkDefined(cache.get(path));
-                    callbacksCache.remove(path, callback);
-                    watcher.refCount--;
-                    if (watcher.refCount) return;
-                    cache.delete(path);
-                    closeFileWatcherOf(watcher);
-                }
-            };
         };
     }
 
@@ -886,7 +877,9 @@ namespace ts {
         inodeWatching,
         sysLog,
     }: CreateSystemWatchFunctions): { watchFile: HostWatchFile; watchDirectory: HostWatchDirectory; } {
-        const pollingWatchFile = createSingleFileWatcherPerName(pollingWatchFileWorker, useCaseSensitiveFileNames);
+        const pollingWatches = new Map<string, SingleFileWatcher<FileWatcherCallback>>();
+        const fsWatches = new Map<string, SingleFileWatcher<FsWatchCallback>>();
+        const fsWatchesRecursive = new Map<string, SingleFileWatcher<FsWatchCallback>>();
         let dynamicPollingWatchFile: HostWatchFile | undefined;
         let fixedChunkSizePollingWatchFile: HostWatchFile | undefined;
         let nonPollingWatchFile: HostWatchFile | undefined;
@@ -1064,13 +1057,39 @@ namespace ts {
             }
         }
 
+        function pollingWatchFile(fileName: string, callback: FileWatcherCallback, pollingInterval: PollingInterval, options: WatchOptions | undefined) {
+            return createSingleWatcherPerName(
+                pollingWatches,
+                useCaseSensitiveFileNames,
+                fileName,
+                callback,
+                cb => pollingWatchFileWorker(fileName, cb, pollingInterval, options),
+            );
+        }
         function fsWatch(
             fileOrDirectory: string,
             entryKind: FileSystemEntryKind,
             callback: FsWatchCallback,
             recursive: boolean,
             fallbackPollingInterval: PollingInterval,
             fallbackOptions: WatchOptions | undefined
+        ): FileWatcher {
+            return createSingleWatcherPerName(
+                recursive ? fsWatchesRecursive : fsWatches,
+                useCaseSensitiveFileNames,
+                fileOrDirectory,
+                callback,
+                cb => fsWatchHandlingPresence(fileOrDirectory, entryKind, cb, recursive, fallbackPollingInterval, fallbackOptions),
+            );
+        }
+
+        function fsWatchHandlingPresence(
+            fileOrDirectory: string,
+            entryKind: FileSystemEntryKind,
+            callback: FsWatchCallback,
+            recursive: boolean,
+            fallbackPollingInterval: PollingInterval,
+            fallbackOptions: WatchOptions | undefined
         ): FileWatcher {
             let lastDirectoryPartWithDirectorySeparator: string | undefined;
             let lastDirectoryPart: string | undefined;

diff --git a/...es/reference/tscWatch/programUpdates/two-watch-programs-are-not-affected-by-each-other.js b/...es/reference/tscWatch/programUpdates/two-watch-programs-are-not-affected-by-each-other.js
@@ -115,13 +115,10 @@ PolledWatches::
 FsWatches::
 /a/c/f2.ts:
   {}
-  {}
 /a/d/f3.ts:
   {}
-  {}
 /a/lib/lib.d.ts:
   {}
-  {}
 /a/b/f1.ts:
   {}
 

diff --git a/...jectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js b/...jectsWithReferences/on-transitive-references-in-different-folders-with-no-files-clause.js
@@ -252,10 +252,8 @@ FsWatches::
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
   {}
-  {}
 /user/username/projects/transitivereferences/a:
   {}
-  {}
 /user/username/projects/transitivereferences/refs:
   {}
 /user/username/projects/transitivereferences/c:
@@ -419,10 +417,8 @@ FsWatches::
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
   {}
-  {}
 /user/username/projects/transitivereferences/a:
   {}
-  {}
 /user/username/projects/transitivereferences/refs:
   {}
 /user/username/projects/transitivereferences/c:
@@ -519,10 +515,8 @@ FsWatches::
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
   {}
-  {}
 /user/username/projects/transitivereferences/a:
   {}
-  {}
 /user/username/projects/transitivereferences/c:
   {}
 /user/username/projects/transitivereferences/nrefs:
@@ -614,10 +608,8 @@ FsWatches::
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
   {}
-  {}
 /user/username/projects/transitivereferences/a:
   {}
-  {}
 /user/username/projects/transitivereferences/c:
   {}
 /user/username/projects/transitivereferences/refs:
@@ -709,7 +701,6 @@ FsWatches::
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
   {}
-  {}
 /user/username/projects/transitivereferences/a:
   {}
 /user/username/projects/transitivereferences/c:
@@ -795,7 +786,6 @@ FsWatches::
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
   {}
-  {}
 /user/username/projects/transitivereferences/a:
   {}
 /user/username/projects/transitivereferences/c:
@@ -976,14 +966,12 @@ FsWatches::
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
   {}
-  {}
 /user/username/projects/transitivereferences/c:
   {}
 /user/username/projects/transitivereferences/refs:
   {}
 /user/username/projects/transitivereferences/a:
   {}
-  {}
 
 exitCode:: ExitStatus.undefined
 
@@ -1074,7 +1062,6 @@ FsWatches::
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
   {}
-  {}
 /user/username/projects/transitivereferences/c:
   {}
 /user/username/projects/transitivereferences/refs:
@@ -1170,14 +1157,12 @@ FsWatches::
 FsWatchesRecursive::
 /user/username/projects/transitivereferences/b:
   {}
-  {}
 /user/username/projects/transitivereferences/c:
   {}
 /user/username/projects/transitivereferences/refs:
   {}
 /user/username/projects/transitivereferences/a:
   {}
-  {}
 
 exitCode:: ExitStatus.undefined
 
diff --git a/...ojectReferenceRedirect/when-packageJson-has-types-field-when-solution-is-already-built.js b/...ojectReferenceRedirect/when-packageJson-has-types-field-when-solution-is-already-built.js
@@ -239,7 +239,6 @@ FsWatchesRecursive::
   {}
 /user/username/projects/myproject/packages/a/src:
   {}
-  {}
 /user/username/projects/myproject/node_modules:
   {}
 

diff --git a/.../when-packageJson-has-types-field-with-preserveSymlinks-when-solution-is-already-built.js b/.../when-packageJson-has-types-field-with-preserveSymlinks-when-solution-is-already-built.js
@@ -239,7 +239,6 @@ FsWatchesRecursive::
   {}
 /user/username/projects/myproject/packages/a/src:
   {}
-  {}
 /user/username/projects/myproject/node_modules:
   {}
 

diff --git a/...ourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-preserveSymlinks.js b/...ourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-preserveSymlinks.js
@@ -99,7 +99,6 @@ FsWatchesRecursive::
   {}
 /user/username/projects/myproject/packages/a/src:
   {}
-  {}
 /user/username/projects/myproject/node_modules:
   {}
 

diff --git a/...ct/when-packageJson-has-types-field-with-scoped-package-when-solution-is-already-built.js b/...ct/when-packageJson-has-types-field-with-scoped-package-when-solution-is-already-built.js
@@ -239,7 +239,6 @@ FsWatchesRecursive::
   {}
 /user/username/projects/myproject/packages/a/src:
   {}
-  {}
 /user/username/projects/myproject/node_modules:
   {}
 

diff --git a/...s-types-field-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js b/...s-types-field-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js
@@ -239,7 +239,6 @@ FsWatchesRecursive::
   {}
 /user/username/projects/myproject/packages/a/src:
   {}
-  {}
 /user/username/projects/myproject/node_modules:
   {}
 

diff --git a/...nceRedirect/when-packageJson-has-types-field-with-scoped-package-with-preserveSymlinks.js b/...nceRedirect/when-packageJson-has-types-field-with-scoped-package-with-preserveSymlinks.js
@@ -99,7 +99,6 @@ FsWatchesRecursive::
   {}
 /user/username/projects/myproject/packages/a/src:
   {}
-  {}
 /user/username/projects/myproject/node_modules:
   {}
 

diff --git a/.../sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package.js b/.../sourceOfProjectReferenceRedirect/when-packageJson-has-types-field-with-scoped-package.js
@@ -99,7 +99,6 @@ FsWatchesRecursive::
   {}
 /user/username/projects/myproject/packages/a/src:
   {}
-  {}
 /user/username/projects/myproject/node_modules:
   {}
 

diff --git a/...s/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field.js b/...s/reference/tscWatch/sourceOfProjectReferenceRedirect/when-packageJson-has-types-field.js
@@ -99,7 +99,6 @@ FsWatchesRecursive::
   {}
 /user/username/projects/myproject/packages/a/src:
   {}
-  {}
 /user/username/projects/myproject/node_modules:
   {}
 

diff --git a/...tReferenceRedirect/when-referencing-file-from-subFolder-when-solution-is-already-built.js b/...tReferenceRedirect/when-referencing-file-from-subFolder-when-solution-is-already-built.js
@@ -239,7 +239,6 @@ FsWatchesRecursive::
   {}
 /user/username/projects/myproject/packages/a/src:
   {}
-  {}
 /user/username/projects/myproject/node_modules:
   {}
 

diff --git a/...n-referencing-file-from-subFolder-with-preserveSymlinks-when-solution-is-already-built.js b/...n-referencing-file-from-subFolder-with-preserveSymlinks-when-solution-is-already-built.js
@@ -239,7 +239,6 @@ FsWatchesRecursive::
   {}
 /user/username/projects/myproject/packages/a/src:
   {}
-  {}
 /user/username/projects/myproject/node_modules:
   {}
 

diff --git a/...eOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-preserveSymlinks.js b/...eOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-preserveSymlinks.js
@@ -99,7 +99,6 @@ FsWatchesRecursive::
   {}
 /user/username/projects/myproject/packages/a/src:
   {}
-  {}
 /user/username/projects/myproject/node_modules:
   {}
 

diff --git a/...hen-referencing-file-from-subFolder-with-scoped-package-when-solution-is-already-built.js b/...hen-referencing-file-from-subFolder-with-scoped-package-when-solution-is-already-built.js
@@ -239,7 +239,6 @@ FsWatchesRecursive::
   {}
 /user/username/projects/myproject/packages/a/src:
   {}
-  {}
 /user/username/projects/myproject/node_modules:
   {}
 

diff --git a/...rom-subFolder-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js b/...rom-subFolder-with-scoped-package-with-preserveSymlinks-when-solution-is-already-built.js
@@ -239,7 +239,6 @@ FsWatchesRecursive::
   {}
 /user/username/projects/myproject/packages/a/src:
   {}
-  {}
 /user/username/projects/myproject/node_modules:
   {}
 

diff --git a/...edirect/when-referencing-file-from-subFolder-with-scoped-package-with-preserveSymlinks.js b/...edirect/when-referencing-file-from-subFolder-with-scoped-package-with-preserveSymlinks.js
@@ -99,7 +99,6 @@ FsWatchesRecursive::
   {}
 /user/username/projects/myproject/packages/a/src:
   {}
-  {}
 /user/username/projects/myproject/node_modules:
   {}
 

diff --git a/...rceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package.js b/...rceOfProjectReferenceRedirect/when-referencing-file-from-subFolder-with-scoped-package.js
@@ -99,7 +99,6 @@ FsWatchesRecursive::
   {}
 /user/username/projects/myproject/packages/a/src:
   {}
-  {}
 /user/username/projects/myproject/node_modules:
   {}
 

diff --git a/...ference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder.js b/...ference/tscWatch/sourceOfProjectReferenceRedirect/when-referencing-file-from-subFolder.js
@@ -99,7 +99,6 @@ FsWatchesRecursive::
   {}
 /user/username/projects/myproject/packages/a/src:
   {}
-  {}
 /user/username/projects/myproject/node_modules:
   {}
 

diff --git a/...aselines/reference/tsserver/watchEnvironment/when-watchFile-is-single-watcher-per-file.js b/...aselines/reference/tsserver/watchEnvironment/when-watchFile-is-single-watcher-per-file.js
@@ -61,7 +61,6 @@ PolledWatches::
 FsWatches::
 /user/username/projects/myproject/tsconfig.json:
   {}
-  {}
 /user/username/projects/myproject:
   {}
 /a/lib/lib.d.ts:

diff --git a/...lines/reference/tsserver/watchEnvironment/with-excludeDirectories-option-in-configFile.js b/...lines/reference/tsserver/watchEnvironment/with-excludeDirectories-option-in-configFile.js
@@ -66,6 +66,5 @@ FsWatches::
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
   {}
-  {}
 /user/username/projects/myproject/node_modules:
   {}
diff --git a/...es/reference/tsserver/watchEnvironment/with-excludeDirectories-option-in-configuration.js b/...es/reference/tsserver/watchEnvironment/with-excludeDirectories-option-in-configuration.js
@@ -66,4 +66,3 @@ FsWatches::
 FsWatchesRecursive::
 /user/username/projects/myproject/src:
   {}
-  {}
-Original file line number
+Diff line change
@@ Expand Up / @@ -239,7 +239,6 @@ FsWatchesRecursive:: @@
       {}
     /user/username/projects/myproject/packages/a/src:
       {}
-      {}
     /user/username/projects/myproject/node_modules:
       {}
@@ Expand Down @@