"use Trait" can have comments [Closes #90]

Author: dg

readme.md

@@ -314,7 +314,8 @@ Using Traits
 $class = new Nette\PhpGenerator\ClassType('Demo');
 $class->addTrait('SmartObject');
 $class->addTrait('MyTrait', true)
-	->addResolution('sayHello as protected');
+	->addResolution('sayHello as protected')
+	->addComment('@use MyTrait<Foo>');
 echo $class;
 ```
 
@@ -324,6 +325,7 @@ Result:
 class Demo
 {
 	use SmartObject;
+	/** @use MyTrait<Foo> */
 	use MyTrait {
 		sayHello as protected;
 	}

src/PhpGenerator/Extractor.php

@@ -291,14 +291,13 @@ private function addFunctionToFile(PhpFile $phpFile, Node\Stmt\Function_ $node):
 
 	private function addTraitToClass(ClassType $class, Node\Stmt\TraitUse $node): void
 	{
-		$res = [];
-		foreach ($node->adaptations as $item) {
-			$res[] = trim($this->toPhp($item), ';');
+		foreach ($node->traits as $item) {
+			$trait = $class->addTrait($item->toString(), true);
 		}
-		foreach ($node->traits as $trait) {
-			$class->addTrait($trait->toString(), $res);
-			$res = [];
+		foreach ($node->adaptations as $item) {
+			$trait->addResolution(trim($this->toPhp($item), ';'));
 		}
+		$this->addCommentAndAttributes($trait, $node);
 	}
 
 

src/PhpGenerator/Printer.php

@@ -142,7 +142,8 @@ public function printClass(ClassType $class, PhpNamespace $namespace = null): st
 		$traits = [];
 		foreach ($class->getTraitResolutions() as $trait) {
 			$resolutions = $trait->getResolutions();
-			$traits[] = 'use ' . $resolver($trait->getName())
+			$traits[] = Helpers::formatDocComment((string) $trait->getComment())
+				. 'use ' . $resolver($trait->getName())
 				. ($resolutions ? " {\n" . $this->indentation . implode(";\n" . $this->indentation, $resolutions) . ";\n}\n" : ";\n");
 		}
 

src/PhpGenerator/TraitUse.php

@@ -19,6 +19,7 @@ final class TraitUse
 {
 	use Nette\SmartObject;
 	use Traits\NameAware;
+	use Traits\CommentAware;
 
 	/** @var array */
 	private $resolutions = [];

tests/PhpGenerator/ClassType.phpt

@@ -141,7 +141,8 @@ $class->removeImplement('foo');
 $class
 	->addTrait('ThirdTrait', true)
 		->addResolution('a as private foo')
-		->addResolution('b as private bar');
+		->addResolution('b as private bar')
+		->addComment('@use Foo');
 
 
 sameFile(__DIR__ . '/expected/ClassType.expect', (string) $class);

tests/PhpGenerator/expected/ClassType.expect

@@ -10,6 +10,7 @@ abstract class Example extends ParentClass implements IExample, IOne
 	use AnotherTrait {
 		sayHello as protected;
 	}
+	/** @use Foo */
 	use ThirdTrait {
 		a as private foo;
 		b as private bar;

tests/PhpGenerator/expected/Factory.fromCode.traits.expect

@@ -43,6 +43,7 @@ class ParentClass
 
 class Class1 extends ParentClass
 {
+	/** @use Foo */
 	use Trait2;
 }
 
@@ -98,10 +99,10 @@ trait Trait1b
 
 class Class5
 {
-	use Trait1 {
+	use Trait1;
+	use Trait1b {
 		\Trait1b::f1 insteadof \Trait1;
 		// not yet supported
 	\Trait1b::f1 as private;
 	}
-	use Trait1b;
 }

tests/PhpGenerator/fixtures/traits.php

@@ -46,6 +46,7 @@ public function f1()
 
 class Class1 extends ParentClass
 {
+	/** @use Foo */
 	use Trait2;
 }