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

Small code reorganization

pull/38/head
Michal Niewrzal 2016-10-21 16:26:21 +02:00
parent d6200fc07a
commit 6a6a93c679
5 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Completion/CompletionContext.php
View File

@ -29,6 +29,11 @@ class CompletionContext
*/
private $lines;
/**
* @var \LanguageServer\Protocol\Range
*/
private $replacementRange;
public function __construct(PhpDocument $phpDocument)
{
$this->phpDocument = $phpDocument;
@ -36,6 +41,11 @@ class CompletionContext
}
public function getReplacementRange(): Range
{
return $this->replacementRange;
}
private function calculateReplacementRange(): Range
{
$line = $this->getLine($this->position->line);
if (!empty($line)) {
@ -64,6 +74,24 @@ class CompletionContext
public function setPosition(Position $position)
{
$this->position = $position;
$this->replacementRange = $this->calculateReplacementRange();
}
public function isObjectContext()
{
$line = $this->getLine($this->getPosition()->line);
if (empty($line)) {
return false;
}
$range = $this->getReplacementRange();
if (preg_match_all('@(\$this->|self::)@', $line, $matches, PREG_OFFSET_CAPTURE)) {
foreach ($matches[0] as $match) {
if (($match[1] + strlen($match[0])) === $range->start->character) {
return true;
}
}
}
return false;
}
public function getLine(int $line)

20
src/Completion/Strategies/ClassMembersStrategy.php
View File

@ -18,7 +18,7 @@ class ClassMembersStrategy implements ICompletionStrategy
*/
public function apply(CompletionContext $context, CompletionReporter $reporter)
{
if (!$this->isValidContext($context)) {
if (!$context->isObjectContext()) {
return;
}
$range = $context->getReplacementRange();
@ -28,7 +28,7 @@ class ClassMembersStrategy implements ICompletionStrategy
$nodeRange = Range::fromNode($node);
if ($nodeRange->includes($context->getPosition())) {
foreach ($nodes as $childFqn => $child) {
if (stripos($childFqn, $fqn) == 0 && $childFqn !== $fqn) {
if (stripos($childFqn, $fqn) === 0 && $childFqn !== $fqn) {
$reporter->reportByNode($child, $range, $childFqn);
}
}
@ -38,20 +38,4 @@ class ClassMembersStrategy implements ICompletionStrategy
}
}
private function isValidContext(CompletionContext $context)
{
$line = $context->getLine($context->getPosition()->line);
if (empty($line)) {
return false;
}
$range = $context->getReplacementRange($context);
if (preg_match_all('@(\$this->|self::)@', $line, $matches, PREG_OFFSET_CAPTURE)) {
foreach ($matches[0] as $match) {
if (($match[1] + strlen($match[0])) === $range->start->character) {
return true;
}
}
}
return false;
}
}

3
src/Completion/Strategies/GlobalElementsStrategy.php
View File

@ -20,6 +20,9 @@ class GlobalElementsStrategy implements ICompletionStrategy
*/
public function apply(CompletionContext $context, CompletionReporter $reporter)
{
if ($context->isObjectContext()) {
return;
}
$range = $context->getReplacementRange($context);
$project = $context->getPhpDocument()->project;
foreach ($project->getSymbols() as $fqn => $symbol) {

3
src/Completion/Strategies/KeywordsStrategy.php
View File

@ -98,6 +98,9 @@ class KeywordsStrategy implements ICompletionStrategy
*/
public function apply(CompletionContext $context, CompletionReporter $reporter)
{
if ($context->isObjectContext()) {
return;
}
$range = $context->getReplacementRange();
foreach (self::KEYWORDS as $keyword) {
$reporter->report($keyword, CompletionItemKind::KEYWORD, $keyword, $range);

2
src/Completion/Strategies/VariablesStrategy.php
View File

@ -59,7 +59,7 @@ class VariablesStrategy implements ICompletionStrategy
private function isValid(SymbolInformation $symbol)
{
return $symbol->kind == SymbolKind::FUNCTION || $symbol->kind == SymbolKind::METHOD;
return $symbol->kind === SymbolKind::FUNCTION || $symbol->kind === SymbolKind::METHOD;
}
}