maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Modified Kendo regex to include -ui folders and files without min

Browse source
This commit is contained in:
Armando Aguirre 2017-11-16 15:59:27 -08:00
parent 592ee00906
commit 48aa83e13a
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/harness/unittests/tsserverProjectSystem.ts
View file

@ -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 {

2
src/server/editorServices.ts
View file

@ -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"]
},

2
src/server/typesMap.json
View file

@ -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"]
},