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

Don't try to filter completions by member name, vscode does it

pull/357/head
Rob Lourens 2017-05-18 11:03:13 -07:00
parent 253f9b50a4
commit 91f13795d6
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/CompletionProvider.php
View File

@ -125,9 +125,10 @@ class CompletionProvider
// This can be made much more performant if the tree follows specific invariants.
$node = $doc->getNodeAtPosition($pos);
if($node !== null && ($offset = $pos->toOffset($node->getFileContents())) > $node->getEndPosition() &&
$node->parent->getLastChild() instanceof Tolerant\MissingToken) {
$offset = $node === null ? -1 : $pos->toOffset($node->getFileContents());
if ($node !== null && $offset > $node->getEndPosition() &&
$node->parent->getLastChild() instanceof Tolerant\MissingToken
) {
$node = $node->parent;
}
@ -184,10 +185,6 @@ class CompletionProvider
foreach ($prefixes as &$prefix) {
$prefix .= '->';
if ($node->memberName !== null && $node->memberName instanceof Tolerant\Token && $offset > $node->memberName->start) {
$memberNameText = $node->memberName->getText($node->getFileContents());
$prefix .= substr($memberNameText, 0, $offset - $node->memberName->start);
}
}
unset($prefix);
@ -223,17 +220,13 @@ class CompletionProvider
unset($prefix);
$memberName = $scoped->memberName->getText($scoped->getFileContents());
foreach ($this->index->getDefinitions() as $fqn => $def) {
foreach ($prefixes as $prefix) {
if (substr(strtolower($fqn), 0, strlen($prefix)) === strtolower($prefix) && !$def->isGlobal) {
if (empty($memberName) || strpos(substr(strtolower($fqn), 0), strtolower($memberName)) !== false) {
$list->items[] = CompletionItem::fromDefinition($def);
}
}
}
}
} elseif (TolerantParserHelpers::isConstantFetch($node) ||
($creation = $node->parent) instanceof Tolerant\Node\Expression\ObjectCreationExpression ||
(($creation = $node) instanceof Tolerant\Node\Expression\ObjectCreationExpression)) {