Fix fixing nodes in used traits

Author: ondrejmirtes

src/Analyser/FileAnalyser.php

@@ -107,6 +107,7 @@ public function analyseFile(
 					if ($node instanceof InTraitNode) {
 						$traitNode = $node->getOriginalNode();
 						$linesToIgnore[$scope->getFileDescription()] = $this->getLinesToIgnoreFromTokens([$traitNode]);
+						$parserNodes = $node->getParserNodes();
 					}
 					if ($outerNodeCallback !== null) {
 						$outerNodeCallback($node, $scope);

src/Analyser/NodeScopeResolver.php

@@ -6291,16 +6291,17 @@ private function processTraitUse(Node\Stmt\TraitUse $node, MutatingScope $classS
 				$adaptations[] = $adaptation;
 			}
 			$parserNodes = $this->parser->parseFile($fileName);
-			$this->processNodesForTraitUse($parserNodes, $traitReflection, $classScope, $adaptations, $nodeCallback);
+			$this->processNodesForTraitUse($parserNodes, $parserNodes, $traitReflection, $classScope, $adaptations, $nodeCallback);
 		}
 	}
 
 	/**
+	 * @param Node\Stmt[] $parserNodes
 	 * @param Node[]|Node|scalar|null $node
 	 * @param Node\Stmt\TraitUseAdaptation[] $adaptations
 	 * @param callable(Node $node, Scope $scope): void $nodeCallback
 	 */
-	private function processNodesForTraitUse($node, ClassReflection $traitReflection, MutatingScope $scope, array $adaptations, callable $nodeCallback): void
+	private function processNodesForTraitUse(array $parserNodes, $node, ClassReflection $traitReflection, MutatingScope $scope, array $adaptations, callable $nodeCallback): void
 	{
 		if ($node instanceof Node) {
 			if ($node instanceof Node\Stmt\Trait_ && $traitReflection->getName() === (string) $node->namespacedName && $traitReflection->getNativeReflection()->getStartLine() === $node->getStartLine()) {
@@ -6347,7 +6348,7 @@ private function processNodesForTraitUse($node, ClassReflection $traitReflection
 					throw new ShouldNotHappenException();
 				}
 				$traitScope = $scope->enterTrait($traitReflection);
-				$nodeCallback(new InTraitNode($node, $traitReflection, $scope->getClassReflection()), $traitScope);
+				$nodeCallback(new InTraitNode($node, $parserNodes, $traitReflection, $scope->getClassReflection()), $traitScope);
 				$this->processStmtNodes($node, $stmts, $traitScope, $nodeCallback, StatementContext::createTopLevel());
 				return;
 			}
@@ -6359,11 +6360,11 @@ private function processNodesForTraitUse($node, ClassReflection $traitReflection
 			}
 			foreach ($node->getSubNodeNames() as $subNodeName) {
 				$subNode = $node->{$subNodeName};
-				$this->processNodesForTraitUse($subNode, $traitReflection, $scope, $adaptations, $nodeCallback);
+				$this->processNodesForTraitUse($parserNodes, $subNode, $traitReflection, $scope, $adaptations, $nodeCallback);
 			}
 		} elseif (is_array($node)) {
 			foreach ($node as $subNode) {
-				$this->processNodesForTraitUse($subNode, $traitReflection, $scope, $adaptations, $nodeCallback);
+				$this->processNodesForTraitUse($parserNodes, $subNode, $traitReflection, $scope, $adaptations, $nodeCallback);
 			}
 		}
 	}

src/Node/InTraitNode.php

@@ -11,7 +11,10 @@
 final class InTraitNode extends Node\Stmt implements VirtualNode
 {
 
-	public function __construct(private Node\Stmt\Trait_ $originalNode, private ClassReflection $traitReflection, private ClassReflection $implementingClassReflection)
+	/**
+	 * @param Node\Stmt[] $parserNodes
+	 */
+	public function __construct(private Node\Stmt\Trait_ $originalNode, private array $parserNodes, private ClassReflection $traitReflection, private ClassReflection $implementingClassReflection)
 	{
 		parent::__construct($originalNode->getAttributes());
 	}
@@ -21,6 +24,14 @@ public function getOriginalNode(): Node\Stmt\Trait_
 		return $this->originalNode;
 	}
 
+	/**
+	 * @return Node\Stmt[]
+	 */
+	public function getParserNodes(): array
+	{
+		return $this->parserNodes;
+	}
+
 	public function getTraitReflection(): ClassReflection
 	{
 		return $this->traitReflection;