Printer: attributes on parameters are placed on its own line

Author: dg

src/PhpGenerator/Printer.php

@@ -326,37 +326,51 @@ protected function printUses(PhpNamespace $namespace, string $of = PhpNamespace:
 
 	protected function printParameters(Closure|GlobalFunction|Method $function, int $column = 0): string
 	{
-		$params = [];
-		$list = $function->getParameters();
-		$multiline = false;
-
-		foreach ($list as $param) {
+		$special = false;
+		foreach ($function->getParameters() as $param) {
 			$param->validate();
-			$variadic = $function->isVariadic() && $param === end($list);
-			$type = $param->getType();
+			$special = $special || $param instanceof PromotedParameter || $param->getAttributes();
+		}
+
+		if (!$special) {
+			$line = $this->formatParameters($function, false);
+			if (!str_contains($line, "\n") && strlen($line) + $column <= $this->wrapLength) {
+				return $line;
+			}
+		}
+
+		return $this->formatParameters($function, true);
+	}
+
+
+	private function formatParameters(Closure|GlobalFunction|Method $function, bool $multiline): string
+	{
+		$params = $function->getParameters();
+		$res = '';
+
+		foreach ($params as $param) {
+			$variadic = $function->isVariadic() && $param === end($params);
 			$promoted = $param instanceof PromotedParameter ? $param : null;
-			$params[] =
+			$attrs = $this->printAttributes($param->getAttributes(), inline: true);
+			$res .=
 				($promoted ? $this->printDocComment($promoted) : '')
-				. ($attrs = $this->printAttributes($param->getAttributes(), inline: true))
+				. ($attrs ? ($multiline ? substr($attrs, 0, -1) . "\n" : $attrs) : '')
 				. ($promoted ?
 					($promoted->getVisibility() ?: 'public')
-					. ($promoted->isReadOnly() && $type ? ' readonly' : '')
+					. ($promoted->isReadOnly() && $param->getType() ? ' readonly' : '')
 					. ' ' : '')
-				. ltrim($this->printType($type, $param->isNullable()) . ' ')
+				. ltrim($this->printType($param->getType(), $param->isNullable()) . ' ')
 				. ($param->isReference() ? '&' : '')
 				. ($variadic ? '...' : '')
 				. '$' . $param->getName()
-				. ($param->hasDefaultValue() && !$variadic ? ' = ' . $this->dump($param->getDefaultValue()) : '');
-
-			$multiline = $multiline || $promoted || $attrs;
+				. ($param->hasDefaultValue() && !$variadic ? ' = ' . $this->dump($param->getDefaultValue()) : '')
+				. ($multiline ? ",\n" : ', ');
 		}
 
-		$line = implode(', ', $params);
-		$multiline = $multiline || count($params) > 1 && (strlen($line) + $column > $this->wrapLength);
-
 		return $multiline
-			? "(\n" . $this->indent(implode(",\n", $params)) . ",\n)"
-			: "($line)";
+			? "(\n" . $this->indent($res) . ')'
+			: '(' . substr($res, 0, -2) . ')';
+
 	}
 
 

tests/PhpGenerator/Printer.function.phpt

@@ -2,14 +2,15 @@
 
 declare(strict_types=1);
 
+use Nette\PhpGenerator\GlobalFunction;
 use Nette\PhpGenerator\Printer;
 use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
 
 $printer = new Printer;
-$function = new Nette\PhpGenerator\GlobalFunction('func');
+$function = new GlobalFunction('func');
 $function
 	->setReturnType('stdClass')
 	->setBody("func(); \r\nreturn 123;")
@@ -26,30 +27,138 @@ Assert::match(<<<'XX'
 	XX, $printer->printFunction($function));
 
 
-$function = new Nette\PhpGenerator\GlobalFunction('multi');
+$function = new GlobalFunction('multi');
 $function->addParameter('foo')
 		->addAttribute('Foo');
 
 Assert::match(<<<'XX'
 	function multi(
-		#[Foo] $foo,
+		#[Foo]
+		$foo,
 	) {
 	}
-
 	XX, $printer->printFunction($function));
 
 
-$function = new Nette\PhpGenerator\GlobalFunction('multiType');
+$function = new GlobalFunction('multiType');
 $function
 	->setReturnType('array')
 	->addParameter('foo')
 		->addAttribute('Foo');
 
 Assert::match(<<<'XX'
 	function multiType(
-		#[Foo] $foo,
+		#[Foo]
+		$foo,
 	): array
 	{
 	}
+	XX, $printer->printFunction($function));
+
+
+$function = new GlobalFunction('func');
+$function->addAttribute('Foo', [1, 2, 3]);
+$function->addAttribute('Bar');
+
+same(
+	<<<'XX'
+		#[Foo(1, 2, 3)]
+		#[Bar]
+		function func()
+		{
+		}
+
+		XX,
+	(string) $function,
+);
+
+
+// single
+$function = new GlobalFunction('func');
+$function->addAttribute('Foo', [1, 2, 3]);
+
+Assert::match(<<<'XX'
+	#[Foo(1, 2, 3)]
+	function func()
+	{
+	}
+	XX, $printer->printFunction($function));
+
+
+// multiple
+$function = new GlobalFunction('func');
+$function->addAttribute('Foo', [1, 2, 3]);
+$function->addAttribute('Bar');
+
+Assert::match(<<<'XX'
+	#[Foo(1, 2, 3)]
+	#[Bar]
+	function func()
+	{
+	}
+	XX, $printer->printFunction($function));
+
+
+// multiline
+$function = new GlobalFunction('func');
+$function->addAttribute('Foo', ['a', str_repeat('x', 120)]);
+
+Assert::match(<<<'XX'
+	#[Foo(
+		'a',
+		'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
+	)]
+	function func()
+	{
+	}
+	XX, $printer->printFunction($function));
+
+
+// parameter: single
+$function = new GlobalFunction('func');
+$param = $function->addParameter('foo');
+$param->addAttribute('Foo', [1, 2, 3]);
+
+Assert::match(<<<'XX'
+	function func(
+		#[Foo(1, 2, 3)]
+		$foo,
+	) {
+	}
+	XX, $printer->printFunction($function));
+
 
