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

Fixed local variable detection and containerName generation in SymbolFinder

pull/31/head
Stephan Unverwerth 2016-09-22 23:17:20 +02:00
parent 1a006deee5
commit e6b48c751e
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/SymbolFinder.php
View File

@ -4,8 +4,6 @@ declare(strict_types = 1);
namespace LanguageServer;
use PhpParser\{NodeVisitorAbstract, Node};
use PhpParser\Builder\Function_;
use PhpParser\Node\Stmt\ClassMethod;
use LanguageServer\Protocol\{SymbolInformation, SymbolKind, Range, Position, Location};
@ -65,8 +63,18 @@ class SymbolFinder extends NodeVisitorAbstract
// If we enter a named node, push its name onto name stack.
// Else push the current name onto stack.
if (isset($node->name) && is_string($node->name) && !empty($node->name)){
array_push($this->nameStack, $node->name);
if (!empty($node->name) && (is_string($node->name) || method_exists($node->name, '__toString')) && !empty((string)$node->name)) {
if (empty($containerName)) {
array_push($this->nameStack, (string)$node->name);
}
else {
if ($node instanceof Stmt\ClassMethod) {
array_push($this->nameStack, $containerName . '::' . (string)$node->name);
}
else {
array_push($this->nameStack, $containerName . '\\' . (string)$node->name);
}
}
}
else {
array_push($this->nameStack, $containerName);
@ -78,11 +86,10 @@ class SymbolFinder extends NodeVisitorAbstract
}
// if we enter a method or function, increase the function counter
if ($node instanceof Function_ || $node instanceof ClassMethod) {
if ($node instanceof Stmt\Function_ || $node instanceof Stmt\ClassMethod) {
$this->functionCount++;
}
$symbol = end($this->symbols);
$kind = self::NODE_SYMBOL_KIND_MAP[$class];
// exclude non-global variable symbols.