Fix the issue by preparing texp for printing

ocaml · Jan 10, 2025 · 6b7ace8 · 6b7ace8
1 parent 5e4c6bd
commit 6b7ace8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/src/analysis/completion.ml b/src/analysis/completion.ml
@@ -57,12 +57,13 @@ let raw_info_printer : raw_info -> _ = function
       (Out_sig_item
          (Out_type.tree_of_type_declaration id tdecl Types.Trec_first))
   | `Type_scheme te ->
-    `Print (Out_type (Out_type.tree_of_typexp Type_scheme te))
+    `Print (Out_type (Type_utils.Printtyp.tree_of_typ_scheme te))
   | `Variant (label, arg) -> begin
     match arg with
     | None -> `String label
     | Some te ->
-      `Concat (label ^ " of ", Out_type (Out_type.tree_of_typexp Type_scheme te))
+      `Concat
+        (label ^ " of ", Out_type (Type_utils.Printtyp.tree_of_typ_scheme te))
   end
 
 (* List methods of an object.

diff --git a/src/analysis/type_utils.ml b/src/analysis/type_utils.ml
@@ -134,6 +134,10 @@ module Printtyp = struct
     (select_by_verbosity ~default:type_scheme ~verbose:(verbose_type_scheme env))
       ppf ty
 
+  let tree_of_typ_scheme te =
+    Out_type.prepare_for_printing [ te ];
+    Out_type.tree_of_typexp Type_scheme te
+
   let type_declaration env id ppf =
     (select_by_verbosity ~default:type_declaration
        ~verbose:(verbose_type_declaration env))

diff --git a/src/analysis/type_utils.mli b/src/analysis/type_utils.mli
@@ -40,6 +40,8 @@ module Printtyp : sig
 
   val type_scheme : Env.t -> Format.formatter -> Types.type_expr -> unit
 
+  val tree_of_typ_scheme : Types.type_expr -> Outcometree.out_type
+
   val modtype : Env.t -> Format.formatter -> Types.module_type -> unit
 
   val wrap_printing_env :

diff --git a/tests/test-dirs/completion/issue-lsp-503.t b/tests/test-dirs/completion/issue-lsp-503.t
@@ -14,14 +14,14 @@ We complete the name of the object
         {
           "name": "map",
           "kind": "Value",
-          "desc": "('a1 -> 'b1) -> 'a1 list -> 'b1 list",
+          "desc": "('a -> 'b) -> 'a list -> 'b list",
           "info": "",
           "deprecated": false
         },
         {
           "name": "mapi",
           "kind": "Value",
-          "desc": "(int -> 'a0 -> 'b0) -> 'a0 list -> 'b0 list",
+          "desc": "(int -> 'a -> 'b) -> 'a list -> 'b list",
           "info": "",
           "deprecated": false
         },