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

Refactor TreeAnalyzer

pull/484/head
Stephan Unverwerth 2017-09-28 21:13:38 +02:00
parent a5c3adf24e
commit 1a253c1e02
1 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/TreeAnalyzer.php
View File

@ -49,18 +49,29 @@ class TreeAnalyzer
// TODO - docblock errors
$this->collectDefinitionsAndReferences($this->sourceFileNode);
$this->traverse($this->sourceFileNode);
}
/**
* Collects Parser diagnostic messages for the Node/Token
* and transforms them into LSP Format
*
* @param Node|Token $node
* @return Diagnostic
*/
private function collectDiagnostics($node)
{
if (($error = PhpParser\DiagnosticsProvider::checkDiagnostics($node)) !== null) {
$range = PhpParser\PositionUtilities::getRangeFromPosition($error->start, $error->length, $this->sourceFileNode->fileContents);
if ($error->kind == \Microsoft\PhpParser\DiagnosticKind::Error) {
switch ($error->kind) {
case \Microsoft\PhpParser\DiagnosticKind::Error:
$severity = DiagnosticSeverity::ERROR;
} else {
break;
case \Microsoft\PhpParser\DiagnosticKind::Warning:
default:
$severity = DiagnosticSeverity::WARNING;
break;
}
$this->diagnostics[] = new Diagnostic(
@ -76,36 +87,37 @@ class TreeAnalyzer
}
}
private function collectDefinitionsAndReferences(Node $sourceFileNode)
/**
* Recursive AST traversal to collect definitions/references and diagnostics
*
* @param Node|Token $currentNode The node/token to process
*/
private function traverse($currentNode)
{
$this->collectDiagnostics($sourceFileNode);
$this->collectDiagnostics($currentNode);
foreach ($sourceFileNode::CHILD_NAMES as $name) {
$node = $sourceFileNode->$name;
// Only update/descend into Nodes, Tokens are leaves
if ($currentNode instanceof Node) {
$this->collectDefinitionsAndReferences($currentNode);
if ($node === null) {
foreach ($currentNode::CHILD_NAMES as $name) {
$child = $currentNode->$name;
if ($child === null) {
continue;
}
if (\is_array($node)) {
foreach ($node as $child) {
if ($child !== null) {
if ($child instanceof Node) {
$this->update($child);
if (\is_array($child)) {
foreach ($child as $actualChild) {
if ($actualChild !== null) {
$this->traverse($actualChild);
}
}
} else {
$this->collectDiagnostics($child);
$this->traverse($child);
}
}
}
continue;
}
if ($node instanceof Node) {
$this->update($node);
} else {
$this->collectDiagnostics($node);
}
}
}
/**
@ -113,7 +125,7 @@ class TreeAnalyzer
*
* @param Node $node
*/
private function update(Node $node)
private function collectDefinitionsAndReferences(Node $node)
{
$fqn = ($this->definitionResolver)::getDefinedFqn($node);
// Only index definitions with an FQN (no variables)
@ -169,7 +181,6 @@ class TreeAnalyzer
}
}
}
$this->collectDefinitionsAndReferences($node);
}
/**