From d918b8ad4e341b984456df56979fb18c9e47aec7 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Wed, 19 Jul 2017 11:23:14 -0700
Subject: [PATCH] Remove duplicate helper (#17296)

---
 src/server/editorServices.ts |  8 ++++----
 src/server/scriptInfo.ts     |  2 +-
 src/server/utilities.ts      | 18 ------------------
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index 43cb429cfc5..9783af68663 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -703,15 +703,15 @@ namespace ts.server {
 
             switch (project.projectKind) {
                 case ProjectKind.External:
-                    removeItemFromSet(this.externalProjects, <ExternalProject>project);
+                    unorderedRemoveItem(this.externalProjects, <ExternalProject>project);
                     this.projectToSizeMap.delete((project as ExternalProject).externalProjectName);
                     break;
                 case ProjectKind.Configured:
-                    removeItemFromSet(this.configuredProjects, <ConfiguredProject>project);
+                    unorderedRemoveItem(this.configuredProjects, <ConfiguredProject>project);
                     this.projectToSizeMap.delete((project as ConfiguredProject).canonicalConfigFilePath);
                     break;
                 case ProjectKind.Inferred:
-                    removeItemFromSet(this.inferredProjects, <InferredProject>project);
+                    unorderedRemoveItem(this.inferredProjects, <InferredProject>project);
                     break;
             }
         }
@@ -790,7 +790,7 @@ namespace ts.server {
             // to the disk, and the server's version of the file can be out of sync.
             info.close();
 
-            removeItemFromSet(this.openFiles, info);
+            unorderedRemoveItem(this.openFiles, info);
 
             // collect all projects that should be removed
             let projectsToRemove: Project[];
diff --git a/src/server/scriptInfo.ts b/src/server/scriptInfo.ts
index b611bcb70e0..ce1de6f5040 100644
--- a/src/server/scriptInfo.ts
+++ b/src/server/scriptInfo.ts
@@ -232,7 +232,7 @@ namespace ts.server {
                     }
                     break;
                 default:
-                    removeItemFromSet(this.containingProjects, project);
+                    unorderedRemoveItem(this.containingProjects, project);
                     break;
             }
         }
diff --git a/src/server/utilities.ts b/src/server/utilities.ts
index 30146c0a928..174bcc17dfc 100644
--- a/src/server/utilities.ts
+++ b/src/server/utilities.ts
@@ -103,24 +103,6 @@ namespace ts.server {
         }
     }
 
-    export function removeItemFromSet<T>(items: T[], itemToRemove: T) {
-        if (items.length === 0) {
-            return;
-        }
-        const index = items.indexOf(itemToRemove);
-        if (index < 0) {
-            return;
-        }
-        if (index ===  items.length - 1) {
-            // last item - pop it
-            items.pop();
-        }
-        else {
-            // non-last item - replace it with the last one
-            items[index] = items.pop();
-        }
-    }
-
     export type NormalizedPath = string & { __normalizedPathTag: any };
 
     export function toNormalizedPath(fileName: string): NormalizedPath {