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

Merge pull request #20115 from Microsoft/dev/billti/port20109toMaster

Browse source 
Port #20109 to master
This commit is contained in:
Bill Ticehurst 2017-11-17 21:03:17 -08:00 committed by GitHub
parent 65908ef8ba 574ceccf0a
commit 6c4c10c7cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/server/editorServices.ts
View file

@ -155,9 +155,8 @@ namespace ts.server {
exclude: [["^", 1, "/.*"]], // Exclude that whole folder if the file indicated above is found in it
types: ["office"] // @types package to fetch instead
},
"Minified files": {
// e.g. /whatever/blah.min.js
match: /^(.+\.min\.js)$/i,
"References": {
match: /^(.*\/_references\.js)$/i,
exclude: [["^", 1, "$"]]
}
};
@ -2287,7 +2286,13 @@ namespace ts.server {
}
}
if (!exclude) {
filesToKeep.push(proj.rootFiles[i]);
// Exclude any minified files that get this far
if (/^.+[\.-]min\.js$/.test(normalizedNames[i])) {
excludedFiles.push(normalizedNames[i]);
}
else {
filesToKeep.push(proj.rootFiles[i]);
}
}
}
}

4
src/server/typesMap.json
View file

@ -19,8 +19,8 @@
"exclude": [["^", 1, "/.*"]],
"types": ["office"]
},
"Minified files": {
"match": "^(.+\\.min\\.js)$",
"References": {
"match": "^(.*\\/_references\\.js)$",
"exclude": [["^", 1, "$"]]
}
},