Use removal helpers in more places

Andy Hanson · Andy Hanson · commit de6707e1d507 · 2016-08-15T14:01:52.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -5336,7 +5336,7 @@ namespace ts {
             while (i > 0) {
                 i--;
                 if (isSubtypeOfAny(types[i], types)) {
-                    types.splice(i, 1);
+                    removeItemAt(types, i);
                 }
             }
         }
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -1394,15 +1394,25 @@ namespace ts {
         }
     }
 
+    /** Remove an item from an array, moving everything to its right one space left. */
+    export function removeItemAt<T>(array: T[], index: number): void {
+        // This seems to be faster than either `array.splice(i, 1)` or `array.copyWithin(i, i+ 1)`.
+        for (let i = index; i < array.length - 1; i++) {
+            array[i] = array[i + 1];
+        }
+        array.pop();
+    }
+
+    /** Remove the *first* occurrence of `item` from the array. */
     export function removeItem<T>(item: T, array: T[]): void {
+        removeFirstItemWhere(array, element => element === item);
+    }
+
+    /** Remove the *first* element satisfying `predicate`. */
+    export function removeFirstItemWhere<T>(array: T[], predicate: (element: T) => boolean): void {
         for (let i = 0; i < array.length; i++) {
-            if (array[i] === item) {
-                // Move everything over to the left.
-                // This seems to be faster than either `array.splice(i, 1)` or `array.copyWithin(i, i+ 1)`.
-                for (; i < array.length - 1; i++) {
-                    array[i] = array[i + 1];
-                }
-                array.pop();
+            if (predicate(array[i])) {
+                removeItemAt(array, i);
                 break;
             }
         }
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
@@ -490,10 +490,7 @@ namespace ts {
             sourceFile.fileWatcher.close();
             sourceFile.fileWatcher = undefined;
             if (removed) {
-                const index = rootFileNames.indexOf(sourceFile.fileName);
-                if (index >= 0) {
-                    rootFileNames.splice(index, 1);
-                }
+                removeItem(sourceFile.fileName, rootFileNames);
             }
             startTimerForRecompilation();
         }
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
@@ -1558,7 +1558,7 @@ namespace Harness {
                     tsConfig.options.configFilePath = data.name;
 
                     // delete entry from the list
-                    testUnitData.splice(i, 1);
+                    ts.removeItemAt(testUnitData, i);
 
                     break;
                 }
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
@@ -214,12 +214,7 @@ namespace ts {
                 referenceCount: 0,
                 directoryName,
                 close: () => {
-                    for (let i = 0; i < callbacks.length; i++) {
-                        if (callbacks[i].cb === callback) {
-                            callbacks.splice(i, 1);
-                            break;
-                        }
-                    }
+                    removeFirstItemWhere(callbacks, cb => cb.cb === callback);
                     if (!callbacks.length) {
                         delete this.watchedDirectories[path];
                     }
@@ -253,8 +248,7 @@ namespace ts {
             callbacks.push(callback);
             return {
                 close: () => {
-                    const i = callbacks.indexOf(callback);
-                    callbacks.splice(i, 1);
+                    removeItem(callback, callbacks);
                     if (!callbacks.length) {
                         delete this.watchedFiles[path];
                     }
@@ -269,7 +263,7 @@ namespace ts {
         };
         readonly clearTimeout = (timeoutId: any): void => {
             if (typeof timeoutId === "number") {
-                this.callbackQueue.splice(timeoutId, 1);
+                removeItemAt(this.callbackQueue, timeoutId);
             }
         };
 
@@ -594,7 +588,7 @@ namespace ts {
                 content: `{
                     "compilerOptions": {
                         "target": "es6"
-                    }, 
+                    },
                     "files": [ "main.ts" ]
                 }`
             };
@@ -621,7 +615,7 @@ namespace ts {
                 content: `{
                     "compilerOptions": {
                         "target": "es6"
-                    }, 
+                    },
                     "files": [ "main.ts" ]
                 }`
             };

Original file line number	Diff line number	Diff line change
`@@ -5336,7 +5336,7 @@ namespace ts {`
`5336`	`5336`	`while (i > 0) {`
`5337`	`5337`	`i--;`
`5338`	`5338`	`if (isSubtypeOfAny(types[i], types)) {`
`5339`		`- types.splice(i, 1);`
	`5339`	`+ removeItemAt(types, i);`
`5340`	`5340`	`}`
`5341`	`5341`	`}`
`5342`	`5342`	`}`
Original file line number	Diff line number	Diff line change
`@@ -490,10 +490,7 @@ namespace ts {`
`490`	`490`	`sourceFile.fileWatcher.close();`
`491`	`491`	`sourceFile.fileWatcher = undefined;`
`492`	`492`	`if (removed) {`
`493`		`- const index = rootFileNames.indexOf(sourceFile.fileName);`
`494`		`- if (index >= 0) {`
`495`		`- rootFileNames.splice(index, 1);`
`496`		`- }`
	`493`	`+ removeItem(sourceFile.fileName, rootFileNames);`
`497`	`494`	`}`
`498`	`495`	`startTimerForRecompilation();`
`499`	`496`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1558,7 +1558,7 @@ namespace Harness {`
`1558`	`1558`	`tsConfig.options.configFilePath = data.name;`
`1559`	`1559`
`1560`	`1560`	`// delete entry from the list`
`1561`		`- testUnitData.splice(i, 1);`
	`1561`	`+ ts.removeItemAt(testUnitData, i);`
`1562`	`1562`
`1563`	`1563`	`break;`
`1564`	`1564`	`}`