fixed static completion

Added static and self completion

Author: mkusher

src/Complete/Completer/StaticCompleter.php

@@ -34,7 +34,7 @@ public function getEntries(Project $project, Context $context){
             return [];
         }
         $entries = [];
-        $spec = new Specification($isThis ? 'private' : 'public', true);
+        $spec = new Specification($isThis ? 'private' : 'public', 1);
         if($class->methods !== null){
             foreach($class->methods->all($spec) AS $method){
                 $entry = $this->createEntryForMethod($method);
@@ -76,7 +76,7 @@ protected function createEntryForMethod(MethodData $method){
     protected function createEntryForProperty(ClassProperty $prop){
         $type = $prop->type instanceof FQCN ? $prop->type->toString() : 'mixed';
         return new Entry(
-            $prop->name,
+            '$' . $prop->name,
             $type
         );
     }

src/Complete/Resolver/NodeTypeResolver.php

@@ -58,6 +58,7 @@ public function getType($node, Index $index, Scope $scope){
      * @return FQCN|null
      */
     public function getChainType($node, Index $index, Scope $scope){
+        /** @var FQCN */
         $type = null;
         $chain = $this->createChain($node);
         foreach($chain AS $block){
@@ -79,6 +80,15 @@ public function getChainType($node, Index $index, Scope $scope){
             }
             elseif($block['type'] === 'class'){
                 $type = $block['name'];
+                if(
+                    $type->getClassName() === 'self'
+                    || $type->getClassName() === 'static'
+                ){
+                    $type = $scope->getFQCN();
+                }
+                elseif($type->getClassName() === 'parent'){
+                    $type = $this->getParentType($scope->getFQCN(), $index);
+                }
             }
         }
         return $type;
@@ -158,6 +168,17 @@ protected function getPropertyType($name, FQCN $type, Index $index){
         }
         return $prop->getType();
     }
+    protected function getParentType(FQCN $type, Index $index){
+        $class = $index->findClassByFQCN($type);
+        if(empty($class)){
+            return null;
+        }
+        $parent = $class->getParent();
+        if(empty($parent)){
+            return null;
+        }
+        return $parent->fqcn;
+    }
 
     /** @property LoggerInterface */
     private $logger;

src/Entity/Collection/MethodsCollection.php

@@ -24,7 +24,7 @@ public function remove(MethodData $method){
     }
     public function get($name, Specification $spec = null){
         if($spec === null){
-            $spec = new Specification('private', false, true);
+            $spec = new Specification('private', 2, true);
         }
         if(array_key_exists($name, $this->methods)){
             $method = $this->methods[$name];

src/Entity/Collection/PropertiesCollection.php

@@ -39,7 +39,7 @@ public function all(Specification $spec = null){
     }
     public function get($propName, Specification $spec = null){
         if($spec === null){
-            $spec = new Specification;
+            $spec = new Specification('private', 2, false);
         }
         if(array_key_exists($propName, $this->map)){
             $prop = $this->map[$propName];

src/Entity/Collection/Specification.php

@@ -28,7 +28,7 @@ public function satisfy($node){
                 return false;
             }
         }
-        if($node->isStatic() !== $this->showStatic){
+        if($this->showStatic < 2 && $node->isStatic() != $this->showStatic){
             return false;
         }
         return true;

src/Entity/Completion/Token.php

@@ -113,13 +113,6 @@ protected function removeType($type){
         }
     }
 
-    /**
-     * @return Token
-     */
-    protected static function test(){
-
-    }
-
     const T_UNKNOWN             = -1;
     const T_CONTINUE_PROCESS    = 1;
     const T_TERMINATE           = 2;

src/Entity/FQN.php

@@ -68,5 +68,6 @@ public function __toString(){
         return $this->toString();
     }
 
+    public static $test;
     private $parts;
 }