change approach to roughly the same as Pervasives use

Author: zth

analysis/src/PrintType.ml

@@ -6,13 +6,6 @@ let printExpr ?(lineWidth = 60) typ =
 
 let printDecl ?printNameAsIs ~recStatus name decl =
   Printtyp.reset_names ();
-  let name =
-    if
-      String.starts_with ~prefix:"Stdlib_" name
-      || String.starts_with ~prefix:"Stdlib." name
-    then String.sub name 7 (String.length name - 7)
-    else name
-  in
   Res_doc.to_string ~width:60
     (Res_outcome_printer.print_out_sig_item_doc ?print_name_as_is:printNameAsIs
        (Printtyp.tree_of_type_declaration (Ident.create name) decl recStatus))

compiler/ml/printtyp.ml

@@ -52,24 +52,32 @@ let ident ppf id = pp_print_string ppf (ident_name id)
 (* Print a path *)
 
 let ident_pervasives = Ident.create_persistent "Pervasives"
+let ident_stdlib = Ident.create_persistent "Stdlib"
 let printing_env = ref Env.empty
-let non_shadowed_pervasive = function
+let non_shadowed_pervasive_or_stdlib = function
   | Pdot (Pident id, s, _pos) as path -> (
-    Ident.same id ident_pervasives
+    (Ident.same id ident_pervasives || Ident.same id ident_stdlib)
     &&
     try Path.same path (Env.lookup_type (Lident s) !printing_env)
     with Not_found -> true)
   | _ -> false
 
 let rec tree_of_path = function
   | Pident id -> Oide_ident (ident_name id)
-  | Pdot (_, s, _pos) as path when non_shadowed_pervasive path -> Oide_ident s
+  | Pdot (p, s, _pos) when String.starts_with (Path.name p) ~prefix:"Stdlib_" ->
+    let path_name = Path.name p in
+    let ident_without_stdlib_prefix =
+      String.sub path_name 7 (String.length path_name - 7)
+    in
+    Oide_dot (Oide_ident ident_without_stdlib_prefix, s)
+  | Pdot (_, s, _pos) as path when non_shadowed_pervasive_or_stdlib path ->
+    Oide_ident s
   | Pdot (p, s, _pos) -> Oide_dot (tree_of_path p, s)
   | Papply (p1, p2) -> Oide_apply (tree_of_path p1, tree_of_path p2)
 
 let rec path ppf = function
   | Pident id -> ident ppf id
-  | Pdot (_, s, _pos) as path when non_shadowed_pervasive path ->
+  | Pdot (_, s, _pos) as path when non_shadowed_pervasive_or_stdlib path ->
     pp_print_string ppf s
   | Pdot (p, s, _pos) ->
     path ppf p;
@@ -571,48 +579,8 @@ let reset_and_mark_loops_list tyl =
 
 (* Disabled in classic mode when printing an unification error *)
 
-let remove_stdlib t =
-  match t.Types.desc with
-  | Tconstr
-      ( Pdot
-          ( Pdot (Pident {name = "Stdlib"; flags}, module_name, s1),
-            identifier,
-            s2 ),
-        type_params,
-        m ) ->
-    {
-      t with
-      desc =
-        Tconstr
-          ( Pdot (Pident {name = module_name; stamp = s1; flags}, identifier, s2),
-            type_params,
-            m );
-    }
-  | Tconstr
-      ( Pdot (Pident ({name = ident_name} as ident), identifier, s1),
-        type_params,
-        m )
-    when String.starts_with ~prefix:"Stdlib_" ident_name ->
-    {
-      t with
-      desc =
-        Tconstr
-          ( Pdot
-              ( Pident
-                  {
-                    ident with
-                    name = String.sub ident_name 7 (String.length ident_name - 7);
-                  },
-                identifier,
-                s1 ),
-            type_params,
-            m );
-    }
-  | _ -> t
-
 let rec tree_of_typexp sch ty =
   let ty = repr ty in
-  let ty = remove_stdlib ty in
   let px = proxy ty in
   if List.mem_assq px !names && not (List.memq px !delayed) then
     let mark = is_non_gen sch ty in
@@ -1446,8 +1414,6 @@ let report_unification_error ppf env ?(unif = true) tr txt1 txt2 =
   wrap_printing_env env (fun () -> unification_error env unif tr txt1 ppf txt2)
 
 let super_type_expansion ~tag t ppf t' =
-  let t = remove_stdlib t in
-  let t' = remove_stdlib t' in
   let tag = Format.String_tag tag in
   if same_path t t' then (
     Format.pp_open_stag ppf tag;

compiler/ml/printtyp.mli

@@ -68,7 +68,6 @@ val type_expansion : type_expr -> Format.formatter -> type_expr -> unit
 val prepare_expansion : type_expr * type_expr -> type_expr * type_expr
 val trace :
   bool -> bool -> string -> formatter -> (type_expr * type_expr) list -> unit
-val remove_stdlib : type_expr -> type_expr
 val report_unification_error :
   formatter ->
   Env.t ->

tests/analysis_tests/tests/src/expected/Auto.res.txt

@@ -1,3 +1,3 @@
 Hover src/Auto.res 2:13