+// parameter: multiple
+$function = new GlobalFunction('func');
+$param = $function->addParameter('foo');
+$param->addAttribute('Foo', [1, 2, 3]);
+$param->addAttribute('Bar');
+
+Assert::match(<<<'XX'
+	function func(
+		#[Foo(1, 2, 3), Bar]
+		$foo,
+	) {
+	}
+	XX, $printer->printFunction($function));
+
+
+// parameter: multiline
+$function = new GlobalFunction('func');
+$param = $function->addParameter('bar');
+$param->addAttribute('Foo');
+$param = $function->addParameter('foo');
+$param->addAttribute('Foo', ['a', str_repeat('x', 120)]);
+
+Assert::match(<<<'XX'
+	function func(
+		#[Foo]
+		$bar,
+		#[Foo(
+			'a',
+			'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
+		)]
+		$foo,
+	) {
+	}
 	XX, $printer->printFunction($function));

tests/PhpGenerator/expected/ClassType.attributes.expect

@@ -21,7 +21,8 @@ class Example
 	 */
 	#[ExampleAttribute]
 	public function getHandle(
-		#[ExampleAttribute, WithArguments(123)] $mode,
+		#[ExampleAttribute, WithArguments(123)]
+		$mode,
 	) {
 	}
 }

tests/PhpGenerator/expected/ClassType.from.expect

@@ -139,7 +139,8 @@ class Class9
 	 */
 	#[ExampleAttribute]
 	public function getHandle(
-		#[WithArguments(123)] $mode,
+		#[WithArguments(123)]
+		$mode,
 	) {
 	}
 }

tests/PhpGenerator/expected/ClassType.promotion.expect

@@ -4,7 +4,8 @@ class Example
 		$a,
 		public $b,
 		/** promo */
-		#[Example] private string $c,
+		#[Example]
+		private string $c,
 		public readonly Draft $d = new Draft(10),
 	) {
 	}

tests/PhpGenerator/expected/Extractor.classes.expect

@@ -149,7 +149,8 @@ class Class9
 	 */
 	#[ExampleAttribute]
 	public function getHandle(
-		#[WithArguments(123)] $mode,
+		#[WithArguments(123)]
+		$mode,
 	) {
 	}
 }

tests/PhpGenerator/expected/PhpNamespace.expect

@@ -12,7 +12,8 @@ class A implements A, C
 
 	#[A]
 	public function test(
-		#[\Bar\D] C $a,
+		#[\Bar\D]
+		C $a,
 		self $b,
 		parent $c,
 		array $d,

tests/PhpGenerator/expected/Printer.class-alt.expect

@@ -64,14 +64,16 @@ final class Example extends ParentClass implements IExample
 
 
 	public function multi(
-		#[Foo] $foo,
+		#[Foo]
+		$foo,
 	) {
 	}
 
 
 
 	public function multiType(
-		#[Foo] $foo,
+		#[Foo]
+		$foo,
 	): array {
 	}
 }

tests/PhpGenerator/expected/Printer.class.expect

@@ -62,13 +62,15 @@ final class Example extends ParentClass implements IExample
 
 
 	public function multi(
-		#[Foo] $foo,
+		#[Foo]
+		$foo,
 	) {
 	}
 
 
 	public function multiType(
-		#[Foo] $foo,
+		#[Foo]
+		$foo,
 	): array
 	{
 	}