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

fix issue where call expression references weren't being properly indexed

pull/357/head
Sara Itani 2017-04-12 12:51:24 -07:00
parent 0b0cad2dc0
commit 35ce3af324
1 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/TolerantDefinitionResolver.php
View File

@ -306,32 +306,11 @@ class TolerantDefinitionResolver implements DefinitionResolverInterface
// does this work for function calls? // does this work for function calls?
return $name; return $name;
} }
/*elseif ($node instanceof Tolerant\Node\Expression\CallExpression || ($node = $node->getFirstAncestor(Tolerant\Node\Expression\CallExpression::class)) !== null) {
if ($node->callableExpression instanceof Tolerant\Node\Expression\ScopedPropertyAccessExpression) {
$qualifier = $node->callableExpression->scopeResolutionQualifier;
if ($qualifier instanceof Tolerant\Token) {
// resolve this/self/parent
} elseif ($qualifier instanceof Tolerant\Node\QualifiedName) {
$name = $qualifier->getResolvedName() ?? $qualifier->getNamespacedName();
$name .= "::";
$memberName = $node->callableExpression->memberName;
if ($memberName instanceof Tolerant\Token) {
$name .= $memberName->getText($node->getFileContents());
} elseif ($memberName instanceof Tolerant\Node\Expression\Variable) {
$name .= $memberName->getText();
} else {
return null;
}
$name .= "()";
return $name;
}
}
}*/
else if ( else if (
($node instanceof Tolerant\Node\Expression\CallExpression && ($node instanceof Tolerant\Node\Expression\CallExpression &&
($access = $node->callableExpression) instanceof Tolerant\Node\Expression\MemberAccessExpression) || ( ($access = $node->callableExpression) instanceof Tolerant\Node\Expression\MemberAccessExpression)
($access = $node) instanceof Tolerant\Node\Expression\MemberAccessExpression) || (($access = $node) instanceof Tolerant\Node\Expression\MemberAccessExpression)
) { ) {
if ($access->memberName instanceof Tolerant\Node\Expression) { if ($access->memberName instanceof Tolerant\Node\Expression) {
// Cannot get definition if right-hand side is expression // Cannot get definition if right-hand side is expression
@ -373,7 +352,8 @@ class TolerantDefinitionResolver implements DefinitionResolverInterface
// var_dump($classFqn); // var_dump($classFqn);
} }
$memberSuffix = '->' . (string)($access->memberName->getText() ?? $access->memberName->getText($node->getFileContents())); $memberSuffix = '->' . (string)($access->memberName->getText() ?? $access->memberName->getText($node->getFileContents()));
if ($node instanceof Tolerant\Node\Expression\CallExpression) { if ($node instanceof Tolerant\Node\Expression\CallExpression || $node->parent instanceof Tolerant\Node\Expression\CallExpression) {
// TODO - this is redundant
$memberSuffix .= '()'; $memberSuffix .= '()';
} }
// Find the right class that implements the member // Find the right class that implements the member