added property parsing

Author: mkusher

src/Complete/Completer/ObjectCompleter.php

@@ -3,7 +3,9 @@
 namespace Complete\Completer;
 
 use Entity\Project;
+use Entity\FQCN;
 use Entity\Node\MethodData;
+use Entity\Node\ClassProperty;
 use Entity\Completion\Context;
 use Entity\Completion\Entry;
 use Entity\Completion\Scope;
@@ -46,8 +48,7 @@ protected function getEntriesForVar(
             $entries[] = $entry;
         }
         foreach($class->properties->all() AS $property){
-            $entry = new Entry($property->name);
-            $entries[] = $entry;
+            $entries[] = $this->createEntryForProperty($property);
         }
         return $entries;
     }
@@ -73,8 +74,7 @@ protected function getEntriesForThis(
             $entries[] = $entry;
         }
         foreach($class->properties->all() AS $property){
-            $entry = new Entry($property->name);
-            $entries[] = $entry;
+            $entries[] = $this->createEntryForProperty($property);
         }
         return $entries;
     }
@@ -92,5 +92,14 @@ protected function createEntryForMethod(MethodData $method){
         );
     }
 
+    protected function createEntryForProperty(ClassProperty $prop){
+        $type = $prop->type instanceof FQCN ? $prop->type->toString() : 'mixed';
+        return new Entry(
+            $prop->name,
+            $type
+        );
+    }
+
+    /** @property LoggerInterface */
     private $logger;
 }

src/Parser/CommentParser.php

@@ -24,6 +24,7 @@ public function parse($doc){
         $text = $doc;
         if(is_array($doc)){
             $doc = array_shift($doc);
+            var_dump($doc);
             $text = $doc->getText();
         }
         $comment = new Comment(
@@ -71,6 +72,7 @@ protected function createMethodParam(Tag $tag){
     protected function createVar(Tag $tag){
         $name = trim($tag->getVariableName(), '$');
         $param = new Variable($name);
+        $param->setType($this->getFQCN($tag->getType()));
         return $param;
     }
     /**
@@ -108,5 +110,6 @@ protected function getContext(){
         return new Context($namespace, $aliases);
     }
 
+    /** @property UseParser */
     private $useParser;
 }

src/Parser/PropertyParser.php

@@ -6,6 +6,11 @@
 use PhpParser\Node\Stmt\PropertyProperty as Property;
 
 class PropertyParser{
+
+    public function __construct(CommentParser $commentParser){
+        $this->commentParser = $commentParser;
+    }
+
     /**
      * Parses Property node to ClassProperty
      *
@@ -18,6 +23,19 @@ public function parse(Property $node, $modifier=0)
         $prop = new ClassProperty;
         $prop->name = $node->name;
         $prop->setModifier($modifier);
+        $comments = $node->getAttribute("comments");
+        if(is_array($comments)){
+            $comment = $this->commentParser->parse(
+                $comments[count($comments)-1]->getText()
+            );
+            $var = array_pop($comment->getVars());
+            if($var->getName() === $prop->name){
+                $prop->doc = $comment->getDoc();
+                $prop->type = $var->getType();
+            }
+        }
         return $prop;
     }
+
+    private $commentParser;
 }