fix signature help in uncurried mode

Author: zth

analysis/src/SignatureHelp.ml

@@ -39,10 +39,23 @@ let findFunctionType ~currentFile ~debug ~path ~pos =
 let extractParameters ~signature ~typeStrForParser ~labelPrefixLen =
   match signature with
   | [
-   {
-     Parsetree.psig_desc =
-       Psig_value {pval_type = {ptyp_desc = Ptyp_arrow _} as expr};
-   };
+   ( {
+       Parsetree.psig_desc =
+         Psig_value {pval_type = {ptyp_desc = Ptyp_arrow _} as expr};
+     }
+   | {
+       psig_desc =
+         Psig_value
+           {
+             pval_type =
+               {
+                 ptyp_desc =
+                   Ptyp_constr
+                     ( {txt = Lident "function$"},
+                       [({ptyp_desc = Ptyp_arrow _} as expr); _] );
+               };
+           };
+     } );
   ] ->
     let rec extractParams expr params =
       match expr with
@@ -257,12 +270,13 @@ let signatureHelp ~path ~pos ~currentFile ~debug =
       in
       let expr (iterator : Ast_iterator.iterator) (expr : Parsetree.expression)
           =
+        (*DumpAst.printExprItem ~pos ~indentation:0 expr |> print_endline;*)
         (match expr with
         (* Handle pipes, like someVar->someFunc(... *)
         | {
          pexp_desc =
            Pexp_apply
-             ( {pexp_desc = Pexp_ident {txt = Lident "|."}},
+             ( {pexp_desc = Pexp_ident {txt = Lident ("|." | "|.u")}},
                [
                  _;
                  ( _,
@@ -280,7 +294,7 @@ let signatureHelp ~path ~pos ~currentFile ~debug =
             searchForArgWithCursor ~isPipeExpr:true ~args
           in
           setFound (argAtCursor, exp, extractedArgs)
-        (* Look for applying idents, like someIdent(...) *)
+          (* Look for applying idents, like someIdent(...) *)
         | {
          pexp_desc = Pexp_apply (({pexp_desc = Pexp_ident _} as exp), args);
          pexp_loc;

analysis/tests/src/SignatureHelpUncurried.res

@@ -0,0 +1,78 @@
+@@uncurried
+
+type someVariant = One | Two | Three
+
+/** Does stuff. */
+let someFunc = (one: int, ~two: option<string>=?, ~three: unit => unit, ~four: someVariant, ()) => {
+  ignore(one)
+  ignore(two)
+  ignore(three())
+  ignore(four)
+}
+
+let otherFunc = (first: string, second: int, third: float) => {
+  ignore(first)
+  ignore(second)
+  ignore(third)
+}
+
+// let _ = someFunc(
+//                  ^she
+
+// let _ = someFunc(1
+//                   ^she
+
+// let _ = someFunc(123, ~two
+//                           ^she
+
+// let _ = someFunc(123, ~two="123"
+//                               ^she
+
+// let _ = someFunc(123, ~two="123", ~four
+//                                    ^she
+
+// let _ = someFunc(123, ~two="123", ~four=O
+//                                        ^she
+
+// let _ = otherFunc(
+//                   ^she
+
+// let _ = otherFunc("123"
+//                      ^she
+
+// let _ = otherFunc("123", 123, 123.0)
+//                                 ^she
+
+// let _ = Completion.Lib.foo(~age
+//                               ^she
+
+let iAmSoSpecial = (iJustHaveOneArg: string) => {
+  ignore(iJustHaveOneArg)
+}
+
+// let _ = iAmSoSpecial(
+//                      ^she
+
+// let _ = "hello"->otherFunc(1
+//                             ^she
+
+let fn = (age: int, name: string, year: int) => {
+  ignore(age)
+  ignore(name)
+  ignore(year)
+}
+
+// let _ = fn(22, )
+//               ^she
+
+// let _ = fn(22, , 2023)
+//               ^she
+
+// let _ = fn(12, "hello", )
+//                        ^she
+
+// let _ = fn({ iAmSoSpecial() })
+//                           ^she
+
+// let _ = fn({ iAmSoSpecial({ someFunc() }) })
+//                                      ^she