Sync with syntax repo to print uncurried types.

Author: cristianoc

Changes.md

@@ -1,5 +1,6 @@
 ## master
 - Add support for doc strings when hovering on modules.
+- Add support for printing uncurried function types in hover.
 
 ## Release 1.0.3 of rescript-vscode 
 This [commit](https://github.com/rescript-lang/rescript-editor-support/commit/214d220d8573f9f0c8d54e623c163e01617bf124) is vendored in [rescript-vscode 1.0.3](https://github.com/rescript-lang/rescript-vscode/releases/tag/1.0.3).

examples/example-project/src/ZZ.res

@@ -83,4 +83,6 @@ type vr = | V1 | V2
 
 let v1 = V1
 
-module DoubleNested = ModuleWithDocComment.Nested.NestedAgain
+module DoubleNested = ModuleWithDocComment.Nested.NestedAgain
+
+let uncurried = (. x) => x+1;

src/rescript-editor-support/vendor/res_outcome_printer/res_doc.ml

@@ -234,7 +234,7 @@ let debug t =
   let rec toDoc = function
     | Nil -> text "nil"
     | BreakParent -> text "breakparent"
-    | Text txt -> text ("text(" ^ txt ^ ")")
+    | Text txt -> text ("text(\"" ^ txt ^ "\")")
     | LineSuffix doc -> group(
         concat [
           text "linesuffix(";
@@ -245,6 +245,7 @@ let debug t =
           text ")"
         ]
       )
+    | Concat [] -> text "concat()"
     | Concat docs -> group(
         concat [
           text "concat(";
@@ -312,7 +313,7 @@ let debug t =
           indent (
             concat [
               line;
-              text ("shouldBreak: " ^ (string_of_bool shouldBreak));
+              text ("{shouldBreak: " ^ (string_of_bool shouldBreak) ^ "}");
               concat [text ",";  line];
               toDoc doc;
             ]

src/rescript-editor-support/vendor/res_outcome_printer/res_outcome_printer.ml

@@ -10,6 +10,13 @@
 module Doc = Res_doc
 module Token = Res_token
 
+(* checks if ident contains "arity", like in "arity1", "arity2", "arity3" etc. *)
+let isArityIdent ident =
+  if String.length ident >= 6 then
+    (String.sub [@doesNotRaise]) ident 0 5 = "arity"
+  else
+    false
+
 type identifierStyle =
   | ExoticIdent
   | NormalIdent
@@ -195,6 +202,21 @@ let printIdentLike ~allowUident txt =
          Doc.text " as '";
          Doc.text aliasTxt
        ]
+     | Otyp_constr (
+        Oide_dot (Oide_dot (Oide_ident "Js", "Fn") , "arity0"), (* Js.Fn.arity0 *)
+        [Otyp_constr (Oide_ident ident, [])] (* int or unit or string *)
+       ) ->
+        (* Js.Fn.arity0<int> -> (.) => int*)
+        Doc.concat [
+          Doc.text "(.) => ";
+          Doc.text ident;
+        ]
+     | Otyp_constr (
+        Oide_dot (Oide_dot (Oide_ident "Js", "Fn") , ident), (* Js.Fn.arity2 *)
+        [(Otyp_arrow _) as arrowType] (* (int, int) => int *)
+     ) when isArityIdent ident ->
+      (* Js.Fn.arity2<(int, int) => int> -> (. int, int) => int*)
+       printOutArrowType ~uncurried:true arrowType
      | Otyp_constr (outIdent, []) ->
        printOutIdentDoc ~allowUident:false outIdent
      | Otyp_manifest (typ1, typ2) ->
@@ -283,51 +305,56 @@ let printIdentLike ~allowUident txt =
          ]
        )
      | Otyp_arrow _ as typ ->
-       let (typArgs, typ) = collectArrowArgs typ [] in
-       let args = Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
-         List.map (fun (lbl, typ) ->
-           if lbl = "" then
-             printOutTypeDoc typ
-           else
-             Doc.group (
-               Doc.concat [
-                 Doc.text ("~" ^ lbl ^ ": ");
-                 printOutTypeDoc typ
-               ]
-             )
-         ) typArgs
-       ) in
-       let argsDoc =
-         let needsParens = match typArgs with
-         | [_, (Otyp_tuple _ | Otyp_arrow _)] -> true
-         (* single argument should not be wrapped *)
-         | ["", _] -> false
-         | _ -> true
-         in
-         if needsParens then
+       printOutArrowType ~uncurried:false typ
+     | Otyp_module (_modName, _stringList, _outTypes) ->
+         Doc.nil
+
+   and printOutArrowType ~uncurried typ =
+     let (typArgs, typ) = collectArrowArgs typ [] in
+     let args = Doc.join ~sep:(Doc.concat [Doc.comma; Doc.line]) (
+       List.map (fun (lbl, typ) ->
+         if lbl = "" then
+           printOutTypeDoc typ
+         else
            Doc.group (
              Doc.concat [
-               Doc.lparen;
-               Doc.indent (
-                 Doc.concat [
-                   Doc.softLine;
-                   args;
-                 ]
-               );
-               Doc.trailingComma;
-               Doc.softLine;
-               Doc.rparen;
+               Doc.text ("~" ^ lbl ^ ": ");
+               printOutTypeDoc typ
              ]
            )
-         else args
+       ) typArgs
+     ) in
+     let argsDoc =
+       let needsParens = match typArgs with
+       | _ when uncurried -> true
+       | [_, (Otyp_tuple _ | Otyp_arrow _)] -> true
+       (* single argument should not be wrapped *)
+       | ["", _] -> false
+       | _ -> true
        in
-       Doc.concat [
-         argsDoc;
-         Doc.text " => ";
-         printOutTypeDoc typ;
-       ]
-     | Otyp_module (_modName, _stringList, _outTypes) ->
-         Doc.nil
+       if needsParens then
+         Doc.group (
+           Doc.concat [
+             if uncurried then Doc.text "(. " else Doc.lparen;
+             Doc.indent (
+               Doc.concat [
+                 Doc.softLine;
+                 args;
+               ]
+             );
+             Doc.trailingComma;
+             Doc.softLine;
+             Doc.rparen;
+           ]
+         )
+       else args
+     in
+     Doc.concat [
+       argsDoc;
+       Doc.text " => ";
+       printOutTypeDoc typ;
+     ]
+
 
    and printOutVariant variant = match variant with
      | Ovar_fields fields -> (* (string * bool * out_type list) list *)