fix(memoryLimit): use default memory limit of 4G - 1

closes #240
pull/241/merge v2.2.4
Felix Becker 2018-01-02 10:29:34 -08:00
parent 339b8a3b89
commit 79edb58199
2 changed files with 2 additions and 2 deletions

View File

@ -94,7 +94,7 @@
"properties": {
"php.memoryLimit": {
"type": "string",
"default": "4G",
"default": "4095M",
"description": "The memory limit of the php language server. [Number][K|M|G]. Use '-1' to allow unlimited use of the RAM (default is 4G).",
"pattern": "^\\d+[KMG]?$"
},

View File

@ -12,7 +12,7 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
const conf = vscode.workspace.getConfiguration('php');
const executablePath = conf.get<string>('executablePath') || 'php';
const memoryLimit = conf.get<string>('memoryLimit') || '4G';
const memoryLimit = conf.get<string>('memoryLimit') || '4095M';
if (memoryLimit !== '-1' && !/^\d+[KMG]?$/.exec(memoryLimit)) {
const selected = await vscode.window.showErrorMessage(