Format-preserving printer - use original detected newline

Author: ondrejmirtes

src/Printer/Printer.php

@@ -516,7 +516,7 @@ private function printArrayFormatPreserving(array $nodes, array $originalNodes,
 [$isMultiline, $beforeAsteriskIndent, $afterAsteriskIndent] = $this->isMultiline($tokenIndex, $originalNodes, $originalTokens);
 
 if ($insertStr === "\n * ") {
-$insertStr = sprintf("\n%s*%s", $beforeAsteriskIndent, $afterAsteriskIndent);
+$insertStr = sprintf('%s%s*%s', $originalTokens->getDetectedNewline() ?? "\n", $beforeAsteriskIndent, $afterAsteriskIndent);
 }
 
 foreach ($diff as $i => $diffElem) {
@@ -549,7 +549,7 @@ private function printArrayFormatPreserving(array $nodes, array $originalNodes,
 }
 
 if ($insertNewline) {
-$result .= $insertStr . sprintf("\n%s*%s", $beforeAsteriskIndent, $afterAsteriskIndent);
+$result .= $insertStr . sprintf('%s%s*%s', $originalTokens->getDetectedNewline() ?? "\n", $beforeAsteriskIndent, $afterAsteriskIndent);
 } else {
 $result .= $insertStr;
 }
@@ -593,7 +593,7 @@ private function printArrayFormatPreserving(array $nodes, array $originalNodes,
 
 $itemEndPos = $tokenIndex - 1;
 if ($insertNewline) {
-$result .= $insertStr . sprintf("\n%s*%s", $beforeAsteriskIndent, $afterAsteriskIndent);
+$result .= $insertStr . sprintf('%s%s*%s', $originalTokens->getDetectedNewline() ?? "\n", $beforeAsteriskIndent, $afterAsteriskIndent);
 } else {
 $result .= $insertStr;
 }
@@ -662,7 +662,7 @@ private function printArrayFormatPreserving(array $nodes, array $originalNodes,
 if (!$first) {
 $result .= $insertStr;
 if ($insertNewline) {
-$result .= sprintf("\n%s*%s", $beforeAsteriskIndent, $afterAsteriskIndent);
+$result .= sprintf('%s%s*%s', $originalTokens->getDetectedNewline() ?? "\n", $beforeAsteriskIndent, $afterAsteriskIndent);
 }
 }
 

tests/PHPStan/Parser/PhpDocParserTest.php

@@ -5332,7 +5332,7 @@ public function provideDescriptionWithOrWithoutHtml(): Iterator
 new ParserException(
 'Important',
 Lexer::TOKEN_IDENTIFIER,
-27,
+PHP_EOL === "\n" ? 27 : 28,
 Lexer::TOKEN_HORIZONTAL_WS,
 null,
 2
@@ -5817,7 +5817,7 @@ public function provideDoctrineData(): Iterator
 new PhpDocTagNode('@X', new DoctrineTagValueNode(new DoctrineAnnotation(
 '@X',
 []
-), "test\ntest2")),
+), 'test' . PHP_EOL . 'test2')),
 ]),
 null,
 null,
@@ -5887,7 +5887,7 @@ public function provideDoctrineData(): Iterator
 ' * test2' . PHP_EOL .
 ' */',
 new PhpDocNode([
-new PhpDocTagNode('@X', new GenericTagValueNode("test\ntest2")),
+new PhpDocTagNode('@X', new GenericTagValueNode('test' . PHP_EOL . 'test2')),
 ]),
 null,
 null,