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

unify code

pull/347/head
jens1o 2017-04-17 16:04:12 +02:00
parent 7380acc49f
commit 6fea33db04
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Protocol/SymbolInformation.php
View File

@ -50,6 +50,8 @@ class SymbolInformation
{ {
$parent = $node->getAttribute('parentNode'); $parent = $node->getAttribute('parentNode');
$symbol = new self; $symbol = new self;
$setDefaultName = true;
if ( if (
$node instanceof Node\Expr\FuncCall $node instanceof Node\Expr\FuncCall
&& $node->name instanceof Node\Name && $node->name instanceof Node\Name
@ -60,6 +62,8 @@ class SymbolInformation
// constants with define() like // constants with define() like
// define('TEST_DEFINE_CONSTANT', false); // define('TEST_DEFINE_CONSTANT', false);
$symbol->kind = SymbolKind::CONSTANT; $symbol->kind = SymbolKind::CONSTANT;
$symbol->name = (string)$node->args[0]->value->value;
$setDefaultName = false;
} else if ($node instanceof Node\Stmt\Class_ || $node instanceof Node\Stmt\Trait_) { } else if ($node instanceof Node\Stmt\Class_ || $node instanceof Node\Stmt\Trait_) {
$symbol->kind = SymbolKind::CLASS_; $symbol->kind = SymbolKind::CLASS_;
} else if ($node instanceof Node\Stmt\Interface_) { } else if ($node instanceof Node\Stmt\Interface_) {
@ -90,23 +94,18 @@ class SymbolInformation
} }
if ($node instanceof Node\Name) { if ($node instanceof Node\Name) {
$symbol->name = (string)$node; $symbol->name = (string)$node;
} else if (
$node instanceof Node\Expr\FuncCall
&& $node->name instanceof Node\Name
&& strtolower((string)$node->name) === 'define'
&& isset($node->args[0])
&& $node->args[0]->value instanceof Node\Scalar\String_
) {
$symbol->name = (string)$node->args[0]->value->value;
} else if ($node instanceof Node\Expr\Assign || $node instanceof Node\Expr\AssignOp) { } else if ($node instanceof Node\Expr\Assign || $node instanceof Node\Expr\AssignOp) {
$symbol->name = $node->var->name; $symbol->name = $node->var->name;
} else if ($node instanceof Node\Expr\ClosureUse) { } else if ($node instanceof Node\Expr\ClosureUse) {
$symbol->name = $node->var; $symbol->name = $node->var;
} else if (isset($node->name)) { } else if (isset($node->name)) {
$symbol->name = (string)$node->name; if($setDefaultName) {
$symbol->name = (string)$node->name;
}
} else { } else {
return null; return null;
} }
$symbol->location = Location::fromNode($node); $symbol->location = Location::fromNode($node);
if ($fqn !== null) { if ($fqn !== null) {
$parts = preg_split('/(::|->|\\\\)/', $fqn); $parts = preg_split('/(::|->|\\\\)/', $fqn);