From 48aa83e13ab540d14106de001b49f07b77fdab04 Mon Sep 17 00:00:00 2001
From: Armando Aguirre <armando.aguirre@microsoft.com>
Date: Thu, 16 Nov 2017 15:59:27 -0800
Subject: [PATCH 1/2] Modified Kendo regex to include -ui folders and files
 without min

---
 src/harness/unittests/tsserverProjectSystem.ts | 6 +++++-
 src/server/editorServices.ts                   | 2 +-
 src/server/typesMap.json                       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/harness/unittests/tsserverProjectSystem.ts b/src/harness/unittests/tsserverProjectSystem.ts
index ea573726eb8..c1a7b86495b 100644
--- a/src/harness/unittests/tsserverProjectSystem.ts
+++ b/src/harness/unittests/tsserverProjectSystem.ts
@@ -1518,6 +1518,10 @@ namespace ts.projectSystem {
                 path: "/q/lib/kendo/kendo.ui.min.js",
                 content: "unspecified"
             };
+            const kendoFile3 = {
+                path: "/q/lib/kendo-ui/kendo.all.js",
+                content: "unspecified"
+            };
             const officeFile1 = {
                 path: "/scripts/Office/1/excel-15.debug.js",
                 content: "unspecified"
@@ -1526,7 +1530,7 @@ namespace ts.projectSystem {
                 path: "/scripts/Office/1/powerpoint.js",
                 content: "unspecified"
             };
-            const files = [file1, minFile, kendoFile1, kendoFile2, officeFile1, officeFile2];
+            const files = [file1, minFile, kendoFile1, kendoFile2, kendoFile3, officeFile1, officeFile2];
             const host = createServerHost(files);
             const projectService = createProjectService(host);
             try {
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index 726621a540d..374b7b4cd0c 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -145,7 +145,7 @@ namespace ts.server {
         },
         "Kendo": {
             // e.g. /Kendo3/wwwroot/lib/kendo/kendo.all.min.js
-            match: /^(.*\/kendo)\/kendo\.all\.min\.js$/i,
+            match: /^(.*\/kendo(-ui)?)\/kendo\.all(\.min)?\.js$/i,
             exclude: [["^", 1, "/.*"]],
             types: ["kendo-ui"]
         },
diff --git a/src/server/typesMap.json b/src/server/typesMap.json
index 5e7df046dbe..9c8c9f45ea5 100644
--- a/src/server/typesMap.json
+++ b/src/server/typesMap.json
@@ -10,7 +10,7 @@
             "types": ["winjs"]
         },
         "Kendo": {
-            "match": "^(.*\\/kendo)\\/kendo\\.all\\.min\\.js$",
+            "match": "^(.*\\/kendo(-ui)?\\/kendo\\.all(\\.min)?\\.js$",
             "exclude": [["^", 1, "/.*"]],
             "types": ["kendo-ui"]
         },

From 49c169a5231bc47213044333fc0aca2ac4682573 Mon Sep 17 00:00:00 2001
From: Armando Aguirre <armando.aguirre@microsoft.com>
Date: Thu, 16 Nov 2017 16:16:10 -0800
Subject: [PATCH 2/2] Fixed unbalanced parenthesis

---
 src/server/typesMap.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/typesMap.json b/src/server/typesMap.json
index 9c8c9f45ea5..c3d2b9af831 100644
--- a/src/server/typesMap.json
+++ b/src/server/typesMap.json
@@ -10,7 +10,7 @@
             "types": ["winjs"]
         },
         "Kendo": {
-            "match": "^(.*\\/kendo(-ui)?\\/kendo\\.all(\\.min)?\\.js$",
+            "match": "^(.*\\/kendo(-ui)?)\\/kendo\\.all(\\.min)?\\.js$",
             "exclude": [["^", 1, "/.*"]],
             "types": ["kendo-ui"]
         },