Remapping favours the longest prefix

Author: jonludlam

src/html/link.ml

@@ -13,17 +13,22 @@ module Path = struct
 
   let remap config f =
     let l = String.concat "/" f in
-    try
-      let prefix, replacement =
-        List.find
-          (fun (prefix, _replacement) ->
-            Astring.String.is_prefix ~affix:prefix l)
-          (Config.remap config)
-      in
-      let len = String.length prefix in
-      let l = String.sub l len (String.length l - len) in
-      Some (replacement ^ l)
-    with Not_found -> None
+    let remaps =
+      List.filter
+        (fun (prefix, _replacement) -> Astring.String.is_prefix ~affix:prefix l)
+        (Config.remap config)
+    in
+    let remaps =
+      List.sort
+        (fun (a, _) (b, _) -> compare (String.length b) (String.length a))
+        remaps
+    in
+    match remaps with
+    | [] -> None
+    | (prefix, replacement) :: _ ->
+        let len = String.length prefix in
+        let l = String.sub l len (String.length l - len) in
+        Some (replacement ^ l)
 
   let get_dir_and_file ~config url =
     let l = Url.Path.to_list url in

test/integration/remap.t/run.t

@@ -18,3 +18,10 @@ This shouldn't stop us from outputting the remapped package though, and the foll
 
   $ odoc html-generate -o _html3 _odoc/prefix/otherpkg/otherlib.odocl -R prefix/otherpkg/:https://mysite.org/p/otherpkg/1.2.3/
 
+The order shouldn't matter, the longest prefix ought to win
+  $ odoc html-generate -o _html3 --indent _odoc/prefix/mypkg/test.odocl -R prefix/:https://mysite.org/foo/ -R prefix/otherpkg/:https://mysite.org/bar/
+  $ odoc html-generate -o _html4 --indent _odoc/prefix/mypkg/test.odocl -R prefix/otherpkg/:https://mysite.org/bar/ -R prefix/:https://mysite.org/foo/ 
+
+  $ grep Otherlib/index.html _html3/prefix/mypkg/Test/index.html _html4/prefix/mypkg/Test/index.html
+  _html3/prefix/mypkg/Test/index.html:       <a href="https://mysite.org/bar/Otherlib/index.html#type-t">Otherlib.t
+  _html4/prefix/mypkg/Test/index.html:       <a href="https://mysite.org/bar/Otherlib/index.html#type-t">Otherlib.t