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

Merging with master

pull/681/head
Gabriel Noé González 2018-11-10 14:22:55 +01:00
parent 1b81ac0bbd
commit df898ec633
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/CompletionProvider.php
View File

@ -272,7 +272,7 @@ class CompletionProvider
$fqns = FqnUtilities\getFqnsFromType(
$classType = $this->definitionResolver->resolveExpressionNodeToType($scoped->scopeResolutionQualifier)
);
$isInMethodDeclaration = null !== $node->getFirstAncestor(\Microsoft\PhpParser\Node\MethodDeclaration::class);
// Append :: operator to only get static members of all parents
$prefixes = [];
foreach ($this->expandParentFqns($fqns) as $prefix) {
@ -282,7 +282,9 @@ class CompletionProvider
// Collect all definitions that match any of the prefixes
foreach ($this->index->getDefinitions() as $fqn => $def) {
foreach ($prefixes as $prefix) {
if (substr(strtolower($fqn), 0, strlen($prefix)) === strtolower($prefix) && $def->isMember) {
if (substr(strtolower($fqn), 0, strlen($prefix)) === strtolower($prefix) &&
$def->isMember &&
$def->isVisible($prefix, $prefixes[0], $isInMethodDeclaration)) {
$list->items[] = CompletionItemFactory::fromDefinition($def);
}
}