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

Abort traversal in NodeAtPositionFinder (#305)

pull/324/head
Matthew Brown 2017-02-17 18:28:10 -05:00 committed by Felix Becker
parent 5d2ab8f369
commit cbfd70d398
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/NodeVisitor/NodeAtPositionFinder.php
View File

@ -3,7 +3,7 @@ declare(strict_types = 1);
namespace LanguageServer\NodeVisitor;
use PhpParser\{NodeVisitorAbstract, Node};
use PhpParser\{NodeVisitorAbstract, Node, NodeTraverser};
use LanguageServer\Protocol\{Position, Range};
/**
@ -15,7 +15,7 @@ class NodeAtPositionFinder extends NodeVisitorAbstract
/**
* The node at the position, if found
*
* @var Node
* @var Node|null
*/
public $node;
@ -34,9 +34,12 @@ class NodeAtPositionFinder extends NodeVisitorAbstract
public function leaveNode(Node $node)
{
$range = Range::fromNode($node);
if (!isset($this->node) && $range->includes($this->position)) {
$this->node = $node;
if ($this->node === null) {
$range = Range::fromNode($node);
if ($range->includes($this->position)) {
$this->node = $node;
return NodeTraverser::STOP_TRAVERSAL;
}
}
}
}