added VarCompleter, changed completer plugin api

Author: mkusher

bin/server.php

@@ -62,8 +62,8 @@
 
 $http->on('request', $handler);
 
-$socket->listen($port, $host);
+$socket->listen($port);
 
-echo "Started http server on {$host}:{$port}\n";
+echo "Started http server on 127.0.0.1:{$port}\n";
 
 $loop->run();

src/Command/KillCommand.php

@@ -4,7 +4,7 @@
 
 class KillCommand implements CommandInterface
 {
-    public function execute()
+    public function run()
     {
         die();
     }

src/Complete/CompleteEngine.php

@@ -16,7 +16,6 @@
 use Parser\Processor\IndexProcessor;
 use Parser\Processor\ScopeProcessor;
 use Parser\Processor\ProcessorInterface;
-use Symfony\Component\EventDispatcher\EventDispatcher;
 use Psr\Log\LoggerInterface;
 
 class CompleteEngine {
@@ -27,9 +26,8 @@ public function __construct(
         CompleterFactory $completer,
         IndexProcessor $indexProcessor,
         ScopeProcessor $scopeProcessor,
-        LoggerInterface $logger,
-        EventDispatcher $dispatcher
-    ){
+        LoggerInterface $logger
+    ) {
         $this->parser           = $parser;
         $this->generator        = $generator;
         $this->contextResolver  = $contextResolver;
@@ -38,7 +36,6 @@ public function __construct(
         $this->scopeProcessor   = $scopeProcessor;
         $this->logger           = $logger;
         $this->cachePool        = [];
-        $this->dispatcher       = $dispatcher;
     }
     public function createCompletion(
         Project $project,
@@ -83,15 +80,7 @@ public function createCompletion(
     }
     protected function findEntries(Project $project, Scope $scope, $badLine, $column, $lines){
         $context = $this->contextResolver->getContext($badLine, $project->getIndex(), $scope);
-        $completer = $this->completerFactory->getCompleter($context);
-        if (!$completer) {
-            $event = new CustomCompleterEvent($project, $context);
-            $this->dispatcher->dispatch(self::CUSTOM_COMPLETER, $event);
-            $completer = $event->completer;
-            if ($completer) {
-                $this->logger->debug(sprintf("Using custom completer %s", get_class($completer)));
-            }
-        }
+        $completer = $this->completerFactory->getCompleter($context, $project);
         if ($completer) {
             return $completer->getEntries($project, $context);
         }
@@ -181,8 +170,4 @@ private function isValidCache($file, $content){
     private $cachePool;
     /** @var LoggerInterface */
     private $logger;
-    /** @var EventDispatcher */
-    private $dispatcher;
-
-    const CUSTOM_COMPLETER = 'completer.custom';
 }

src/Complete/Completer/CompleterFactory.php

@@ -5,24 +5,33 @@
 use Entity\Completion\Context;
 use Entity\Completion\Scope;
 use Entity\Project;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+use Complete\CustomCompleterEvent;
+
+class CompleterFactory
+{
+    const CUSTOM_COMPLETER = 'completer.custom';
 
-class CompleterFactory {
     public function __construct(
         ClassNameCompleter $classNameCompleter,
         InterfaceNameCompleter $interfaceNameCompleter,
         NamespaceCompleter $namespaceCompleter,
         ObjectCompleter $objectCompleter,
         StaticCompleter $staticCompleter,
-        UseCompleter $useCompleter
+        UseCompleter $useCompleter,
+        VarCompleter $varCompleter,
+        EventDispatcher $dispatcher
     ) {
         $this->classNameCompleter = $classNameCompleter;
         $this->interfaceNameCompleter = $interfaceNameCompleter;
         $this->namespaceCompleter = $namespaceCompleter;
         $this->objectCompleter = $objectCompleter;
         $this->staticCompleter = $staticCompleter;
         $this->useCompleter = $useCompleter;
+        $this->varCompleter = $varCompleter;
+        $this->dispatcher = $dispatcher;
     }
-    public function getCompleter(Context $context)
+    public function getCompleter(Context $context, Project $project)
     {
         if ($context->isNamespace()) {
             return $this->namespaceCompleter;
@@ -36,6 +45,14 @@ public function getCompleter(Context $context)
             return $this->objectCompleter;
         } elseif ($context->isClassStatic()) {
             return $this->staticCompleter;
+        } elseif ($context->isVar()) {
+            return $this->varCompleter;
+        }
+        $event = new CustomCompleterEvent($project, $context);
+        $this->dispatcher->dispatch(self::CUSTOM_COMPLETER, $event);
+        $completer = $event->completer;
+        if ($completer) {
+            return $completer;
         }
         return null;
     }
@@ -46,4 +63,6 @@ public function getCompleter(Context $context)
     private $objectCompleter;
     private $staticCompleter;
     private $useCompleter;
+    private $varCompleter;
+    private $dispatcher;
 }

src/Complete/Completer/VarCompleter.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Complete\Completer;
+
+use Entity\Completion\Context;
+use Entity\Completion\Scope;
+use Entity\Project;
+use Entity\Node\Variable;
+use Entity\Completion\Entry;
+
+class VarCompleter implements CompleterInterface
+{
+    public function getEntries(Project $project, Context $context)
+    {
+        return array_map([$this, 'createEntry'], $context->getScope()->getVars());
+    }
+
+    protected function createEntry(Variable $var)
+    {
+        return new Entry(
+            $var->getName()
+        );
+    }
+}