Respond to PR comments

Andy Hanson · Andy Hanson · commit d7b6cc89b5ba · 2016-09-01T12:40:31.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -5372,7 +5372,7 @@ namespace ts {
             while (i > 0) {
                 i--;
                 if (isSubtypeOfAny(types[i], types)) {
-                    removeItemAtPreservingOrder(types, i);
+                    orderedRemoveItemAt(types, i);
                 }
             }
         }
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -1501,7 +1501,7 @@ namespace ts {
     }
 
     /** Remove an item from an array, moving everything to its right one space left. */
-    export function removeItemAtPreservingOrder<T>(array: T[], index: number): void {
+    export function orderedRemoveItemAt<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];
@@ -1516,7 +1516,7 @@ namespace ts {
     }
 
     /** Remove the *first* occurrence of `item` from the array. */
-    export function unorderedRemoveItem<T>(item: T, array: T[]): void {
+    export function unorderedRemoveItem<T>(array: T[], item: T): void {
         unorderedRemoveFirstItemWhere(array, element => element === item);
     }
 
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
@@ -285,7 +285,7 @@ namespace ts {
                 function removeFileWatcherCallback(filePath: string, callback: FileWatcherCallback) {
                     const callbacks = fileWatcherCallbacks[filePath];
                     if (callbacks) {
-                        unorderedRemoveItem(callback, callbacks);
+                        unorderedRemoveItem(callbacks, callback);
                         if (callbacks.length === 0) {
                             delete fileWatcherCallbacks[filePath];
                         }
diff --git a/src/compiler/tsc.ts b/src/compiler/tsc.ts
@@ -489,7 +489,7 @@ namespace ts {
             sourceFile.fileWatcher.close();
             sourceFile.fileWatcher = undefined;
             if (removed) {
-                unorderedRemoveItem(sourceFile.fileName, rootFileNames);
+                unorderedRemoveItem(rootFileNames, sourceFile.fileName);
             }
             startTimerForRecompilation();
         }
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
@@ -1772,7 +1772,7 @@ namespace Harness {
                     tsConfig.options.configFilePath = data.name;
 
                     // delete entry from the list
-                    ts.removeItemAtPreservingOrder(testUnitData, i);
+                    ts.orderedRemoveItemAt(testUnitData, i);
 
                     break;
                 }
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
@@ -205,7 +205,7 @@ namespace ts {
                 referenceCount: 0,
                 directoryName,
                 close: () => {
-                    unorderedRemoveItem(cbWithRecursive, callbacks);
+                    unorderedRemoveItem(callbacks, cbWithRecursive);
                     if (!callbacks.length) {
                         delete this.watchedDirectories[path];
                     }
@@ -239,7 +239,7 @@ namespace ts {
             callbacks.push(callback);
             return {
                 close: () => {
-                    unorderedRemoveItem(callback, callbacks);
+                    unorderedRemoveItem(callbacks, callback);
                     if (!callbacks.length) {
                         delete this.watchedFiles[path];
                     }
@@ -254,7 +254,7 @@ namespace ts {
         };
         readonly clearTimeout = (timeoutId: any): void => {
             if (typeof timeoutId === "number") {
-                unorderedRemoveItemAt(this.callbackQueue, timeoutId);
+                orderedRemoveItemAt(this.callbackQueue, timeoutId);
             }
         };
 
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -275,7 +275,7 @@ namespace ts.server {
         removeRoot(info: ScriptInfo) {
             if (this.filenameToScript.contains(info.path)) {
                 this.filenameToScript.remove(info.path);
-                unorderedRemoveItem(info, this.roots);
+                unorderedRemoveItem(this.roots, info);
                 this.resolvedModuleNames.remove(info.path);
                 this.resolvedTypeReferenceDirectives.remove(info.path);
             }
@@ -870,7 +870,7 @@ namespace ts.server {
                 project.directoryWatcher.close();
                 forEachProperty(project.directoriesWatchedForWildcards, watcher => { watcher.close(); });
                 delete project.directoriesWatchedForWildcards;
-                unorderedRemoveItem(project, this.configuredProjects);
+                unorderedRemoveItem(this.configuredProjects, project);
             }
             else {
                 for (const directory of project.directoriesWatchedForTsconfig) {
@@ -882,7 +882,7 @@ namespace ts.server {
                         delete project.projectService.directoryWatchersForTsconfig[directory];
                     }
                 }
-                unorderedRemoveItem(project, this.inferredProjects);
+                unorderedRemoveItem(this.inferredProjects, project);
             }
 
             const fileNames = project.getFileNames();
@@ -1007,7 +1007,7 @@ namespace ts.server {
                 }
             }
             else {
-                unorderedRemoveItem(info, this.openFilesReferenced);
+                unorderedRemoveItem(this.openFilesReferenced, info);
             }
             info.close();
         }
@@ -1514,13 +1514,13 @@ namespace ts.server {
                             // openFileRoots or openFileReferenced.
                             if (info.isOpen) {
                                 if (this.openFileRoots.indexOf(info) >= 0) {
-                                    unorderedRemoveItem(info, this.openFileRoots);
+                                    unorderedRemoveItem(this.openFileRoots, info);
                                     if (info.defaultProject && !info.defaultProject.isConfiguredProject()) {
                                         this.removeProject(info.defaultProject);
                                     }
                                 }
                                 if (this.openFilesReferenced.indexOf(info) >= 0) {
-                                    unorderedRemoveItem(info, this.openFilesReferenced);
+                                    unorderedRemoveItem(this.openFilesReferenced, info);
                                 }
                                 this.openFileRootsConfigured.push(info);
                                 info.defaultProject = project;
diff --git a/src/server/server.ts b/src/server/server.ts
@@ -267,7 +267,7 @@ namespace ts.server {
         }
 
         function removeFile(file: WatchedFile) {
-            unorderedRemoveItem(file, watchedFiles);
+            unorderedRemoveItem(watchedFiles, file);
         }
 
         return {

Original file line number	Diff line number	Diff line change
`@@ -5372,7 +5372,7 @@ namespace ts {`
`5372`	`5372`	`while (i > 0) {`
`5373`	`5373`	`i--;`
`5374`	`5374`	`if (isSubtypeOfAny(types[i], types)) {`
`5375`		`- removeItemAtPreservingOrder(types, i);`
	`5375`	`+ orderedRemoveItemAt(types, i);`
`5376`	`5376`	`}`
`5377`	`5377`	`}`
`5378`	`5378`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1501,7 +1501,7 @@ namespace ts {`
`1501`	`1501`	`}`
`1502`	`1502`
`1503`	`1503`	`/** Remove an item from an array, moving everything to its right one space left. */`
`1504`		`- export function removeItemAtPreservingOrder<T>(array: T[], index: number): void {`
	`1504`	`+ export function orderedRemoveItemAt<T>(array: T[], index: number): void {`
`1505`	`1505`	// This seems to be faster than either `array.splice(i, 1)` or `array.copyWithin(i, i+ 1)`.
`1506`	`1506`	`for (let i = index; i < array.length - 1; i++) {`
`1507`	`1507`	`array[i] = array[i + 1];`
`@@ -1516,7 +1516,7 @@ namespace ts {`
`1516`	`1516`	`}`
`1517`	`1517`
`1518`	`1518`	/** Remove the first occurrence of `item` from the array. */
`1519`		`- export function unorderedRemoveItem<T>(item: T, array: T[]): void {`
	`1519`	`+ export function unorderedRemoveItem<T>(array: T[], item: T): void {`
`1520`	`1520`	`unorderedRemoveFirstItemWhere(array, element => element === item);`
`1521`	`1521`	`}`
`1522`	`1522`
Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,7 @@ namespace ts {`
`285`	`285`	`function removeFileWatcherCallback(filePath: string, callback: FileWatcherCallback) {`
`286`	`286`	`const callbacks = fileWatcherCallbacks[filePath];`
`287`	`287`	`if (callbacks) {`
`288`		`- unorderedRemoveItem(callback, callbacks);`
	`288`	`+ unorderedRemoveItem(callbacks, callback);`
`289`	`289`	`if (callbacks.length === 0) {`
`290`	`290`	`delete fileWatcherCallbacks[filePath];`
`291`	`291`	`}`
Original file line number	Diff line number	Diff line change
`@@ -489,7 +489,7 @@ namespace ts {`
`489`	`489`	`sourceFile.fileWatcher.close();`
`490`	`490`	`sourceFile.fileWatcher = undefined;`
`491`	`491`	`if (removed) {`
`492`		`- unorderedRemoveItem(sourceFile.fileName, rootFileNames);`
	`492`	`+ unorderedRemoveItem(rootFileNames, sourceFile.fileName);`
`493`	`493`	`}`
`494`	`494`	`startTimerForRecompilation();`
`495`	`495`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1772,7 +1772,7 @@ namespace Harness {`
`1772`	`1772`	`tsConfig.options.configFilePath = data.name;`
`1773`	`1773`
`1774`	`1774`	`// delete entry from the list`
`1775`		`- ts.removeItemAtPreservingOrder(testUnitData, i);`
	`1775`	`+ ts.orderedRemoveItemAt(testUnitData, i);`
`1776`	`1776`
`1777`	`1777`	`break;`
`1778`	`1778`	`}`
Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ namespace ts.server {`
`275`	`275`	`removeRoot(info: ScriptInfo) {`
`276`	`276`	`if (this.filenameToScript.contains(info.path)) {`
`277`	`277`	`this.filenameToScript.remove(info.path);`
`278`		`- unorderedRemoveItem(info, this.roots);`
	`278`	`+ unorderedRemoveItem(this.roots, info);`
`279`	`279`	`this.resolvedModuleNames.remove(info.path);`
`280`	`280`	`this.resolvedTypeReferenceDirectives.remove(info.path);`
`281`	`281`	`}`
`@@ -870,7 +870,7 @@ namespace ts.server {`
`870`	`870`	`project.directoryWatcher.close();`
`871`	`871`	`forEachProperty(project.directoriesWatchedForWildcards, watcher => { watcher.close(); });`
`872`	`872`	`delete project.directoriesWatchedForWildcards;`
`873`		`- unorderedRemoveItem(project, this.configuredProjects);`
	`873`	`+ unorderedRemoveItem(this.configuredProjects, project);`
`874`	`874`	`}`
`875`	`875`	`else {`
`876`	`876`	`for (const directory of project.directoriesWatchedForTsconfig) {`
`@@ -882,7 +882,7 @@ namespace ts.server {`
`882`	`882`	`delete project.projectService.directoryWatchersForTsconfig[directory];`
`883`	`883`	`}`
`884`	`884`	`}`
`885`		`- unorderedRemoveItem(project, this.inferredProjects);`
	`885`	`+ unorderedRemoveItem(this.inferredProjects, project);`
`886`	`886`	`}`
`887`	`887`
`888`	`888`	`const fileNames = project.getFileNames();`
`@@ -1007,7 +1007,7 @@ namespace ts.server {`
`1007`	`1007`	`}`
`1008`	`1008`	`}`
`1009`	`1009`	`else {`
`1010`		`- unorderedRemoveItem(info, this.openFilesReferenced);`
	`1010`	`+ unorderedRemoveItem(this.openFilesReferenced, info);`
`1011`	`1011`	`}`
`1012`	`1012`	`info.close();`
`1013`	`1013`	`}`
`@@ -1514,13 +1514,13 @@ namespace ts.server {`
`1514`	`1514`	`// openFileRoots or openFileReferenced.`
`1515`	`1515`	`if (info.isOpen) {`
`1516`	`1516`	`if (this.openFileRoots.indexOf(info) >= 0) {`
`1517`		`- unorderedRemoveItem(info, this.openFileRoots);`
	`1517`	`+ unorderedRemoveItem(this.openFileRoots, info);`
`1518`	`1518`	`if (info.defaultProject && !info.defaultProject.isConfiguredProject()) {`
`1519`	`1519`	`this.removeProject(info.defaultProject);`
`1520`	`1520`	`}`
`1521`	`1521`	`}`
`1522`	`1522`	`if (this.openFilesReferenced.indexOf(info) >= 0) {`
`1523`		`- unorderedRemoveItem(info, this.openFilesReferenced);`
	`1523`	`+ unorderedRemoveItem(this.openFilesReferenced, info);`
`1524`	`1524`	`}`
`1525`	`1525`	`this.openFileRootsConfigured.push(info);`
`1526`	`1526`	`info.defaultProject = project;`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ namespace ts.server {`
`267`	`267`	`}`
`268`	`268`
`269`	`269`	`function removeFile(file: WatchedFile) {`
`270`		`- unorderedRemoveItem(file, watchedFiles);`
	`270`	`+ unorderedRemoveItem(watchedFiles, file);`
`271`	`271`	`}`
`272`	`272`
`273`	`273`	`return {`