Printer: new empty line in docblock without trailing space

A new empty PhpDocTextNode was printed as " * ". print() prints " *".

Amp-Thread-ID: https://ampcode.com/threads/T-01a17930-0285-73c5-a957-4325c77aa1b2

Author: ondrejmirtes

src/Printer/Printer.php

@@ -672,7 +672,7 @@ private function printArrayFormatPreserving(array $nodes, array $originalNodes,
 							}
 						}
 
-						$result .= $this->printNodeFormatPreserving($delayedAddNode, $originalTokens);
+						$result = $this->appendNode($result, $this->printNodeFormatPreserving($delayedAddNode, $originalTokens), $afterAsteriskIndent);
 						if ($parenthesesNeeded) {
 							$result .= ')';
 						}
@@ -747,7 +747,7 @@ private function printArrayFormatPreserving(array $nodes, array $originalNodes,
 					$result .= '(';
 				}
 
-				$result .= $this->printNodeFormatPreserving($arrItem, $originalTokens);
+				$result = $this->appendNode($result, $this->printNodeFormatPreserving($arrItem, $originalTokens), $afterAsteriskIndent);
 				if ($parenthesesNeeded) {
 					$result .= ')';
 				}
@@ -818,7 +818,7 @@ private function printArrayFormatPreserving(array $nodes, array $originalNodes,
 					}
 				}
 
-				$result .= $this->printNodeFormatPreserving($delayedAddNode, $originalTokens);
+				$result = $this->appendNode($result, $this->printNodeFormatPreserving($delayedAddNode, $originalTokens), $afterAsteriskIndent);
 				$first = false;
 			}
 			$result .= $extraRight;
@@ -827,6 +827,19 @@ private function printArrayFormatPreserving(array $nodes, array $originalNodes,
 		return $result;
 	}
 
+	/**
+	 * A new empty line in a docblock is " *", without the space after the asterisk
+	 */
+	private function appendNode(string $result, string $printedNode, string $afterAsteriskIndent): string
+	{
+		$lineStart = '*' . $afterAsteriskIndent;
+		if ($printedNode !== '' || $afterAsteriskIndent === '' || substr($result, -strlen($lineStart)) !== $lineStart) {
+			return $result . $printedNode;
+		}
+
+		return substr($result, 0, -strlen($afterAsteriskIndent));
+	}
+
 	/**
 	 * @param list<Comment> $comments
 	 */

tests/PHPStan/Printer/PrinterTest.php

@@ -2937,6 +2937,32 @@ public function enterNode(Node $node)
 			 */'),
 			$unsetSecond,
 		];
+
+		yield [
+			self::nowdoc('
+			/**
+			 * Text.
+			 */'),
+			self::nowdoc('
+			/**
+			 * Text.
+			 *
+			 * @return int
+			 */'),
+			new class extends AbstractNodeVisitor {
+
+				public function enterNode(Node $node)
+				{
+					if ($node instanceof PhpDocNode) {
+						$node->children[] = new PhpDocTextNode('');
+						$node->children[] = new PhpDocTagNode('@return', new ReturnTagValueNode(new IdentifierTypeNode('int'), ''));
+					}
+
+					return $node;
+				}
+
+			},
+		];
 	}
 
 	/**