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

Rename CompletionItem to CompletionItemFactory

pull/680/head
Michael V 2018-11-10 19:02:54 +01:00
parent 118115fca5
commit b625b0e956
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/CompletionProvider.php
View File

@ -256,7 +256,7 @@ class CompletionProvider
// Collect fqn definitions // Collect fqn definitions
foreach ($this->index->getChildDefinitionsForFqn($parentFqn) as $fqn => $def) { foreach ($this->index->getChildDefinitionsForFqn($parentFqn) as $fqn => $def) {
if (substr($fqn, 0, $prefixLen) === $prefix && $def->isMember) { if (substr($fqn, 0, $prefixLen) === $prefix && $def->isMember) {
$list->items[] = CompletionItem::fromDefinition($def); $list->items[] = CompletionItemFactory::fromDefinition($def);
} }
} }
} }
@ -287,7 +287,7 @@ class CompletionProvider
// Collect fqn definitions // Collect fqn definitions
foreach ($this->index->getChildDefinitionsForFqn($parentFqn) as $fqn => $def) { foreach ($this->index->getChildDefinitionsForFqn($parentFqn) as $fqn => $def) {
if (substr(strtolower($fqn), 0, $prefixLen) === $prefix && $def->isMember) { if (substr(strtolower($fqn), 0, $prefixLen) === $prefix && $def->isMember) {
$list->items[] = CompletionItem::fromDefinition($def); $list->items[] = CompletionItemFactory::fromDefinition($def);
} }
} }
} }
@ -475,7 +475,7 @@ class CompletionProvider
if (!nameStartsWith($fqn, $prefix)) { if (!nameStartsWith($fqn, $prefix)) {
continue; continue;
} }
$completion = CompletionItem::fromDefinition($def); $completion = CompletionItemFactory::fromDefinition($def);
if ($insertFullyQualified) { if ($insertFullyQualified) {
$completion->insertText = '\\' . $fqn; $completion->insertText = '\\' . $fqn;
} }
@ -505,7 +505,7 @@ class CompletionProvider
if ($requireCanBeInstantiated && !$definition->canBeInstantiated) { if ($requireCanBeInstantiated && !$definition->canBeInstantiated) {
continue; continue;
} }
$completionItem = CompletionItem::fromDefinition($definition); $completionItem = CompletionItemFactory::fromDefinition($definition);
$completionItem->insertText = $alias; $completionItem->insertText = $alias;
yield (string)$aliasFqn => $completionItem; yield (string)$aliasFqn => $completionItem;
} }
@ -553,7 +553,7 @@ class CompletionProvider
if (!$def->roamed || !nameStartsWith($fqn, $prefix)) { if (!$def->roamed || !nameStartsWith($fqn, $prefix)) {
continue; continue;
} }
$completionItem = CompletionItem::fromDefinition($def); $completionItem = CompletionItemFactory::fromDefinition($def);
// Second-guessing the user here - do not trust roaming to work. If the same symbol is // Second-guessing the user here - do not trust roaming to work. If the same symbol is
// inserted in the current namespace, the code will stop working. // inserted in the current namespace, the code will stop working.
$completionItem->insertText = '\\' . $fqn; $completionItem->insertText = '\\' . $fqn;