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

Allow getting type from define() node 

- fixes #286
pull/363/head
Stephan Unverwerth 2017-04-22 23:39:41 +02:00
parent b1cc7bf6b0
commit 2a19995dc4
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/DefinitionResolver.php
View File

@ -725,6 +725,19 @@ class DefinitionResolver
*/ */
public function getTypeFromNode(Node $node) public function getTypeFromNode(Node $node)
{ {
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_
&& isset($node->args[1])
) {
// constants with define() like
// define('TEST_DEFINE_CONSTANT', false);
return $this->resolveExpressionNodeToType($node->args[1]->value);
}
if ($node instanceof Node\Param) { if ($node instanceof Node\Param) {
// Parameters // Parameters
$docBlock = $node->getAttribute('parentNode')->getAttribute('docBlock'); $docBlock = $node->getAttribute('parentNode')->getAttribute('docBlock');
@ -883,7 +896,7 @@ class DefinitionResolver
return (string)$class->namespacedName . '::' . $node->name; return (string)$class->namespacedName . '::' . $node->name;
} }
} else if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name && strtolower((string)$node->name) === 'define') { } else if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name && strtolower((string)$node->name) === 'define') {
if (!isset($node->args[0]) || !($node->args[0]->value instanceof Node\Scalar\String_)) { if (!isset($node->args[0]) || !($node->args[0]->value instanceof Node\Scalar\String_) || !isset($node->args[1])) {
return null; return null;
} }
return (string)$node->args[0]->value->value; return (string)$node->args[0]->value->value;

1
src/Protocol/SymbolInformation.php
View File

@ -57,6 +57,7 @@ class SymbolInformation
&& strtolower((string)$node->name) === 'define' && strtolower((string)$node->name) === 'define'
&& isset($node->args[0]) && isset($node->args[0])
&& $node->args[0]->value instanceof Node\Scalar\String_ && $node->args[0]->value instanceof Node\Scalar\String_
&& isset($node->args[1])
) { ) {
// constants with define() like // constants with define() like
// define('TEST_DEFINE_CONSTANT', false); // define('TEST_DEFINE_CONSTANT', false);