Remove last external use of unorderedRemoveFirstItemWhere

Andy Hanson · Andy Hanson · commit e3a1a981136d · 2016-08-22T06:30:41.000-07:00
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -1415,7 +1415,7 @@ namespace ts {
     }
 
     /** Remove the *first* element satisfying `predicate`. */
-    export function unorderedRemoveFirstItemWhere<T>(array: T[], predicate: (element: T) => boolean): void {
+    function unorderedRemoveFirstItemWhere<T>(array: T[], predicate: (element: T) => boolean): void {
         for (let i = 0; i < array.length; i++) {
             if (predicate(array[i])) {
                 unorderedRemoveItemAt(array, i);
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
@@ -209,12 +209,13 @@ namespace ts {
         watchDirectory(directoryName: string, callback: DirectoryWatcherCallback, recursive: boolean): DirectoryWatcher {
             const path = this.toPath(directoryName);
             const callbacks = lookUp(this.watchedDirectories, path) || (this.watchedDirectories[path] = []);
-            callbacks.push({ cb: callback, recursive });
+            const cbWithRecursive = { cb: callback, recursive };
+            callbacks.push(cbWithRecursive);
             return {
                 referenceCount: 0,
                 directoryName,
                 close: () => {
-                    unorderedRemoveFirstItemWhere(callbacks, cb => cb.cb === callback);
+                    unorderedRemoveItem(cbWithRecursive, callbacks);
                     if (!callbacks.length) {
                         delete this.watchedDirectories[path];
                     }

Original file line number	Diff line number	Diff line change
`@@ -1415,7 +1415,7 @@ namespace ts {`
`1415`	`1415`	`}`
`1416`	`1416`
`1417`	`1417`	/** Remove the first element satisfying `predicate`. */
`1418`		`- export function unorderedRemoveFirstItemWhere<T>(array: T[], predicate: (element: T) => boolean): void {`
	`1418`	`+ function unorderedRemoveFirstItemWhere<T>(array: T[], predicate: (element: T) => boolean): void {`
`1419`	`1419`	`for (let i = 0; i < array.length; i++) {`
`1420`	`1420`	`if (predicate(array[i])) {`
`1421`	`1421`	`unorderedRemoveItemAt(array, i);`