matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix lazy loading of rules 

We must load package rules when a file in the _mld dir is requested
This commit is contained in:
Rudi Grinberg 2018-04-02 23:15:56 +08:00
parent 1b1c5f032d
commit ff211b18a7
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/odoc.ml
View File

@ -501,17 +501,19 @@ module Gen (S : sig val sctx : SC.t end) = struct
in in
SC.packages sctx SC.packages sctx
|> Package.Name.Map.iter ~f:(fun (pkg : Package.t) -> |> Package.Name.Map.iter ~f:(fun (pkg : Package.t) ->
SC.on_load_dir sctx let rules = lazy (
~dir:(Paths.odocs (Pkg pkg.name)) setup_package_odoc_rules
~f:(fun () -> ~pkg
setup_package_odoc_rules ~mlds:(
~pkg docs_by_package pkg
~mlds:( |> List.concat_map ~f:(fun (dir, doc) -> mlds_of_dir doc ~dir)
docs_by_package pkg )
|> List.concat_map ~f:(fun (dir, doc) -> mlds_of_dir doc ~dir) ~entry_modules_by_lib:modules_by_lib
) ) in
~entry_modules_by_lib:modules_by_lib List.iter [ Paths.odocs (Pkg pkg.name)
); ; Paths.gen_mld_dir pkg ]
~f:(fun dir ->
SC.on_load_dir sctx ~dir ~f:(fun () -> Lazy.force rules));
(* setup @doc to build the correct html for the package *) (* setup @doc to build the correct html for the package *)
setup_package_aliases pkg; setup_package_aliases pkg;
); );

6
test/blackbox-tests/test-cases/odoc/run.t
View File

@ -33,5 +33,7 @@
</html> </html>
$ $JBUILDER build @foo-mld -j1 --display short --root . $ $JBUILDER build @foo-mld -j1 --display short --root .
No rule found for _doc/_mlds/foo/index.mld {1 Library foo}
[1] This library exposes the following toplevel modules: {!modules:Foo}.
{1 Library foo.byte}
This library exposes the following toplevel modules: {!modules:Foo_byte}.