From ae8dfc454e64c385e6fb65abf28fb03def33c218 Mon Sep 17 00:00:00 2001
From: Jon Ludlam <jon@recoil.org>
Date: Thu, 14 Nov 2024 20:21:14 +0000
Subject: [PATCH] Fix rendering of sidebar in modules

---
 src/document/sidebar.ml                    |  2 +-
 test/roots_and_hierarchy/sidebar.t/run.t   | 23 +++++++++++-----------
 test/roots_and_hierarchy/sidebar.t/unit.ml | 12 +++++++++++
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/document/sidebar.ml b/src/document/sidebar.ml
index d45fa79df2..06e469c851 100644
--- a/src/document/sidebar.ml
+++ b/src/document/sidebar.ml
@@ -66,7 +66,7 @@ end = struct
       in
       let f name =
         match name with
-        | Some url, _ when prune && is_prefix (parent url) current_url -> None
+        | Some url, _ when prune && not (is_prefix (parent url) current_url) -> None
         | v -> Some (convert v)
       in
       let root_entry = convert tree.Tree.node in
diff --git a/test/roots_and_hierarchy/sidebar.t/run.t b/test/roots_and_hierarchy/sidebar.t/run.t
index f8fb9c9c23..8c0ec9d6b2 100644
--- a/test/roots_and_hierarchy/sidebar.t/run.t
+++ b/test/roots_and_hierarchy/sidebar.t/run.t
@@ -37,23 +37,22 @@
       </ul>
      </nav>
 
-  $ cat html/pkg/libname/Unit/index.html | grep odoc-global-toc -A 15
+  $ cat html/pkg/libname/Unit/X/index.html | grep odoc-global-toc -A 15
      <nav class="odoc-toc odoc-global-toc">
       <ul class="odoc-modules">
        <li><b>Library <code>libname</code></b>
-        <ul><li><a href="#" class="current_unit">Unit</a></li></ul>
-       </li>
-      </ul><b>Documentation</b>
-      <ul class="odoc-pages">
-       <li><a href="../../index.html">Package <code>pkg</code></a>
         <ul>
-         <li><a href="../../dir1/index.html">A directory</a>
-          <ul><li><a href="../../dir1/my_page.html">My page</a></li></ul>
-         </li><li><a href="../../file.html">File</a></li>
+         <li><a href="../index.html">Unit</a>
+          <ul>
+           <li><a href="#" class="current_unit">X</a>
+            <ul><li><a href="Y/index.html">Y</a></li>
+             <li><a href="#module-Z">Z</a></li>
+            </ul>
+           </li>
+          </ul>
+         </li>
         </ul>
        </li>
-      </ul>
-     </nav>
+      </ul><b>Documentation</b>
 
   $ odoc support-files -o html
-$ cp -r html /tmp/html
diff --git a/test/roots_and_hierarchy/sidebar.t/unit.ml b/test/roots_and_hierarchy/sidebar.t/unit.ml
index 0547b3d0ee..22dfecdc23 100644
--- a/test/roots_and_hierarchy/sidebar.t/unit.ml
+++ b/test/roots_and_hierarchy/sidebar.t/unit.ml
@@ -1 +1,13 @@
 let x = 1
+
+module X = struct
+
+  module Y = struct
+    
+    type t = int
+
+  end
+
+  module Z = Y
+end
+