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

Return empty array instead of null for empty definitions result

pull/64/head
Kaloyan Raev 2016-10-11 09:18:56 +03:00
parent e75c1592fc
commit a1b5f0631e
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Server/TextDocument.php
View File

@ -96,18 +96,18 @@ class TextDocument
*
* @param TextDocumentIdentifier $textDocument The text document
* @param Position $position The position inside the text document
* @return Location|Location[]|null
* @return Location|Location[]
*/
public function definition(TextDocumentIdentifier $textDocument, Position $position)
{
$document = $this->project->getDocument($textDocument->uri);
$node = $document->getNodeAtPosition($position);
if ($node === null) {
return null;
return array();
}
$def = $document->getDefinitionByNode($node);
if ($def === null) {
return null;
return array();
}
return Location::fromNode($def);
}

12
tests/Server/TextDocument/DefinitionTest.php
View File

@ -25,6 +25,18 @@ class DefinitionTest extends TestCase
$project->getDocument('use')->updateContent(file_get_contents(__DIR__ . '/../../../fixtures/use.php'));
}
public function testDefinitionFileBeginning() {
// |<?php
$result = $this->textDocument->definition(new TextDocumentIdentifier('references'), new Position(0, 0));
$this->assertEquals([], json_decode(json_encode($result), true));
}
public function testDefinitionEmptyResult() {
// namespace keyword
$result = $this->textDocument->definition(new TextDocumentIdentifier('references'), new Position(2, 4));
$this->assertEquals([], json_decode(json_encode($result), true));
}
public function testDefinitionForClassLike()
{
// $obj = new TestClass();