fix wrong location taken on types

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

Author: panglesd

src/loader/ident_env.cppo.ml

@@ -303,11 +303,11 @@ let rec extract_structure_tree_items : bool -> Typedtree.structure_item list ->
   let open Typedtree in
     match items with
 #if OCAML_VERSION < (4,3,0)
-    | { str_desc = Tstr_type decls; str_loc; _ } :: rest ->
+    | { str_desc = Tstr_type decls; _ } :: rest ->
 #else
-    | { str_desc = Tstr_type (_, decls); str_loc; _ } :: rest -> (* TODO: handle rec_flag *)
+    | { str_desc = Tstr_type (_, decls); _ } :: rest -> (* TODO: handle rec_flag *)
 #endif
-        List.map (fun decl -> `Type (decl.typ_id, hide_item, Some str_loc))
+        List.map (fun decl -> `Type (decl.typ_id, hide_item, Some decl.typ_loc))
           decls @ extract_structure_tree_items hide_item rest
 
 #if OCAML_VERSION < (4,14,0)

test/sources/source.t/a.ml

@@ -28,3 +28,6 @@ module X : sig
 end = struct
   type t = int
 end
+
+type a1 = int
+and a2 = a1

test/sources/source.t/run.t

@@ -31,6 +31,9 @@ Files containing some values:
   end = struct
     type t = int
   end
+  
+  type a1 = int
+  and a2 = a1
 
 Source pages require a parent:
 
@@ -134,6 +137,14 @@ Source links generated in the documentation:
       <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
+  --
+      <div class="spec type anchored" id="type-a1">
+       <a href="#type-a1" class="anchor"></a>
+       <a href="../root/source/a.ml.html#def_24" class="source_link">Source</a>
+  --
+      <div class="spec type anchored" id="type-a2">
+       <a href="#type-a2" class="anchor"></a>
+       <a href="../root/source/a.ml.html#def_25" class="source_link">Source</a>
 
 Ids generated in the source code:
 
@@ -168,6 +179,9 @@ Ids generated in the source code:
   id="L28"
   id="L29"
   id="L30"
+  id="L31"
+  id="L32"
+  id="L33"
   id="type-t"
   id="type-truc"
   id="value-{x}2"
@@ -189,3 +203,5 @@ Ids generated in the source code:
   id="module-X"
   id="module-X.type-t"
   id="module-X.type-t"
+  id="def_24"
+  id="def_25"