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

Add support for static access without prefix

pull/165/head
Felix Becker 2016-11-22 22:57:07 +01:00
parent 8f30819a17
commit 635e6b3a8d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -24,7 +24,7 @@
"bin": ["bin/php-language-server.php"], "bin": ["bin/php-language-server.php"],
"require": { "require": {
"php": ">=7.0", "php": ">=7.0",
"nikic/php-parser": "dev-master#c5cdd5ad73ac20d855b84fa6d0f1f22ebff2e302", "nikic/php-parser": "dev-master#e52ffc4447e034514339a03b450aab9cd625e37c",
"phpdocumentor/reflection-docblock": "^3.0", "phpdocumentor/reflection-docblock": "^3.0",
"sabre/event": "^5.0", "sabre/event": "^5.0",
"felixfbecker/advanced-json-rpc": "^2.0", "felixfbecker/advanced-json-rpc": "^2.0",

8
src/CompletionProvider.php
View File

@ -45,6 +45,10 @@ class CompletionProvider
{ {
$node = $document->getNodeAtPosition($position); $node = $document->getNodeAtPosition($position);
if ($node instanceof Node\Expr\Error) {
$node = $node->getAttribute('parentNode');
}
/** @var CompletionItem[] */ /** @var CompletionItem[] */
$items = []; $items = [];
@ -64,8 +68,8 @@ class CompletionProvider
$this->definitionResolver->resolveExpressionNodeToType($node->var) $this->definitionResolver->resolveExpressionNodeToType($node->var)
); );
} else { } else {
$prefixes = [is_string($node->class) ? $node->class : '']; $prefixes = [$node->class instanceof Node\Name ? (string)$node->class : ''];
} }
// If we are just filtering by the class, add the appropiate operator to the prefix // If we are just filtering by the class, add the appropiate operator to the prefix
// to filter the type of symbol // to filter the type of symbol
foreach ($prefixes as &$prefix) { foreach ($prefixes as &$prefix) {