Skip to content

Commit 7796e37

Browse files
authored
Merge pull request #16374 from minestarks/typingcacheversion
Set typings cache location per TS version
2 parents a2d5242 + 3bd5df7 commit 7796e37

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/server/server.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ namespace ts.server {
3535
} = require("os");
3636

3737
function getGlobalTypingsCacheLocation() {
38+
const versionMajorMinor = ts.version.match(/\d+\.\d+/)[0];
3839
switch (process.platform) {
3940
case "win32": {
4041
const basePath = process.env.LOCALAPPDATA ||
@@ -43,15 +44,15 @@ namespace ts.server {
4344
process.env.USERPROFILE ||
4445
(process.env.HOMEDRIVE && process.env.HOMEPATH && normalizeSlashes(process.env.HOMEDRIVE + process.env.HOMEPATH)) ||
4546
os.tmpdir();
46-
return combinePaths(normalizeSlashes(basePath), "Microsoft/TypeScript");
47+
return combinePaths(combinePaths(normalizeSlashes(basePath), "Microsoft/TypeScript"), versionMajorMinor);
4748
}
4849
case "openbsd":
4950
case "freebsd":
5051
case "darwin":
5152
case "linux":
5253
case "android": {
5354
const cacheLocation = getNonWindowsCacheLocation(process.platform === "darwin");
54-
return combinePaths(cacheLocation, "typescript");
55+
return combinePaths(combinePaths(cacheLocation, "typescript"), versionMajorMinor);
5556
}
5657
default:
5758
Debug.fail(`unsupported platform '${process.platform}'`);

0 commit comments

Comments
 (0)