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

Fix indentation

pull/357/head
Rob Lourens 2017-06-06 16:08:34 -07:00
parent 3cb0c03c81
commit 01e72430d0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CompletionProvider.php
View File

@ -158,7 +158,7 @@ class CompletionProvider
!( !(
$node->parent instanceof Node\Expression\ScopedPropertyAccessExpression && $node->parent instanceof Node\Expression\ScopedPropertyAccessExpression &&
$node->parent->memberName === $node) $node->parent->memberName === $node)
) { ) {
// Find variables, parameters and use statements in the scope // Find variables, parameters and use statements in the scope
$namePrefix = $node->getName() ?? ''; $namePrefix = $node->getName() ?? '';
foreach ($this->suggestVariablesAtNode($node, $namePrefix) as $var) { foreach ($this->suggestVariablesAtNode($node, $namePrefix) as $var) {

4
src/DefinitionResolver.php
View File

@ -642,11 +642,11 @@ class DefinitionResolver
} else { } else {
$classFqn = substr((string)$t->getFqsen(), 1); $classFqn = substr((string)$t->getFqsen(), 1);
} }
$fqn = $classFqn . '->' . $expr->memberName->getText($expr->getFileContents()); $fqn = $classFqn . '->' . $expr->memberName->getText($expr->getFileContents());
if ($expr->parent instanceof Node\Expression\CallExpression) { if ($expr->parent instanceof Node\Expression\CallExpression) {
$fqn .= '()'; $fqn .= '()';
} }
$def = $this->index->getDefinition($fqn); $def = $this->index->getDefinition($fqn);
if ($def !== null) { if ($def !== null) {
return $def->type; return $def->type;
} }