Skip to content

Commit 6c4c10c

Browse files
authored
Merge pull request #20115 from Microsoft/dev/billti/port20109toMaster
Port #20109 to master
2 parents 65908ef + 574cecc commit 6c4c10c

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

src/server/editorServices.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,8 @@ namespace ts.server {
155155
exclude: [["^", 1, "/.*"]], // Exclude that whole folder if the file indicated above is found in it
156156
types: ["office"] // @types package to fetch instead
157157
},
158-
"Minified files": {
159-
// e.g. /whatever/blah.min.js
160-
match: /^(.+\.min\.js)$/i,
158+
"References": {
159+
match: /^(.*\/_references\.js)$/i,
161160
exclude: [["^", 1, "$"]]
162161
}
163162
};
@@ -2287,7 +2286,13 @@ namespace ts.server {
22872286
}
22882287
}
22892288
if (!exclude) {
2290-
filesToKeep.push(proj.rootFiles[i]);
2289+
// Exclude any minified files that get this far
2290+
if (/^.+[\.-]min\.js$/.test(normalizedNames[i])) {
2291+
excludedFiles.push(normalizedNames[i]);
2292+
}
2293+
else {
2294+
filesToKeep.push(proj.rootFiles[i]);
2295+
}
22912296
}
22922297
}
22932298
}

src/server/typesMap.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"exclude": [["^", 1, "/.*"]],
2020
"types": ["office"]
2121
},
22-
"Minified files": {
23-
"match": "^(.+\\.min\\.js)$",
22+
"References": {
23+
"match": "^(.*\\/_references\\.js)$",
2424
"exclude": [["^", 1, "$"]]
2525
}
2626
},

0 commit comments

Comments
 (0)