Add info about displayed name in references

src/document/comment.ml

@@ -43,7 +43,7 @@ module Reference = struct
     | `Field (r, s) -> render_resolved (r :> t) ^ "." ^ FieldName.to_string s
     | `Extension (r, s) ->
         render_resolved (r :> t) ^ "." ^ ExtensionName.to_string s
-    | `ExtensionDecl (r, s) ->
+    | `ExtensionDecl (r, _, s) ->
         render_resolved (r :> t) ^ "." ^ ExtensionName.to_string s
     | `Exception (r, s) ->
         render_resolved (r :> t) ^ "." ^ ExceptionName.to_string s

src/model/paths.ml

@@ -855,7 +855,7 @@ module Reference = struct
           Identifier.Mk.constructor (parent_type_identifier s, n)
       | `Extension (p, q) ->
           Identifier.Mk.extension (parent_signature_identifier p, q)
-      | `ExtensionDecl (p, q) ->
+      | `ExtensionDecl (p, q, _) ->
           Identifier.Mk.extension_decl (parent_signature_identifier p, q)
       | `Exception (p, q) ->
           Identifier.Mk.exception_ (parent_signature_identifier p, q)

src/model/paths_types.ml

@@ -803,7 +803,6 @@ and Resolved_reference : sig
     [ `Identifier of Identifier.reference_constructor
     | `Constructor of datatype * ConstructorName.t
     | `Extension of signature * ExtensionName.t
-    | `ExtensionDecl of signature * ExtensionName.t
     | `Exception of signature * ExceptionName.t ]
   (** @canonical Odoc_model.Paths.Reference.Resolved.Constructor.t *)
 
@@ -820,7 +819,8 @@ and Resolved_reference : sig
 
   type extension_decl =
     [ `Identifier of Identifier.reference_extension
-    | `ExtensionDecl of signature * ExtensionName.t
+    | `ExtensionDecl of
+      signature * ExtensionName.t (* url *) * ExtensionName.t (* displayed *)
     | `Exception of signature * ExceptionName.t ]
   (** @canonical Odoc_model.Paths.Reference.Resolved.Extension.t *)
 
@@ -874,7 +874,7 @@ and Resolved_reference : sig
     | `Constructor of datatype * ConstructorName.t
     | `Field of parent * FieldName.t
     | `Extension of signature * ExtensionName.t
-    | `ExtensionDecl of signature * ExtensionName.t
+    | `ExtensionDecl of signature * ExtensionName.t * ExtensionName.t
     | `Exception of signature * ExceptionName.t
     | `Value of signature * ValueName.t
     | `Class of signature * ClassName.t

src/model_desc/paths_desc.ml

@@ -350,11 +350,13 @@ module General_paths = struct
             ( "`Extension",
               ((x1 :> rr), x2),
               Pair (resolved_reference, Names.extensionname) )
-      | `ExtensionDecl (x1, x2) ->
+      | `ExtensionDecl (x1, x2, x3) ->
           C
             ( "`ExtensionDecl",
-              ((x1 :> rr), x2),
-              Pair (resolved_reference, Names.extensionname) )
+              ((x1 :> rr), x2, x3),
+              Triple
+                (resolved_reference, Names.extensionname, Names.extensionname)
+            )
       | `Field (x1, x2) ->
           C
             ( "`Field",

src/xref2/component.ml

@@ -1417,7 +1417,7 @@ module Fmt = struct
         Format.fprintf ppf "%a.%s" model_resolved_reference
           (parent :> t)
           (ExtensionName.to_string name)
-    | `ExtensionDecl (parent, name) ->
+    | `ExtensionDecl (parent, name, _) ->
         Format.fprintf ppf "%a.%s" model_resolved_reference
           (parent :> t)
           (ExtensionName.to_string name)

src/xref2/ref_tools.ml

@@ -404,7 +404,9 @@ module ED = struct
         let parent_id = match id.iv with `Extension (parent, _) -> parent in
         Ok
           (`ExtensionDecl
-            (`Identifier parent_id, ExtensionName.make_std c.name))
+            ( `Identifier parent_id,
+              ExtensionName.make_std c.name,
+              ExtensionName.make_std name ))
 
   let in_signature _env ((parent', parent_cp, sg) : signature_lookup_result)
       name =
@@ -413,7 +415,8 @@ module ED = struct
     >>= fun (`FExt (ext, _) : Find.extension) ->
     match ext.constructors with
     | [] -> assert false
-    | c :: _ -> Ok (`ExtensionDecl (parent', ExtensionName.make_std c.name))
+    | c :: _ ->
+        Ok (`ExtensionDecl (parent', ExtensionName.make_std c.name, name))
 end
 
 module EX = struct

test/xref2/github_issue_932.t/run.t

@@ -43,7 +43,7 @@ The rendered html
   --
       <li>extension-decl-A : <a href="#extension-decl-A"><code>Foo.A</code></a>
       </li>
-      <li>extension-decl-B : <a href="#extension-decl-A"><code>Foo.A</code></a>
+      <li>extension-decl-B : <a href="#extension-decl-A"><code>Foo.B</code></a>
       </li><li>extension-A : <a href="#extension-A"><code>A</code></a></li>
       <li>extension-B : <a href="#extension-B"><code>B</code></a></li>
       <li>A : <a href="#extension-A"><code>A</code></a></li>
@@ -53,7 +53,7 @@ The rendered html
        <a href="M/index.html#extension-decl-A"><code>M.A</code></a>
       </li>
       <li>M.extension-decl-B : 
-       <a href="M/index.html#extension-decl-A"><code>M.A</code></a>
+       <a href="M/index.html#extension-decl-A"><code>M.B</code></a>
       </li>
       <li>M.extension-A : 
        <a href="M/index.html#extension-A"><code>M.A</code></a>