icedream
/
vscode-php-intellisense
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix(config): set a default memory limit (#235)

pull/227/merge
Eric Romano 2017-12-31 02:10:46 -05:00 committed by Felix Becker
parent 9558c8aaca
commit a3e2822904
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

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

2
src/extension.ts
View File

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