fixed completers structure

Fixed completers structure
Renamed Completer to CompleterFactory
Added UseCompleter with Interfaces
Fixed ClassNameCompleter to work with current Scope's uses
Fixed ObjectCompleter specifications for collections

Author: mkusher

src/Complete/CompleteEngine.php

@@ -8,7 +8,7 @@
 use Generator\IndexGenerator;
 use Entity\Completion\Entry;
 use Entity\Completion\Context;
-use Complete\Completer\Completer;
+use Complete\Completer\CompleterFactory;
 use Complete\Resolver\ContextResolver;
 use Complete\Resolver\ScopeResolver;
 use Parser\Processor\IndexProcessor;
@@ -20,15 +20,15 @@ public function __construct(
         Parser $parser,
         IndexGenerator $generator,
         ContextResolver $contextResolver,
-        Completer $completer,
+        CompleterFactory $completer,
         IndexProcessor $indexProcessor,
         ScopeProcessor $scopeProcessor,
         LoggerInterface $logger
     ){
         $this->parser           = $parser;
         $this->generator        = $generator;
         $this->contextResolver  = $contextResolver;
-        $this->completer        = $completer;
+        $this->completerFactory = $completer;
         $this->indexProcessor   = $indexProcessor;
         $this->scopeProcessor   = $scopeProcessor;
         $this->logger           = $logger;
@@ -77,7 +77,11 @@ public function createCompletion(
     }
     protected function findEntries(Project $project, Scope $scope, $badLine, $column, $lines){
         $context = $this->contextResolver->getContext($badLine, $project->getIndex(), $scope);
-        return $this->completer->getEntries($project, $context);
+        $completer = $this->completerFactory->getCompleter($context);
+        if($completer){
+            return $completer->getEntries($project, $context);
+        }
+        return [];
     }
     /**
      * @TODO
@@ -150,7 +154,7 @@ private function isValidCache($file, $content){
     private $parser;
     private $generator;
     private $contextResolver;
-    private $completer;
+    private $completerFactory;
     private $indexProcessor;
     private $scopeProcessor;
     private $cachePool;

src/Complete/Completer/ClassNameCompleter.php

@@ -6,14 +6,15 @@
 use Entity\Completion\Context;
 use Entity\Completion\Entry;
 
-class ClassNameCompleter{
+class ClassNameCompleter implements CompleterInterface {
     public function getEntries(Project $project, Context $context){
         $entries = [];
         $postfix = trim($context->getData());
         foreach($project->getIndex()->getClasses() as $fqcn => $class){
             if(!empty($postfix) && strpos($fqcn, $postfix) === false){
                 continue;
             }
+            $fqcn = $context->getScope()->getUses()->findAlias($class->fqcn);
             $complete = str_replace($postfix, "", $fqcn);
             $entries[] = new Entry(
                 $complete, '', '',

src/Complete/Completer/Completer.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Complete\Completer;
+
+use Entity\Completion\Context;
+use Entity\Completion\Scope;
+use Entity\Project;
+
+class CompleterFactory {
+    public function __construct(
+        ClassNameCompleter $classNameCompleter,
+        InterfaceNameCompleter $interfaceNameCompleter,
+        NamespaceCompleter $namespaceCompleter,
+        ObjectCompleter $objectCompleter,
+        UseCompleter $useCompleter
+    ){
+        $this->classNameCompleter = $classNameCompleter;
+        $this->interfaceNameCompleter = $interfaceNameCompleter;
+        $this->namespaceCompleter = $namespaceCompleter;
+        $this->objectCompleter = $objectCompleter;
+        $this->useCompleter = $useCompleter;
+    }
+    public function getCompleter(Context $context){
+        if($context->isNamespace()){
+            return $this->namespaceCompleter;
+        }
+        elseif($context->isUse()){
+            return $this->useCompleter;
+        }
+        elseif($context->isClassName()){
+            return $this->classNameCompleter;
+        }
+        elseif($context->isInterfaceName()){
+            return $this->interfaceNameCompleter;
+        }
+        elseif($context->isThis() || $context->isObject()){
+            return $this->objectCompleter;
+        }
+        return null;
+    }
+
+    private $classNameCompleter;
+    private $interfaceNameCompleter;
+    private $namespaceCompleter;
+    private $objectCompleter;
+    private $useCompleter;
+}

src/Complete/Completer/CompleterFactory.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Complete\Completer;
+
+use Entity\Project;
+use Entity\Completion\Context;
+
+interface CompleterInterface {
+    public function getEntries(Project $project, Context $context);
+}

src/Complete/Completer/CompleterInterface.php

@@ -6,7 +6,7 @@
 use Entity\Completion\Context;
 use Entity\Completion\Entry;
 
-class InterfaceNameCompleter{
+class InterfaceNameCompleter implements CompleterInterface {
     public function getEntries(Project $project, Context $context){
         $entries = [];
         foreach($project->getIndex()->getInterfaces() as $interface){

src/Complete/Completer/InterfaceNameCompleter.php

@@ -6,7 +6,7 @@
 use Entity\Completion\Context;
 use Entity\Completion\Entry;
 
-class NamespaceCompleter{
+class NamespaceCompleter implements CompleterInterface {
     public function getEntries(Project $project, Context $context){
         $entries = [];
         $postfix = trim($context->getData());

src/Complete/Completer/NamespaceCompleter.php

@@ -10,14 +10,16 @@
 use Entity\Completion\Context;
 use Entity\Completion\Entry;
 use Entity\Completion\Scope;
+use Entity\Collection\Specification;
 use Psr\Log\LoggerInterface;
 
 class ObjectCompleter {
     public function __construct(LoggerInterface $logger){
         $this->logger = $logger;
     }
     public function getEntries(Project $project, Context $context){
-        $fqcn = $context->getData();
+        /** @var FQCN $fqcn */
+        list($fqcn, $isThis) = $context->getData();
         $this->logger->addDebug('creating entries');
         if(!($fqcn instanceof FQCN)){
             return [];
@@ -32,8 +34,9 @@ public function getEntries(Project $project, Context $context){
             return [];
         }
         $entries = [];
+        $spec = new Specification($isThis ? 'private' : 'public');
         if($class->methods !== null){
-            foreach($class->methods->all() AS $method){
+            foreach($class->methods->all($spec) AS $method){
                 $entry = $this->createEntryForMethod($method);
                 $entries[] = $entry;
             }
@@ -42,7 +45,7 @@ public function getEntries(Project $project, Context $context){
             return $entries;
         }
         if($class->properties !== null){
-            foreach($class->properties->all() AS $property){
+            foreach($class->properties->all($spec) AS $property){
                 $entries[] = $this->createEntryForProperty($property);
             }
         }

src/Complete/Completer/ObjectCompleter.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Complete\Completer;
+
+use Entity\Project;
+use Entity\Completion\Context;
+use Entity\Completion\Entry;
+
+class UseCompleter implements CompleterInterface {
+    public function getEntries(Project $project, Context $context){
+        $entries = [];
+        $postfix = trim($context->getData());
+        $index = $project->getIndex();
+        $fqcns = array_merge($index->getClasses(), $index->getInterfaces());
+        foreach($fqcns as $fqcn => $class){
+            if(!empty($postfix) && strpos($fqcn, $postfix) === false){
+                continue;
+            }
+            $complete = str_replace($postfix, "", $fqcn);
+            $entries[] = new Entry(
+                $complete, '', '',
+                $fqcn
+            );
+        }
+        return $entries;
+    }
+}

src/Complete/Completer/UseCompleter.php

@@ -8,6 +8,7 @@
 use Entity\Index;
 use Parser\ErrorFreePhpParser;
 use Psr\Log\LoggerInterface;
+use PhpParser\Node\Expr\Variable;
 
 class ContextResolver{
     public function __construct(
@@ -56,9 +57,10 @@ protected function createContext(Scope $scope, Token $token, $badLine, Index $in
             else {
                 $workingNode = $nodes;
             }
-            $context->setData(
-                $this->typeResolver->getChainType($workingNode, $index, $scope)
-            );
+            $context->setData([
+                $this->typeResolver->getChainType($workingNode, $index, $scope),
+                $workingNode instanceof Variable && $workingNode->name === 'this'
+            ]);
         }
         if($token->isUseOperator()
             || $token->isNamespaceOperator()
@@ -93,6 +95,7 @@ protected function prepareLine($badLine){
         ){
             $badLine = '<?php ' . $badLine;
         }
+        $badLine = str_replace(['elseif', 'else', 'catch'], '', $badLine);
         return $badLine;
     }