icedream
/
php-language-server
1
0
Fork 0
Code Releases Activity

Improved param counting

pull/250/head
Ivan Bozhanov 2017-01-20 17:00:32 +02:00
parent a7c094eacb
commit 8995611f6c
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/SignatureHelpProvider.php
View File

@ -165,8 +165,27 @@ class SignatureHelpProvider
$params = ltrim($params, "( "); $params = ltrim($params, "( ");
if (strlen(trim($params))) { if (strlen(trim($params))) {
try { try {
$params = $this->parser->parse('<?php $a = [' . $params . '];', $this->parserErrorHandler)[0]->expr->items; $lex = new \PhpParser\Lexer();
$help->activeParameter = count($params) - 1; $lex->startLexing('<?php $a = [ ' . $params, $this->parserErrorHandler);
$value = null;
$lex->getNextToken($value);
$lex->getNextToken($value);
$lex->getNextToken($value);
$params = 0;
$stack = [];
while ($value !== "\0") {
$lex->getNextToken($value);
if ($value === ',' && !count($stack)) {
$help->activeParameter++;
}
if ($value === '(') {
$stack[] = ')';
} else if ($value === '[') {
$stack[] = ']';
} else if (count($stack) && $value === $stack[count($stack)-1]) {
array_pop($stack);
}
}
} catch (\Exception $ignore) { } } catch (\Exception $ignore) { }
} }
$help->signatures[] = $signature; $help->signatures[] = $signature;