refactored custom completer event

Author: mkusher

src/Application/CLI/Router.php

@@ -24,7 +24,7 @@ public function getCommand($commandName, Container $container)
         } elseif ($commandName == 'plugin') {
             $command = new \Command\PluginCommand($container);
         } else {
-            $command = new \Command\ErrorCommand($container);
+            $command = new \Command\ErrorCommand();
         }
         return $command;
     }

src/Application/HTTP/Router.php

@@ -24,7 +24,7 @@ public function getCommand($commandName, Container $container)
         } elseif ($commandName == 'save') {
             $command = new \Command\SaveCommand($container);
         } else {
-            $command = new \Command\ErrorCommand($container);
+            $command = new \Command\ErrorCommand();
         }
         return $command;
     }

src/Complete/CompleteEngine.php

@@ -10,11 +10,13 @@
 use Entity\Completion\Entry;
 use Entity\Completion\Context;
 use Complete\Completer\CompleterFactory;
+use Complete\Completer\CompleterInterface;
 use Complete\Resolver\ContextResolver;
 use Complete\Resolver\ScopeResolver;
 use Parser\Processor\IndexProcessor;
 use Parser\Processor\ScopeProcessor;
 use Parser\Processor\ProcessorInterface;
+use Symfony\Component\EventDispatcher\EventDispatcher;
 use Psr\Log\LoggerInterface;
 
 class CompleteEngine {
@@ -25,7 +27,8 @@ public function __construct(
         CompleterFactory $completer,
         IndexProcessor $indexProcessor,
         ScopeProcessor $scopeProcessor,
-        LoggerInterface $logger
+        LoggerInterface $logger,
+        EventDispatcher $dispatcher
     ){
         $this->parser           = $parser;
         $this->generator        = $generator;
@@ -35,6 +38,7 @@ public function __construct(
         $this->scopeProcessor   = $scopeProcessor;
         $this->logger           = $logger;
         $this->cachePool        = [];
+        $this->dispatcher       = $dispatcher;
     }
     public function createCompletion(
         Project $project,
@@ -80,7 +84,12 @@ 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){
+        if (!$completer) {
+            $event = new CustomCompleterEvent($project, $context);
+            $this->dispatcher->dispatch(self::CUSTOM_COMPLETER, $event);
+            $completer = $event->completer;
+        }
+        if ($completer) {
             return $completer->getEntries($project, $context);
         }
         return [];
@@ -168,4 +177,8 @@ private function isValidCache($file, $content){
     private $scopeProcessor;
     private $cachePool;
     private $logger;
+    /** @var EventDispatcher */
+    private $dispatcher;
+
+    const CUSTOM_COMPLETER = 'completer.custom';
 }

src/Complete/Completer/ClassNameCompleter.php

@@ -9,7 +9,7 @@
 class ClassNameCompleter implements CompleterInterface {
     public function getEntries(Project $project, Context $context){
         $entries = [];
-        $postfix = trim($context->getData());
+        $postfix = trim("");
         foreach($project->getIndex()->getClasses() as $fqcn => $class){
             if(!empty($postfix) && strpos($fqcn, $postfix) === false){
                 continue;

src/Complete/Completer/CompleterFactory.php

@@ -2,7 +2,6 @@
 
 namespace Complete\Completer;
 
-use Symfony\Component\EventDispatcher\EventDispatcher;
 use Entity\Completion\Context;
 use Entity\Completion\Scope;
 use Entity\Project;
@@ -14,20 +13,17 @@ public function __construct(
         NamespaceCompleter $namespaceCompleter,
         ObjectCompleter $objectCompleter,
         StaticCompleter $staticCompleter,
-        UseCompleter $useCompleter,
-        EventDispatcher $dispatcher
+        UseCompleter $useCompleter
     ) {
         $this->classNameCompleter = $classNameCompleter;
         $this->interfaceNameCompleter = $interfaceNameCompleter;
         $this->namespaceCompleter = $namespaceCompleter;
         $this->objectCompleter = $objectCompleter;
         $this->staticCompleter = $staticCompleter;
         $this->useCompleter = $useCompleter;
-        $this->dispatcher = $dispatcher;
     }
     public function getCompleter(Context $context)
     {
-        $event = new CustomCompleterEvent($context);
         if ($context->isNamespace()) {
             return $this->namespaceCompleter;
         } elseif ($context->isUse()) {
@@ -40,10 +36,8 @@ public function getCompleter(Context $context)
             return $this->objectCompleter;
         } elseif ($context->isClassStatic()) {
             return $this->staticCompleter;
-        } else {
-            $this->dispatcher->dispatch(self::CUSTOM_COMPLETER, $event);
         }
-        return $event->completer;
+        return null;
     }
 
     private $classNameCompleter;
@@ -52,7 +46,4 @@ public function getCompleter(Context $context)
     private $objectCompleter;
     private $staticCompleter;
     private $useCompleter;
-    private $dispatcher;
-
-    const CUSTOM_COMPLETER = 'completer.custom';
 }

…plete/Completer/CustomCompleterEvent.php src/Complete/CustomCompleterEvent.phpsrc/Complete/Completer/CustomCompleterEvent.php renamed to src/Complete/CustomCompleterEvent.php src/Complete/Completer/CustomCompleterEvent.php renamed to src/Complete/CustomCompleterEvent.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace Complete\Completer;
+namespace Complete;
 
 use Entity\Completion\Context;
+use Entity\Project;
 use Symfony\Component\EventDispatcher\Event;
 
 class CustomCompleterEvent extends Event
@@ -11,8 +12,11 @@ class CustomCompleterEvent extends Event
     public $completer = null;
     /** @var Context */
     public $context;
-    public function __construct(Context $context)
+    /** @var Project */
+    public $project;
+    public function __construct(Project $project, Context $context)
     {
         $this->context = $context;
+        $this->project = $project;
     }
 }

src/Entity/Completion/Context.php

@@ -56,12 +56,17 @@ public function getData() {
     public function addType($type) {
         $this->type = $this->type | $type;
     }
+
     /**
      * @return Scope
      */
     public function getScope() {
         return $this->scope;
     }
+
+    /**
+     * @return Token
+     */
     public function getToken() {
         return $this->token;
     }