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

Merge 539ae711e9 into 331f59a6a4

pull/306/merge
Zach Peacock 2018-11-11 11:49:42 +00:00 committed by GitHub
parent 331f59a6a4 539ae711e9
commit c1a447cb28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/extension.ts
View File

@ -17,6 +17,8 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
const memoryLimit = conf.get<string>('memoryLimit') || '4095M'; const memoryLimit = conf.get<string>('memoryLimit') || '4095M';
const tcpHost = conf.get<string>('tcpHost') || '127.0.0.1';
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(
'The memory limit you\'d provided is not numeric, nor "-1" nor valid php shorthand notation!', 'The memory limit you\'d provided is not numeric, nor "-1" nor valid php shorthand notation!',
@ -78,11 +80,11 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
resolve({ reader: socket, writer: socket }); resolve({ reader: socket, writer: socket });
}); });
// Listen on random port // Listen on random port
server.listen(0, '127.0.0.1', () => { server.listen(0, tcpHost, () => {
// The server is implemented in PHP // The server is implemented in PHP
const childProcess = spawn(executablePath, [ const childProcess = spawn(executablePath, [
context.asAbsolutePath(path.join('vendor', 'felixfbecker', 'language-server', 'bin', 'php-language-server.php')), context.asAbsolutePath(path.join('vendor', 'felixfbecker', 'language-server', 'bin', 'php-language-server.php')),
'--tcp=127.0.0.1:' + server.address().port, '--tcp=' + tcpHost + ':' + server.address().port,
'--memory-limit=' + memoryLimit '--memory-limit=' + memoryLimit
]); ]);
childProcess.stderr.on('data', (chunk: Buffer) => { childProcess.stderr.on('data', (chunk: Buffer) => {