Update test results with the latest formats

jaapio · jaapio · commit 3c11f4086c2a · 2023-07-20T19:44:36.000+02:00
diff --git a/packages/guides/src/Compiler/DocumentNodeTraverser.php b/packages/guides/src/Compiler/DocumentNodeTraverser.php
@@ -50,7 +50,7 @@ private function traverseForTransformer(
         }
 
         foreach ($shadowNode->getChildren() as $shadowChild) {
-            $this->traverseForTransformer($transformer, $shadowChild, $compilerContext->withShadowTree($shadowNode));
+            $this->traverseForTransformer($transformer, $shadowChild, $compilerContext->withShadowTree($shadowChild));
         }
 
         if (!$supports) {
diff --git a/packages/guides/src/Compiler/NodeTransformers/CollectLinkTargetsTransformer.php b/packages/guides/src/Compiler/NodeTransformers/CollectLinkTargetsTransformer.php
@@ -35,8 +35,9 @@ public function enterNode(Node $node, CompilerContext $compilerContext): Node
         if ($node instanceof DocumentNode) {
             $this->documentStack->push($node);
         } elseif ($node instanceof AnchorNode) {
-            $currentDocument = $this->documentStack->top();
-            Assert::notNull($currentDocument);
+            $currentDocument = $compilerContext->getDocumentNode();
+            $parentSection = $compilerContext->getShadowTree()->getParent()->getNode();
+            assert($parentSection instanceof SectionNode);
 
             $compilerContext->getProjectNode()->addLinkTarget(
                 $node->toString(),
diff --git a/packages/guides/src/Compiler/NodeTransformers/MoveAnchorTransformer.php b/packages/guides/src/Compiler/NodeTransformers/MoveAnchorTransformer.php
@@ -27,7 +27,7 @@ public function leaveNode(Node $node, CompilerContext $compilerContext): Node|nu
         }
 
         $this->seen[spl_object_hash($node)] = spl_object_hash($node);
-        $parent = $compilerContext->getShadowTree();
+        $parent = $compilerContext->getShadowTree()->getParent();
         $position = $parent->findPosition($node);
         if ($position === null) {
             throw new LogicException('Node not found in shadow tree');
diff --git a/tests/Integration/tests/anchor-to-title/expected/index.html b/tests/Integration/tests/anchor-to-title/expected/index.html
@@ -10,7 +10,7 @@ <h1>Overview</h1>
     <a id="rst-overview"></a>
     <p>RST Overview content</p>
 </div>
-<div class="section" id="overview">
+<div class="section" id="overview-1">
     <h1>Overview</h1>
     <a id="sphinx-overview"></a>
     <p>Sphinx Overview content</p>
diff --git a/tests/Integration/tests/anchor-whitespace/expected/index.html b/tests/Integration/tests/anchor-whitespace/expected/index.html
@@ -1,18 +1,18 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
 <head>
-    <meta charset="utf-8"/>
-
-
+    <title>Overview</title>
 </head>
 
 <body>
-<div class="section" id="rst-overview">
+<div class="section" id="overview">
     <h1>Overview</h1>
+    <a id="rst-overview"></a>
     <p>RST Overview content</p>
 </div>
-<div class="section" id="sphinx-overview">
+<div class="section" id="overview-1">
     <h1>Overview</h1>
+    <a id="sphinx-overview"></a>
     <p>Sphinx Overview content</p>
     <div class="section" id="somewhere-else">
         <h2>Somewhere else</h2>
diff --git a/tests/Integration/tests/anchor-whitespace/input/index.rst b/tests/Integration/tests/anchor-whitespace/input/index.rst
@@ -16,6 +16,6 @@ Sphinx Overview content
 Somewhere else
 =============
 
-This is a link to the RST Overview :ref:`rst-overview`
+This is a link to the RST Overview: :ref:`rst-overview`
 
-This is a link to the Sphinx Overview :ref:`sphinx-overview`
+This is a link to the Sphinx Overview: :ref:`sphinx-overview`
diff --git a/tests/Integration/tests/references/expected/index.html b/tests/Integration/tests/references/expected/index.html
@@ -9,12 +9,12 @@ <h1>Overview</h1>
     <a id="RST Overview"></a>
             <p>RST Overview content</p>
     </div>
-<div class="section" id="overview">
+<div class="section" id="overview-1">
     <h1>Overview</h1>
     <a id="Other Overview"></a>
             <p>Other Overview content</p>
-            <p>This is a link to the RST Overview<a href="/index.html#RST Overview">alternative</a></p>
-            <p>This is a link to the Other Overview<a href="/index.html#Other Overview">Other Overview</a></p>
+            <p>This is a link to the RST Overview: <a href="/index.html#RST Overview">alternative</a></p>
+            <p>This is a link to the Other Overview: <a href="/index.html#Other Overview">Other Overview</a></p>
             <p>This is a link to <a href="/page.html">Page 1</a>
 This is a link to with alternative text <a href="/page.html">alternative</a></p>
     </div>
diff --git a/tests/Integration/tests/references/expected/subfolder/index.html b/tests/Integration/tests/references/expected/subfolder/index.html
@@ -1,10 +1,13 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <title></title>
+    <title>Subfolder index</title>
 
 </head>
 <body>
-    <p><a href="/page.html">Page 1</a></p>
+<div class="section" id="subfolder-index">
+<h1>Subfolder index</h1>
+<p><a href="/page.html">Page 1</a></p>
+</div>
 </body>
 </html>

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ private function traverseForTransformer(`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`foreach ($shadowNode->getChildren() as $shadowChild) {`
`53`		`- $this->traverseForTransformer($transformer, $shadowChild, $compilerContext->withShadowTree($shadowNode));`
	`53`	`+ $this->traverseForTransformer($transformer, $shadowChild, $compilerContext->withShadowTree($shadowChild));`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`if (!$supports) {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function leaveNode(Node $node, CompilerContext $compilerContext): Node\|nu`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`$this->seen[spl_object_hash($node)] = spl_object_hash($node);`
`30`		`- $parent = $compilerContext->getShadowTree();`
	`30`	`+ $parent = $compilerContext->getShadowTree()->getParent();`
`31`	`31`	`$position = $parent->findPosition($node);`
`32`	`32`	`if ($position === null) {`
`33`	`33`	`throw new LogicException('Node not found in shadow tree');`