Load unit in the environment before linking the first doc comment

The first comment of a module would be linked with an empty environment.
Also make sure that labels in that doc comment are added to the env.

Author: Julow

src/xref2/env.ml

@@ -721,10 +721,6 @@ let rec open_signature : Odoc_model.Lang.Signature.t -> t -> t =
         | Odoc_model.Lang.Signature.Open o -> open_signature o.expansion env)
       e s.items
 
-let open_unit : Odoc_model.Lang.Compilation_unit.t -> t -> t =
- fun unit env ->
-  match unit.content with Module s -> open_signature s env | Pack _ -> env
-
 let initial_env :
     Odoc_model.Lang.Compilation_unit.t ->
     resolver ->

src/xref2/env.mli

@@ -189,8 +189,6 @@ val open_class_signature : Odoc_model.Lang.ClassSignature.t -> t -> t
 
 val open_signature : Odoc_model.Lang.Signature.t -> t -> t
 
-val open_unit : Odoc_model.Lang.Compilation_unit.t -> t -> t
-
 val initial_env :
   Odoc_model.Lang.Compilation_unit.t ->
   resolver ->

src/xref2/link.ml

@@ -107,18 +107,18 @@ and module_path : Env.t -> Paths.Path.Module.t -> Paths.Path.Module.t =
 let rec unit (resolver : Env.resolver) t =
   let open Compilation_unit in
   let imports, env = Env.initial_env t resolver in
-  {
-    t with
-    content = content env t.id t.content;
-    doc = comment_docs env t.doc;
-    imports;
-  }
-
-and content env id =
-  let open Compilation_unit in
-  function
-  | Module m -> Module (signature env (id :> Id.Signature.t) m)
-  | Pack p -> Pack p
+  let env = (* Add doc to env *) Env.add_docs t.doc env in
+  let content, env =
+    match t.content with
+    | Module sg ->
+        (* Inline [signature] to keep [env]. *)
+        let env = Env.open_signature sg env in
+        let items = signature_items env (t.id :> Id.Signature.t) sg.items in
+        (Module { sg with items }, env)
+    | Pack _ as p -> (p, env)
+  in
+  let doc = comment_docs env t.doc in
+  { t with content; doc; imports }
 
 and value_ env parent t =
   let open Value in

test/xref2/references_scope.t/run.t

@@ -7,7 +7,7 @@
 The references from a.mli, see the attached text to recognize them:
 
   $ odoc_print a.odocl | jq_scan_references
-  [{"`Dot":[{"`Root":["B","`TUnknown"]},"C"]},[{"`Word":"Doc-relative"}]]
+  [{"`Resolved":{"`Module":[{"`Identifier":{"`Module":[{"`Root":[{"`RootPage":"test"},"A"]},"B"]}},"C"]}},[{"`Word":"Doc-relative"}]]
   [{"`Resolved":{"`Module":[{"`Module":[{"`Identifier":{"`Root":[{"`RootPage":"test"},"A"]}},"B"]},"C"]}},[{"`Word":"Doc-absolute"}]]
   [{"`Resolved":{"`Module":[{"`Identifier":{"`Module":[{"`Root":[{"`RootPage":"test"},"A"]},"B"]}},"C"]}},[{"`Word":"Defined-below"}]]
   [{"`Resolved":{"`Module":[{"`Module":[{"`Identifier":{"`Root":[{"`RootPage":"test"},"A"]}},"B"]},"C"]}},[{"`Word":"Defined-below-but-absolute"}]]