Fix module with constraints not being folded over

Signed-off-by: Paul-Elliot <[email protected]>

Author: panglesd

src/loader/implementation.ml

@@ -320,6 +320,13 @@ module Analysis = struct
           module_expr env (Odoc_model.Paths.Identifier.Mk.result parent) res
         in
         res
+    | Tmod_constraint (me, _, constr, _) ->
+      let c =
+        match constr with
+          Tmodtype_implicit -> []
+        | Tmodtype_explicit mt -> module_type env parent mt
+      in
+      c @ module_expr env parent me
     | _ -> []
 
   and unwrap_module_expr_desc = function

test/sources/lookup_def.t/run.t

@@ -17,7 +17,7 @@ Show the locations:
   [{"`ModuleType":[{"`Module":[{"`Root":["None","A"]},"N"]},"S"]},{"Some":{"`SourceLocation":[{"`SourcePage":[{"`Page":[{"Some":{"`Page":["None","root"]}},"source"]},"a.ml"]},"module-N.module_type-S"]}}]
   [{"`Value":[{"`ModuleType":[{"`Module":[{"`Root":["None","A"]},"N"]},"S"]},"x"]},{"Some":{"`SourceLocation":[{"`SourcePage":[{"`Page":[{"Some":{"`Page":["None","root"]}},"source"]},"a.ml"]},"module-N.module_type-S"]}}]
   [{"`Module":[{"`Module":[{"`Root":["None","A"]},"N"]},"T"]},{"Some":{"`SourceLocation":[{"`SourcePage":[{"`Page":[{"Some":{"`Page":["None","root"]}},"source"]},"a.ml"]},"module-N.module-T"]}}]
-  [{"`Value":[{"`Module":[{"`Module":[{"`Root":["None","A"]},"N"]},"T"]},"x"]},{"Some":{"`SourceLocation":[{"`SourcePage":[{"`Page":[{"Some":{"`Page":["None","root"]}},"source"]},"a.ml"]},"def_3"]}}]
+  [{"`Value":[{"`Module":[{"`Module":[{"`Root":["None","A"]},"N"]},"T"]},"x"]},{"Some":{"`SourceLocation":[{"`SourcePage":[{"`Page":[{"Some":{"`Page":["None","root"]}},"source"]},"a.ml"]},"module-N.module-T.value-x"]}}]
   [{"`Type":[{"`Root":["None","A"]},"t"]},{"Some":{"`SourceLocation":[{"`SourcePage":[{"`Page":[{"Some":{"`Page":["None","root"]}},"source"]},"a.ml"]},"type-t"]}}]
   [{"`Value":[{"`Root":["None","A"]},"a"]},{"Some":{"`SourceLocation":[{"`SourcePage":[{"`Page":[{"Some":{"`Page":["None","root"]}},"source"]},"a.ml"]},"value-a"]}}]
   [{"`Exception":[{"`Root":["None","A"]},"Exn"]},{"Some":{"`SourceLocation":[{"`SourcePage":[{"`Page":[{"Some":{"`Page":["None","root"]}},"source"]},"a.ml"]},"exception-Exn"]}}]

test/sources/source.t/a.ml

@@ -21,5 +21,10 @@ class cls = object end
 class cls' = cls
 class type ct = object end
 
-
 let x _ = raise Exn
+
+module X : sig
+  type t
+end = struct
+  type t = int
+end

test/sources/source.t/run.t

@@ -24,8 +24,13 @@ Files containing some values:
   class cls' = cls
   class type ct = object end
 
-  
   let x _ = raise Exn
+  
+  module X : sig
+    type t
+  end = struct
+    type t = int
+  end
 
 Source pages require a parent:
 
@@ -125,6 +130,10 @@ Source links generated in the documentation:
       <div class="spec value anchored" id="val-x">
        <a href="#val-x" class="anchor"></a>
        <a href="../root/source/a.ml.html#value-x" class="source_link">Source
+  --
+      <div class="spec module anchored" id="module-X">
+       <a href="#module-X" class="anchor"></a>
+       <a href="../root/source/a.ml.html#module-X" class="source_link">Source
 
 Ids generated in the source code:
 
@@ -154,6 +163,11 @@ Ids generated in the source code:
   id="L23"
   id="L24"
   id="L25"
+  id="L26"
+  id="L27"
+  id="L28"
+  id="L29"
+  id="L30"
   id="type-t"
   id="type-truc"
   id="value-{x}2"
@@ -172,3 +186,6 @@ Ids generated in the source code:
   id="class-cls'"
   id="class_type-ct"
   id="value-x"
+  id="module-X"
+  id="module-X.type-t"
+  id="module-X.type-t"