Format-preserving printer: fix bug when replacing already parenthesiz…

…ed type
phpstan · May 29, 2023 · 90cf56c · 90cf56c
1 parent a56b0df
commit 90cf56c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/Printer/Printer.php b/src/Printer/Printer.php
@@ -534,7 +534,8 @@ private function printArrayFormatPreserving(array $nodes, array $originalNodes,
 				}
 
 				$parenthesesNeeded = isset($this->parenthesesListMap[$mapKey])
-					&& in_array(get_class($newNode), $this->parenthesesListMap[$mapKey], true);
+					&& in_array(get_class($newNode), $this->parenthesesListMap[$mapKey], true)
+					&& !in_array(get_class($originalNode), $this->parenthesesListMap[$mapKey], true);
 				$addParentheses = $parenthesesNeeded && !$originalTokens->hasParentheses($itemStartPos, $itemEndPos);
 				if ($addParentheses) {
 					$result .= '(';

diff --git a/tests/PHPStan/Printer/PrinterTest.php b/tests/PHPStan/Printer/PrinterTest.php
@@ -1368,6 +1368,23 @@ public function enterNode(Node $node)
 
 			},
 		];
+
+		yield [
+			'/** @var string&(integer|float) */',
+			'/** @var string&(int|float) */',
+			new class extends AbstractNodeVisitor {
+
+				public function enterNode(Node $node)
+				{
+					if ($node instanceof IdentifierTypeNode && $node->name === 'integer') {
+						$node->name = 'int';
+					}
+
+					return $node;
+				}
+
+			},
+		];
 	}
 
 	/**