From 5dc02ef5ccf267c0f4a07f4571d0b8d603a9eefa Mon Sep 17 00:00:00 2001
From: Ryan Cavanaugh <RyanCavanaugh@users.noreply.github.com>
Date: Tue, 31 Oct 2017 18:38:00 -0700
Subject: [PATCH] Use a different RegEx

---
 src/compiler/core.ts                          |  8 ++++++-
 .../unittests/tsserverProjectSystem.ts        | 22 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index c9b644b22ce..626480035b1 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -2417,7 +2417,13 @@ namespace ts {
      * Takes a string like "jquery-min.4.2.3" and returns "jquery"
      */
     export function removeMinAndVersionNumbers(fileName: string) {
-        return fileName.replace(/((?:\.|-)min(?=\.|$))|((?:-|\.)\d+)/g, "");
+        const match = /((\w|(-(?!min)))+)(\.|-)?.*/.exec(fileName);
+        if (match) {
+            return match[1];
+        }
+        else {
+            return fileName;
+        }
     }
 
     export interface ObjectAllocator {
diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index fb2bbec6741..c72a27e173e 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -1496,6 +1496,28 @@ namespace ts.projectSystem {
             }
         });
 
+        it("removes version numbers correctly", () => {
+            const testData: [string, string][] = [
+                ["jquery-max", "jquery-max"],
+                ["jquery.min", "jquery"],
+                ["jquery-min.4.2.3", "jquery"],
+                ["jquery.4.2-test.js", "jquery"],
+                ["jquery.min.4.2.1", "jquery"],
+                ["jquery.7.min.js", "jquery"],
+                ["jquery.7.min-beta", "jquery"],
+                ["minimum", "minimum"],
+                ["min", "min"],
+                ["min.3.2", "min"],
+                ["jquery", "jquery"]
+            ];
+            const suffixes = [".js", ".jsx", ""];
+            for (const t of testData) {
+                for (const suf of suffixes) {
+                    assert.equal(removeMinAndVersionNumbers(t[0] + suf), t[1]);
+                }
+            }
+        });
+
         it("ignores files excluded by a legacy safe type list", () => {
             const file1 = {
                 path: "/a/b/bliss.js",