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

Cleanup

pull/357/head
Rob Lourens 2017-06-07 11:10:12 -07:00
parent eef824488e
commit aba798aaba
6 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ParserHelpers.php
View File

@ -15,7 +15,6 @@ class ParserHelpers
( (
$node instanceof Node\QualifiedName && $node instanceof Node\QualifiedName &&
( (
// $node->parent instanceof Node\Statement\ExpressionStatement ||
$parent instanceof Node\Expression || $parent instanceof Node\Expression ||
$parent instanceof Node\DelimitedList\ExpressionList || $parent instanceof Node\DelimitedList\ExpressionList ||
$parent instanceof Node\ArrayElement || $parent instanceof Node\ArrayElement ||

11
src/ParserKind.php
View File

@ -1,11 +0,0 @@
<?php
namespace LanguageServer;
class ParserKind
{
const PHP_PARSER = 1;
const TOLERANT_PHP_PARSER = 2;
const DIAGNOSTIC_TOLERANT_PHP_PARSER = 3;
const DIAGNOSTIC_PHP_PARSER = 4;
}

2
src/Protocol/Range.php
View File

@ -30,7 +30,7 @@ class Range
* @param Node $node * @param Node $node
* @return self * @return self
*/ */
public static function fromNode($node) public static function fromNode(Node $node)
{ {
$range = PhpParser\PositionUtilities::getRangeFromPosition($node->getStart(), $node->getWidth(), $node->getFileContents()); $range = PhpParser\PositionUtilities::getRangeFromPosition($node->getStart(), $node->getWidth(), $node->getFileContents());

12
src/Protocol/SymbolInformation.php
View File

@ -107,18 +107,6 @@ class SymbolInformation
$symbol->name = $node->variableName->getText($node); $symbol->name = $node->variableName->getText($node);
} else if (!isset($symbol->name)) { } else if (!isset($symbol->name)) {
return null; return null;
// if (!isset($symbol->name)) {
// if ($node instanceof Node\Name) {
// $symbol->name = (string)$node;
// } else if ($node instanceof Node\Expr\Assign || $node instanceof Node\Expr\AssignOp) {
// $symbol->name = $node->var->name;
// } else if ($node instanceof Node\Expr\ClosureUse) {
// $symbol->name = $node->var;
// } else if (isset($node->name)) {
// $symbol->name = (string)$node->name;
// } else {
// return null;
// }
} }
$symbol->location = Location::fromNode($node); $symbol->location = Location::fromNode($node);

2
src/Server/TextDocument.php
View File

@ -49,7 +49,7 @@ class TextDocument
/** /**
* @var ReadableIndex * @var ReadableIndex
*/ */
public $index; protected $index;
/** /**
* @var \stdClass|null * @var \stdClass|null

8
src/TreeAnalyzer.php
View File

@ -17,8 +17,10 @@ class TreeAnalyzer
/** @var Node */ /** @var Node */
private $stmts; private $stmts;
/** @var Diagnostic[] */
private $diagnostics; private $diagnostics;
/** @var string */
private $content; private $content;
/** /**
@ -65,11 +67,11 @@ class TreeAnalyzer
$this->update($node); $this->update($node);
} }
if (($_error = PhpParser\DiagnosticsProvider::checkDiagnostics($node)) !== null) { if (($error = PhpParser\DiagnosticsProvider::checkDiagnostics($node)) !== null) {
$range = PhpParser\PositionUtilities::getRangeFromPosition($_error->start, $_error->length, $this->content); $range = PhpParser\PositionUtilities::getRangeFromPosition($error->start, $error->length, $this->content);
$this->diagnostics[] = new Diagnostic( $this->diagnostics[] = new Diagnostic(
$_error->message, $error->message,
new Range( new Range(
new Position($range->start->line, $range->start->character), new Position($range->start->line, $range->start->character),
new Position($range->end->line, $range->start->character) new Position($range->end->line, $range->start->character)