-{"contents": {"kind": "markdown", "value": "```rescript\n('a => 'b, List.t<'a>) => List.t<'b>\n```\n\n---\n\n```\n \n```\n```rescript\ntype List.t<'a> = list<'a>\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Stdlib_List.resi%22%2C36%2C0%5D)\n"}}
+{"contents": {"kind": "markdown", "value": "```rescript\n('a => 'b, list<'a>) => list<'b>\n```"}}
 

tests/analysis_tests/tests/src/expected/Completion.res.txt

@@ -40,15 +40,15 @@ Path withDate
     "label": "Date.makeWithYMD()",
     "kind": 12,
     "tags": [],
-    "detail": "(~year: int, ~month: int, ~day: int) => t",
+    "detail": "(~year: int, ~month: int, ~date: int) => t",
     "documentation": null,
     "insertText": "Date.makeWithYMD($0)",
     "insertTextFormat": 2
   }, {
     "label": "Date.makeWithYMDHM()",
     "kind": 12,
     "tags": [],
-    "detail": "(\n  ~year: int,\n  ~month: int,\n  ~day: int,\n  ~hours: int,\n  ~minutes: int,\n) => t",
+    "detail": "(\n  ~year: int,\n  ~month: int,\n  ~date: int,\n  ~hours: int,\n  ~minutes: int,\n) => t",
     "documentation": null,
     "insertText": "Date.makeWithYMDHM($0)",
     "insertTextFormat": 2
@@ -80,7 +80,7 @@ Path withDate
     "label": "Date.makeWithYMDHMSM()",
     "kind": 12,
     "tags": [],
-    "detail": "(\n  ~year: int,\n  ~month: int,\n  ~day: int,\n  ~hours: int,\n  ~minutes: int,\n  ~seconds: int,\n  ~milliseconds: int,\n) => t",
+    "detail": "(\n  ~year: int,\n  ~month: int,\n  ~date: int,\n  ~hours: int,\n  ~minutes: int,\n  ~seconds: int,\n  ~milliseconds: int,\n) => t",
     "documentation": null,
     "insertText": "Date.makeWithYMDHMSM($0)",
     "insertTextFormat": 2
@@ -96,15 +96,15 @@ Path withDate
     "label": "Date.makeWithYMDHMS()",
     "kind": 12,
     "tags": [],
-    "detail": "(\n  ~year: int,\n  ~month: int,\n  ~day: int,\n  ~hours: int,\n  ~minutes: int,\n  ~seconds: int,\n) => t",
+    "detail": "(\n  ~year: int,\n  ~month: int,\n  ~date: int,\n  ~hours: int,\n  ~minutes: int,\n  ~seconds: int,\n) => t",
     "documentation": null,
     "insertText": "Date.makeWithYMDHMS($0)",
     "insertTextFormat": 2
   }, {
     "label": "Date.makeWithYMDH()",
     "kind": 12,
     "tags": [],
-    "detail": "(~year: int, ~month: int, ~day: int, ~hours: int) => t",
+    "detail": "(~year: int, ~month: int, ~date: int, ~hours: int) => t",
     "documentation": null,
     "insertText": "Date.makeWithYMDH($0)",
     "insertTextFormat": 2

tests/analysis_tests/tests/src/expected/CompletionTypeT.res.txt

@@ -66,7 +66,7 @@ module type FT = {
     let make: (~name: string) => React.element
   }
 }
-module NormaList = Stdlib.List
+module NormaList = List
 module BeltList = Belt.List
 module type MT2 = ModTyp
 module rec RM: ModTyp

tests/analysis_tests/tests/src/expected/CreateInterface.res.txt

@@ -5,10 +5,10 @@ Definition src/Definition.res 10:23
 {"uri": "Definition.res", "range": {"start": {"line": 6, "character": 7}, "end": {"line": 6, "character": 13}}}
 
 Hover src/Definition.res 14:14
-{"contents": {"kind": "markdown", "value": "```rescript\n(List.t<'a>, 'a => 'b) => List.t<'b>\n```\n\n---\n\n```\n \n```\n```rescript\ntype List.t<'a> = list<'a>\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Stdlib_List.resi%22%2C36%2C0%5D)\n\n---\n\n`map(list, f)` returns a new list with `f` applied to each element of `list`.\n\n## Examples\n\n```rescript\nlist{1, 2}->List.map(x => x + 1) // list{3, 4}\n```\n"}}
+{"contents": {"kind": "markdown", "value": "```rescript\n(list<'a>, 'a => 'b) => list<'b>\n```\n---\n\n`map(list, f)` returns a new list with `f` applied to each element of `list`.\n\n## Examples\n\n```rescript\nlist{1, 2}->List.map(x => x + 1) // list{3, 4}\n```\n"}}
 
 Hover src/Definition.res 18:14
-{"contents": {"kind": "markdown", "value": "```rescript\n('a => 'b, List.t<'a>) => List.t<'b>\n```\n\n---\n\n```\n \n```\n```rescript\ntype List.t<'a> = list<'a>\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Stdlib_List.resi%22%2C36%2C0%5D)\n"}}
+{"contents": {"kind": "markdown", "value": "```rescript\n('a => 'b, list<'a>) => list<'b>\n```"}}
 
 Hover src/Definition.res 23:3
 {"contents": {"kind": "markdown", "value": "```rescript\n(int, int) => int\n```"}}