From 693ffb4d5746d98973c90302d6eaab0552e16936 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Fri, 18 Oct 2019 16:14:38 -0700 Subject: [PATCH] Default maxTsServerMemory to 3GB --- extensions/typescript-language-features/package.json | 2 +- .../src/utils/configuration.ts | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/extensions/typescript-language-features/package.json b/extensions/typescript-language-features/package.json index 846c1a69d7c..af70f0ab56f 100644 --- a/extensions/typescript-language-features/package.json +++ b/extensions/typescript-language-features/package.json @@ -688,7 +688,7 @@ }, "typescript.tsserver.maxTsServerMemory": { "type": "number", - "default": 0, + "default": 3072, "description": "%configuration.tsserver.maxTsServerMemory%", "scope": "window" } diff --git a/extensions/typescript-language-features/src/utils/configuration.ts b/extensions/typescript-language-features/src/utils/configuration.ts index bf9c9e7493f..54c3a19b001 100644 --- a/extensions/typescript-language-features/src/utils/configuration.ts +++ b/extensions/typescript-language-features/src/utils/configuration.ts @@ -151,10 +151,12 @@ export class TypeScriptServiceConfiguration { } private static readMaxTsServerMemory(configuration: vscode.WorkspaceConfiguration): number { - const memoryInMB = configuration.get('typescript.tsserver.maxTsServerMemory', 0); - if (!Number.isSafeInteger(memoryInMB) || memoryInMB < 128) { - return 0; + const defaultMaxMemory = 3072; + const minimumMaxMemory = 128; + const memoryInMB = configuration.get('typescript.tsserver.maxTsServerMemory', defaultMaxMemory); + if (!Number.isSafeInteger(memoryInMB)) { + return defaultMaxMemory; } - return memoryInMB; + return Math.max(memoryInMB, minimumMaxMemory); } } -- GitLab