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

Support load->helper

pull/483/head
Fuyao Zhao 2017-06-15 02:45:24 +08:00 committed by Alan Li
parent 39de0df8d8
commit 420c22bd93
1 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/NodeVisitor/DynamicLoader.php
View File

@ -31,7 +31,7 @@ class DynamicLoader extends NodeVisitorAbstract
return; return;
} }
if ($node->name !== 'model' && $node->name !== 'library') { if ($node->name !== 'model' && $node->name !== 'library' && $node->name !== 'helper') {
return; return;
} }
@ -45,26 +45,41 @@ class DynamicLoader extends NodeVisitorAbstract
return; return;
} }
// make sure the first argument is a string. $nameNode = NULL;
if (!($node->args[0]->value instanceof Node\Scalar\String_)) { if ($node->args[0]->value instanceof Node\Scalar\String_) {
return; // make sure the first argument is a string.
}
$argNode = $node->args[0]; if ($argSize == 2) {
$argstr = $argNode->value->value; $nameNode = $node->args[1]->value;
$argparts = explode('\\', $argstr); }
$modelName = array_pop($argparts); $this->createDefintion($node, $node->args[0]->value, $nameNode);
$fieldName = $modelName; } else if ($node->args[0]->value instanceof Node\Expr\Array_) {
$elems = $node->args[0]->value->items;
foreach ($elems as $item) {
if ($item->value instanceof Node\Scalar\String_) {
$this->createDefintion($node, $item->value, $nameNode);
}
}
}
}
public function createDefintion($callNode, $entityNode, $nameNode)
{
$entityString = $entityNode->value;
$entityParts = explode('\\', $entityString);
$enityName = array_pop($entityParts);
$fieldName = $enityName;
// deal with case like: $this->_CI->load->model('users_mdl', 'hahaha'); // deal with case like: $this->_CI->load->model('users_mdl', 'hahaha');
if ($argSize == 2) { if ($callNode->name = "model" && $nameNode !== NULL) {
if (!($node->args[1]->value instanceof Node\Scalar\String_)) { if (!($nameNode instanceof Node\Scalar\String_)) {
return; return;
} }
$fieldName = $node->args[1]->value->value; $fieldName = $nameNode->value;
} }
$enclosedClass = $node; $enclosedClass = $callNode;
$fqn = NULL; $fqn = NULL;
$classFqn = NULL; $classFqn = NULL;
while ($enclosedClass !== NULL) { while ($enclosedClass !== NULL) {
@ -81,18 +96,18 @@ class DynamicLoader extends NodeVisitorAbstract
return; return;
} }
// add fqn to nodes and definitions. // add fqn to nodes and definitions.
$this->definitionCollector->nodes[$fqn] = $argNode; $this->definitionCollector->nodes[$fqn] = $entityNode;
// Create symbol // Create symbol
// $classFqnParts = preg_split('/(::|->|\\\\)/', $fqn); // $classFqnParts = preg_split('/(::|->|\\\\)/', $fqn);
// array_pop($classFqnParts); // array_pop($classFqnParts);
// $classFqn = implode('\\', $classFqnParts); // $classFqn = implode('\\', $classFqnParts);
$sym = new SymbolInformation($fieldName, SymbolKind::PROPERTY, Location::fromNode($argNode), $classFqn); $sym = new SymbolInformation($fieldName, SymbolKind::PROPERTY, Location::fromNode($entityNode), $classFqn);
// Create type // Create type
array_push($argparts, ucwords($modelName)); array_push($entityParts, ucwords($enityName));
$typeName = implode('\\', $argparts); $typeName = implode('\\', $entityParts);
$type = new Types\Object_(new Fqsen('\\' . $typeName)); $type = new Types\Object_(new Fqsen('\\' . $typeName));
// Create defintion from symbol, type and all others // Create defintion from symbol, type and all others