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

Fix missing diagnostics for nodes

pull/484/head
Stephan Unverwerth 2017-09-28 13:48:59 +02:00
parent a4739430f8
commit 73e8907874
1 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/TreeAnalyzer.php
View File

@ -52,8 +52,34 @@ class TreeAnalyzer
$this->collectDefinitionsAndReferences($this->sourceFileNode); $this->collectDefinitionsAndReferences($this->sourceFileNode);
} }
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) {
$severity = DiagnosticSeverity::ERROR;
}
else {
$severity = DiagnosticSeverity::WARNING;
}
$this->diagnostics[] = new Diagnostic(
$error->message,
new Range(
new Position($range->start->line, $range->start->character),
new Position($range->end->line, $range->start->character)
),
null,
$severity,
'php'
);
}
}
private function collectDefinitionsAndReferences(Node $sourceFileNode) private function collectDefinitionsAndReferences(Node $sourceFileNode)
{ {
$this->collectDiagnostics($sourceFileNode);
foreach ($sourceFileNode::CHILD_NAMES as $name) { foreach ($sourceFileNode::CHILD_NAMES as $name) {
$node = $sourceFileNode->$name; $node = $sourceFileNode->$name;
@ -63,9 +89,14 @@ class TreeAnalyzer
if (\is_array($node)) { if (\is_array($node)) {
foreach ($node as $child) { foreach ($node as $child) {
if ($child !== null) {
if ($child instanceof Node) { if ($child instanceof Node) {
$this->update($child); $this->update($child);
} }
else {
$this->collectDiagnostics($child);
}
}
} }
continue; continue;
} }
@ -73,20 +104,8 @@ class TreeAnalyzer
if ($node instanceof Node) { if ($node instanceof Node) {
$this->update($node); $this->update($node);
} }
else {
if (($error = PhpParser\DiagnosticsProvider::checkDiagnostics($node)) !== null) { $this->collectDiagnostics($node);
$range = PhpParser\PositionUtilities::getRangeFromPosition($error->start, $error->length, $this->sourceFileNode->fileContents);
$this->diagnostics[] = new Diagnostic(
$error->message,
new Range(
new Position($range->start->line, $range->start->character),
new Position($range->end->line, $range->start->character)
),
null,
DiagnosticSeverity::ERROR,
'php'
);
} }
} }
} }