Fix Printer

Author: ondrejmirtes

src/Printer/Printer.php

@@ -550,26 +550,26 @@ private function printArrayFormatPreserving(array $nodes, array $originalNodes,
 
 		foreach ($diff as $i => $diffElem) {
 			$diffType = $diffElem->type;
-			$arrItem = $diffElem->new;
-			$origArrayItem = $diffElem->old;
+			$newNode = $diffElem->new;
+			$originalNode = $diffElem->old;
 			if ($diffType === DiffElem::TYPE_KEEP || $diffType === DiffElem::TYPE_REPLACE) {
 				$beforeFirstKeepOrReplace = false;
-				if (!$arrItem instanceof Node || !$origArrayItem instanceof Node) {
+				if (!$newNode instanceof Node || !$originalNode instanceof Node) {
 					return null;
 				}
 
 				/** @var int $itemStartPos */
-				$itemStartPos = $origArrayItem->getAttribute(Attribute::START_INDEX);
+				$itemStartPos = $originalNode->getAttribute(Attribute::START_INDEX);
 
 				/** @var int $itemEndPos */
-				$itemEndPos = $origArrayItem->getAttribute(Attribute::END_INDEX);
+				$itemEndPos = $originalNode->getAttribute(Attribute::END_INDEX);
 
 				if ($itemStartPos < 0 || $itemEndPos < 0 || $itemStartPos < $tokenIndex) {
 					throw new LogicException();
 				}
 
-				$comments = $arrItem->getAttribute(Attribute::COMMENTS) ?? [];
-				$origComments = $origArrayItem->getAttribute(Attribute::COMMENTS) ?? [];
+				$comments = $newNode->getAttribute(Attribute::COMMENTS) ?? [];
+				$origComments = $originalNode->getAttribute(Attribute::COMMENTS) ?? [];
 
 				$commentStartPos = count($origComments) > 0 ? $origComments[0]->startIndex : $itemStartPos;
 				assert($commentStartPos >= 0);
@@ -608,8 +608,8 @@ private function printArrayFormatPreserving(array $nodes, array $originalNodes,
 				}
 
 				$parenthesesNeeded = isset($this->parenthesesListMap[$mapKey])
-					&& in_array(get_class($arrItem), $this->parenthesesListMap[$mapKey], true)
-					&& !in_array(get_class($origArrayItem), $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 .= '(';
@@ -622,7 +622,7 @@ private function printArrayFormatPreserving(array $nodes, array $originalNodes,
 					}
 				}
 
-				$result .= $this->printNodeFormatPreserving($arrItem, $originalTokens);
+				$result .= $this->printNodeFormatPreserving($newNode, $originalTokens);
 				if ($addParentheses) {
 					$result .= ')';
 				}
@@ -632,25 +632,25 @@ private function printArrayFormatPreserving(array $nodes, array $originalNodes,
 				if ($insertStr === null) {
 					return null;
 				}
-				if (!$arrItem instanceof Node) {
+				if (!$newNode instanceof Node) {
 					return null;
 				}
 
-				if ($insertStr === ', ' && $isMultiline || count($arrItem->getAttribute(Attribute::COMMENTS) ?? []) > 0) {
+				if ($insertStr === ', ' && $isMultiline || count($newNode->getAttribute(Attribute::COMMENTS) ?? []) > 0) {
 					$insertStr = ',';
 					$insertNewline = true;
 				}
 
 				if ($beforeFirstKeepOrReplace) {
 					// Will be inserted at the next "replace" or "keep" element
-					$delayedAdd[] = $arrItem;
+					$delayedAdd[] = $newNode;
 					continue;
 				}
 
 				/** @var int $itemEndPos */
 				$itemEndPos = $tokenIndex - 1;
 				if ($insertNewline) {
-					$comments = $arrItem->getAttribute(Attribute::COMMENTS) ?? [];
+					$comments = $newNode->getAttribute(Attribute::COMMENTS) ?? [];
 					$result .= $insertStr;
 					if (count($comments) > 0) {
 						$result .= sprintf('%s%s*%s', $originalTokens->getDetectedNewline() ?? "\n", $beforeAsteriskIndent, $afterAsteriskIndent);
@@ -662,28 +662,28 @@ private function printArrayFormatPreserving(array $nodes, array $originalNodes,
 				}
 
 				$parenthesesNeeded = isset($this->parenthesesListMap[$mapKey])
-					&& in_array(get_class($arrItem), $this->parenthesesListMap[$mapKey], true);
+					&& in_array(get_class($newNode), $this->parenthesesListMap[$mapKey], true);
 				if ($parenthesesNeeded) {
 					$result .= '(';
 				}
 
-				$result .= $this->printNodeFormatPreserving($arrItem, $originalTokens);
+				$result .= $this->printNodeFormatPreserving($newNode, $originalTokens);
 				if ($parenthesesNeeded) {
 					$result .= ')';
 				}
 
 				$tokenIndex = $itemEndPos + 1;
 
 			} elseif ($diffType === DiffElem::TYPE_REMOVE) {
-				if (!$origArrayItem instanceof Node) {
+				if (!$originalNode instanceof Node) {
 					return null;
 				}
 
 				/** @var int $itemStartPos */
-				$itemStartPos = $origArrayItem->getAttribute(Attribute::START_INDEX);
+				$itemStartPos = $originalNode->getAttribute(Attribute::START_INDEX);
 
 				/** @var int $itemEndPos */
-				$itemEndPos = $origArrayItem->getAttribute(Attribute::END_INDEX);
+				$itemEndPos = $originalNode->getAttribute(Attribute::END_INDEX);
 				if ($itemStartPos < 0 || $itemEndPos < 0) {
 					throw new LogicException();
 				}