hide Stdlib. and Stdlib_ in errors and editor type expr printing

Author: zth

compiler/ml/printtyp.ml

@@ -571,8 +571,48 @@ 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
@@ -1406,6 +1446,8 @@ 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,6 +68,7 @@ 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, Stdlib.List.t<'a>) => Stdlib.List.t<'b>\n```\n\n---\n\n```\n \n```\n```rescript\ntype Stdlib.List.t<'a> = list<'a>\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Stdlib_List.resi%22%2C34%2C0%5D)\n"}}
+{"contents": {"kind": "markdown", "value": "```rescript\n('a => 'b, List.t<'a>) => List.t<'b>\n```\n\n---\n\n```\n \n```\n```rescript\ntype Stdlib.List.t<'a> = list<'a>\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Stdlib_List.resi%22%2C34%2C0%5D)\n"}}
 

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

@@ -116,13 +116,13 @@ Path Array.
     "label": "getSymbol",
     "kind": 12,
     "tags": [],
-    "detail": "(array<'a>, Stdlib_Symbol.t) => option<'b>",
+    "detail": "(array<'a>, Symbol.t) => option<'b>",
     "documentation": null
   }, {
     "label": "getSymbolUnsafe",
     "kind": 12,
     "tags": [],
-    "detail": "(array<'a>, Stdlib_Symbol.t) => 'b",
+    "detail": "(array<'a>, Symbol.t) => 'b",
     "documentation": null
   }, {
     "label": "findIndexOpt",
@@ -218,7 +218,7 @@ Path Array.
     "label": "sort",
     "kind": 12,
     "tags": [],
-    "detail": "(array<'a>, ('a, 'a) => Stdlib_Ordering.t) => unit",
+    "detail": "(array<'a>, ('a, 'a) => Ordering.t) => unit",
     "documentation": {"kind": "markdown", "value": "\n`sort(array, comparator)` sorts `array` in-place using the `comparator` function.\n\nBeware this will *mutate* the array.\n\nSee [`Array.sort`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort) on MDN.\n\n## Examples\n\n```rescript\nlet array = [3, 2, 1]\narray->Array.sort((a, b) => float(a - b))\narray->assertEqual([1, 2, 3])\n```\n"}
   }, {
     "label": "length",
@@ -326,7 +326,7 @@ Path Array.
     "label": "compare",
     "kind": 12,
     "tags": [],
-    "detail": "(\n  array<'a>,\n  array<'a>,\n  ('a, 'a) => Stdlib_Ordering.t,\n) => Stdlib_Ordering.t",
+    "detail": "(array<'a>, array<'a>, ('a, 'a) => Ordering.t) => Ordering.t",
     "documentation": null
   }, {
     "label": "join",
@@ -404,7 +404,7 @@ Path Array.
     "label": "setSymbol",
     "kind": 12,
     "tags": [],
-    "detail": "(array<'a>, Stdlib_Symbol.t, 'b) => unit",
+    "detail": "(array<'a>, Symbol.t, 'b) => unit",
     "documentation": null
   }, {
     "label": "equal",
@@ -458,7 +458,7 @@ Path Array.
     "label": "toSorted",
     "kind": 12,
     "tags": [],
-    "detail": "(array<'a>, ('a, 'a) => Stdlib_Ordering.t) => array<'a>",
+    "detail": "(array<'a>, ('a, 'a) => Ordering.t) => array<'a>",
     "documentation": {"kind": "markdown", "value": "\n`toSorted(array, comparator)` returns a new, sorted array from `array`, using the `comparator` function.\n\nSee [`Array.toSorted`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toSorted) on MDN.\n\n## Examples\n\n```rescript\nlet someArray = [3, 2, 1]\n\nsomeArray\n->Array.toSorted(Int.compare)\n->assertEqual([1, 2, 3])\n\nsomeArray->assertEqual([3, 2, 1]) // Original unchanged\n```\n"}
   }, {
     "label": "reduceWithIndex",
@@ -518,7 +518,7 @@ Path Array.
     "label": "fromIterator",
     "kind": 12,
     "tags": [],
-    "detail": "Stdlib_Iterator.t<'a> => array<'a>",
+    "detail": "Iterator.t<'a> => array<'a>",
     "documentation": {"kind": "markdown", "value": "\n`fromIterator(iterator)`\n\nCreates an array from the provided `iterator`\n\n## Examples\n\n```rescript\nMap.fromArray([(\"foo\", 1), (\"bar\", 2)])\n->Map.values\n->Array.fromIterator\n->assertEqual([1, 2])\n```\n"}
   }, {
     "label": "forEach",

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

@@ -260,7 +260,7 @@ Path Stdlib.Int.
     "label": "Int.compare",
     "kind": 12,
     "tags": [],
-    "detail": "(int, int) => Stdlib_Ordering.t",
+    "detail": "(int, int) => Ordering.t",
     "documentation": null
   }, {
     "label": "Int.toPrecision",
@@ -387,7 +387,7 @@ Path Stdlib.Int.
     "label": "Int.compare",
     "kind": 12,
     "tags": [],
-    "detail": "(int, int) => Stdlib_Ordering.t",
+    "detail": "(int, int) => Ordering.t",
     "documentation": null
   }, {
     "label": "Int.toPrecision",
@@ -751,7 +751,7 @@ Path Stdlib.String.s
     "label": "->String.searchOpt",
     "kind": 12,
     "tags": [],
-    "detail": "(string, Stdlib_RegExp.t) => option<int>",
+    "detail": "(string, RegExp.t) => option<int>",
     "documentation": {"kind": "markdown", "value": "\n`searchOpt(str, regexp)`. Like `search`, but return an `option<int>`.\n\n## Examples\n\n```rescript\nString.searchOpt(\"testing 1 2 3\", %re(\"/\\d+/\")) == Some(8)\nString.searchOpt(\"no numbers\", %re(\"/\\d+/\")) == None\n```\n"},
     "sortText": "searchOpt",
     "insertText": "->String.searchOpt",
@@ -763,7 +763,7 @@ Path Stdlib.String.s
     "label": "->String.splitByRegExpAtMost",
     "kind": 12,
     "tags": [],
-    "detail": "(\n  string,\n  Stdlib_RegExp.t,\n  ~limit: int,\n) => array<option<string>>",
+    "detail": "(string, RegExp.t, ~limit: int) => array<option<string>>",
     "documentation": {"kind": "markdown", "value": "\n`splitByRegExpAtMost(str, regexp, ~limit)` splits the given `str` at every\noccurrence of `regexp` and returns an array of the first `limit` resulting\nsubstrings. If `limit` is negative or greater than the number of substrings, the\narray will contain all the substrings.\nSee [`String.split`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/split) on MDN.\n\n## Examples\n\n```rescript\nString.splitByRegExpAtMost(\"Hello World. How are you doing?\", %re(\"/ /\"), ~limit=3) == [\n  Some(\"Hello\"),\n  Some(\"World.\"),\n  Some(\"How\"),\n]\n```\n"},
     "sortText": "splitByRegExpAtMost",
     "insertText": "->String.splitByRegExpAtMost",
@@ -799,7 +799,7 @@ Path Stdlib.String.s
     "label": "->String.setSymbol",
     "kind": 12,
     "tags": [],
-    "detail": "(string, Stdlib_Symbol.t, 'a) => unit",
+    "detail": "(string, Symbol.t, 'a) => unit",
     "documentation": null,
     "sortText": "setSymbol",
     "insertText": "->String.setSymbol",
@@ -811,7 +811,7 @@ Path Stdlib.String.s
     "label": "->String.splitByRegExp",
     "kind": 12,
     "tags": [],
-    "detail": "(string, Stdlib_RegExp.t) => array<option<string>>",
+    "detail": "(string, RegExp.t) => array<option<string>>",
     "documentation": {"kind": "markdown", "value": "\n`splitByRegExp(str, regexp)` splits the given `str` at every occurrence of\n`regexp` and returns an array of the resulting substrings.\nSee [`String.split`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/split) on MDN.\n\n## Examples\n\n```rescript\nString.splitByRegExp(\"Jan,Feb,Mar\", %re(\"/,/\")) == [Some(\"Jan\"), Some(\"Feb\"), Some(\"Mar\")]\n```\n"},
     "sortText": "splitByRegExp",
     "insertText": "->String.splitByRegExp",
@@ -859,7 +859,7 @@ Path Stdlib.String.s
     "label": "->String.search",
     "kind": 12,
     "tags": [],
-    "detail": "(string, Stdlib_RegExp.t) => int",
+    "detail": "(string, RegExp.t) => int",
     "documentation": {"kind": "markdown", "value": "\n`search(str, regexp)` returns the starting position of the first match of\n`regexp` in the given `str`, or -1 if there is no match.\nSee [`String.search`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/search) on MDN.\n\n## Examples\n\n```rescript\nString.search(\"testing 1 2 3\", %re(\"/\\d+/\")) == 8\nString.search(\"no numbers\", %re(\"/\\d+/\")) == -1\n```\n"},
     "sortText": "search",
     "insertText": "->String.search",

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

@@ -9,13 +9,13 @@ Path date
     "label": "None",
     "kind": 12,
     "tags": [],
-    "detail": "Stdlib.Date.t",
+    "detail": "Date.t",
     "documentation": {"kind": "markdown", "value": "\nA type representing a JavaScript date.\n"}
   }, {
     "label": "Some(_)",
     "kind": 12,
     "tags": [],
-    "detail": "Stdlib.Date.t",
+    "detail": "Date.t",
     "documentation": {"kind": "markdown", "value": "\nA type representing a JavaScript date.\n"},
     "insertText": "Some(${1:_})",
     "insertTextFormat": 2

tests/analysis_tests/tests/src/expected/Definition.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(Stdlib.List.t<'a>, 'a => 'b) => Stdlib.List.t<'b>\n```\n\n---\n\n```\n \n```\n```rescript\ntype Stdlib.List.t<'a> = list<'a>\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Stdlib_List.resi%22%2C34%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.t<'a>, 'a => 'b) => List.t<'b>\n```\n\n---\n\n```\n \n```\n```rescript\ntype Stdlib.List.t<'a> = list<'a>\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Stdlib_List.resi%22%2C34%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"}}
 
 Hover src/Definition.res 18:14
-{"contents": {"kind": "markdown", "value": "```rescript\n('a => 'b, Stdlib.List.t<'a>) => Stdlib.List.t<'b>\n```\n\n---\n\n```\n \n```\n```rescript\ntype Stdlib.List.t<'a> = list<'a>\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Stdlib_List.resi%22%2C34%2C0%5D)\n"}}
+{"contents": {"kind": "markdown", "value": "```rescript\n('a => 'b, List.t<'a>) => List.t<'b>\n```\n\n---\n\n```\n \n```\n```rescript\ntype Stdlib.List.t<'a> = list<'a>\n```\nGo to: [Type definition](command:rescript-vscode.go_to_location?%5B%22Stdlib_List.resi%22%2C34%2C0%5D)\n"}}
 
 Hover src/Definition.res 23:3
 {"contents": {"kind": "markdown", "value": "```rescript\n(int, int) => int\n```"}}

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

@@ -29,7 +29,7 @@ Path Firebase.Firestore.
     "label": "->Firestore.getDoc",
     "kind": 12,
     "tags": [],
-    "detail": "documentReference<\n  'documentdata,\n> => Stdlib.Promise.t<documentSnapshot<'documentdata>>",
+    "detail": "documentReference<\n  'documentdata,\n> => Promise.t<documentSnapshot<'documentdata>>",
     "documentation": null,
     "sortText": "getDoc",
     "insertText": "->Firestore.getDoc",