From d9d70b7052c38c60000ae285013294c410498498 Mon Sep 17 00:00:00 2001
From: Paul-Elliot <peada@free.fr>
Date: Mon, 2 Dec 2024 19:45:50 +0100
Subject: [PATCH] Sidebar: sort by kind first

---
 src/index/skeleton_of.ml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/index/skeleton_of.ml b/src/index/skeleton_of.ml
index 103c5f7120..39d2ee65ab 100644
--- a/src/index/skeleton_of.ml
+++ b/src/index/skeleton_of.ml
@@ -8,6 +8,19 @@ module ModuleName = Odoc_model.Names.ModuleName
 
 type t = Entry.t Tree.t
 
+let compare_entry (e1 : Entry.t) (e2 : Entry.t) =
+  let int_of_kind (kind : Entry.kind) =
+    match kind with
+    | Page _ -> -10
+    | Dir -> 0
+    | Module _ -> 10
+    | Impl -> 20
+    | _ -> 30
+  in
+  match Int.compare (int_of_kind e1.kind) (int_of_kind e2.kind) with
+  | 0 -> Astring.String.compare (Id.name e1.id) (Id.name e2.id)
+  | i -> i
+
 let rec t_of_in_progress (dir : In_progress.in_progress) : t =
   let entry_of_page page =
     let kind = Entry.Page page.Lang.Page.frontmatter in
@@ -145,10 +158,7 @@ let rec t_of_in_progress (dir : In_progress.in_progress) : t =
     |> List.map snd
   in
   let unordered =
-    List.sort
-      (fun (x, _) (y, _) ->
-        String.compare (Paths.Identifier.name x) (Paths.Identifier.name y))
-      unordered
+    List.sort (fun (_, x) (_, y) -> compare_entry x.Tree.node y.node) unordered
   in
   let contents = ordered @ unordered |> List.map snd in
   { Tree.node = index; children = contents }