rescript-lang · zth · Sep 22, 2022 · Jul 25, 2022 · Jul 25, 2022 · Jul 25, 2022
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - Add support for create interface file for JSX V4 https://github.com/rescript-lang/rescript-vscode/pull/580
 - Expand one level of type definition on hover. Dig into record/variant body. https://github.com/rescript-lang/rescript-vscode/pull/584
 - Add clickable links to type definitions in hovers. https://github.com/rescript-lang/rescript-vscode/pull/585
+- Add experimental signature help for function calls. https://github.com/rescript-lang/rescript-vscode/pull/547
 
 #### :bug: Bug Fix
 

diff --git a/README.md b/README.md
@@ -68,6 +68,7 @@ The only 2 themes we don't (and can't) support, due to their lack of coloring, a
 - Find references.
 - Rename.
 - Inlay Hints.
+- Signature help.
 - Code lenses.
 - Snippets to ease a few syntaxes:
   - `external` features such as `@bs.module` and `@bs.val`
@@ -85,14 +86,15 @@ ext install chenglou92.rescript-vscode
 The plugin activates on `.res` and `.resi` files. If you've already got Reason-Language-Server installed, it's possible that the latter took precedence over this one. Make sure you're using this plugin ("ReScript syntax") rather than Reason-Language-Server ("BuckleScript syntax").
 
 ### Pre-release channel
+
 There is a pre-release channel available. It is intended for testing new and therefore possibly unstable features. You can activate it by clicking on the "Switch to Pre-Release Version" button on the `rescript-vscode` extension page in VSCode. From this point on, pre-release versions will always have an odd version minor (1.5.x, 1.7.x, 2.1.x, etc.) while stable releases have even version minor numbers (1.4.x, 1.6.x, 2.0.0, etc.).
 
 Even if the pre-release channel seems too experimental to you, we still suggest you to give it a try and submit any issues that you run into. In the long run it will give us a better editor experience overall.
 
 ## 📦 Commands
 
 | Command                                                          | Description                                                                                                                                                                                                                                                                                           |
-|------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| ---------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | ReScript: Create an interface file for this implementation file  | Creates an interface file (`.resi`) for the current `.res` file, automatically filling in all types and values in the current file.                                                                                                                                                                   |
 | ReScript: Open the compiled JS file for this implementation file | Opens the compiled JS file for the current ReScript file.                                                                                                                                                                                                                                             |
 | ReScript: Switch implementation/interface                        | Switches between the implementation and interface file. If you're in a `.res` file, the command will open the corresponding `.resi` file (if it exists), and if you're in a `.resi` file the command will open the corresponding `.res` file. This can also be triggered with the keybinding `Alt+O`. |
@@ -104,10 +106,11 @@ You'll find all ReScript specific settings under the scope `rescript.settings`.
 
 | Setting                        | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
 | ------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| Prompt to Start Build  | If there's no ReScript build running already in the opened project, the extension will prompt you and ask if you want to start a build automatically. You can turn off this automatic prompt via the setting `rescript.settings.askToStartBuild`.                                                                                                                                                                                                                                    |
+| Prompt to Start Build          | If there's no ReScript build running already in the opened project, the extension will prompt you and ask if you want to start a build automatically. You can turn off this automatic prompt via the setting `rescript.settings.askToStartBuild`.                                                                                                                                                                                                                                    |
 | ReScript Binary Path           | The extension will look for the existence of a `/node_modules/.bin/rescript` file and use its directory as the `binaryPath`. If it does not find it at the project root (which is where the nearest `bsconfig.json` resides), it goes up folders in the filesystem recursively until it either finds it (often the case in monorepos) or hits the top level. To override this lookup process, the path can be configured explicitly using the setting `rescript.settings.binaryPath` |
-| Inlay Hints (experimental) | This allows an editor to place annotations inline with text to display type hints. Enable using `rescript.settings.inlayHints.enable: true` |
-| Code Lens (experimental) | This tells the editor to add code lenses to function definitions, showing its full type above the definition. Enable using `rescript.settings.codeLens: true` |
+| Inlay Hints (experimental)     | This allows an editor to place annotations inline with text to display type hints. Enable using `rescript.settings.inlayHints.enable: true`                                                                                                                                                                                                                                                                                                                                          |
+| Code Lens (experimental)       | This tells the editor to add code lenses to function definitions, showing its full type above the definition. Enable using `rescript.settings.codeLens: true`                                                                                                                                                                                                                                                                                                                        |
+| Signature Help (experimental)  | This tells the editor to show signature help when you're writing function calls. Enable using `rescript.settings.signatureHelp.enable: true`                                                                                                                                                                                                                                                                                                                                         |
 | Autostarting the Code Analyzer | The Code Analyzer needs to be started manually by default. However, you can configure the extension to start the Code Analyzer automatically via the setting `rescript.settings.autoRunCodeAnalysis`.                                                                                                                                                                                                                                                                                |
 
 **Default settings:**

diff --git a/analysis/src/Cli.ml b/analysis/src/Cli.ml
@@ -75,6 +75,10 @@ Options:
 
     ./rescript-editor-analysis.exe codeLens src/MyFile.res
 
+  signatureHelp: get signature help if available for position at line 10 column 2 in src/MyFile.res
+
+    ./rescript-editor-analysis.exe signatureHelp src/MyFile.res 10 2
+
   test: run tests specified by special comments in file src/MyFile.res
 
     ./rescript-editor-analysis.exe test src/src/MyFile.res
@@ -103,6 +107,10 @@ let main () =
         (match supportsMarkdownLinks with
         | "true" -> true
         | _ -> false)
+  | [_; "signatureHelp"; path; line; col; currentFile] ->
+    Commands.signatureHelp ~path
+      ~pos:(int_of_string line, int_of_string col)
+      ~currentFile ~debug:false
   | [_; "inlayHint"; path; line_start; line_end; maxLength] ->
     Commands.inlayhint ~path
       ~pos:(int_of_string line_start, int_of_string line_end)

diff --git a/analysis/src/Commands.ml b/analysis/src/Commands.ml
@@ -79,6 +79,15 @@ let hover ~path ~pos ~currentFile ~debug ~supportsMarkdownLinks =
   in
   print_endline result
 
+let signatureHelp ~path ~pos ~currentFile ~debug =
+  let result =
+    match SignatureHelp.signatureHelp ~path ~pos ~currentFile ~debug with
+    | None ->
+      {Protocol.signatures = []; activeSignature = None; activeParameter = None}
+    | Some res -> res
+  in
+  print_endline (Protocol.stringifySignatureHelp result)
+
 let codeAction ~path ~pos ~currentFile ~debug =
   Xform.extractCodeActions ~path ~pos ~currentFile ~debug
   |> CodeActions.stringifyCodeActions |> print_endline
@@ -335,6 +344,13 @@ let test ~path =
             hover ~supportsMarkdownLinks:true ~path ~pos:(line, col)
               ~currentFile ~debug:true;
             Sys.remove currentFile
+          | "she" ->
+            print_endline
+              ("Signature help " ^ path ^ " " ^ string_of_int line ^ ":"
+             ^ string_of_int col);
+            let currentFile = createCurrentFile () in
+            signatureHelp ~path ~pos:(line, col) ~currentFile ~debug:true;
+            Sys.remove currentFile
           | "int" ->
             print_endline ("Create Interface " ^ path);
             let cmiFile =

diff --git a/analysis/src/CompletionFrontEnd.ml b/analysis/src/CompletionFrontEnd.ml
@@ -106,16 +106,6 @@ let extractJsxProps ~(compName : Longident.t Location.loc) ~args =
   in
   args |> processProps ~acc:[]
 
-type labelled = {
-  name: string;
-  opt: bool;
-  posStart: int * int;
-  posEnd: int * int;
-}
-
-type label = labelled option
-type arg = {label: label; exp: Parsetree.expression}
-
 let findNamedArgCompletable ~(args : arg list) ~endPos ~posBeforeCursor
     ~(contextPath : Completable.contextPath) ~posAfterFunExpr =
   let allNames =
@@ -145,37 +135,6 @@ let findNamedArgCompletable ~(args : arg list) ~endPos ~posBeforeCursor
   in
   loop args
 
-let extractExpApplyArgs ~args =
-  let rec processArgs ~acc args =
-    match args with
-    | (((Asttypes.Labelled s | Optional s) as label), (e : Parsetree.expression))
-      :: rest -> (
-      let namedArgLoc =
-        e.pexp_attributes
-        |> List.find_opt (fun ({Asttypes.txt}, _) -> txt = "ns.namedArgLoc")
-      in
-      match namedArgLoc with
-      | Some ({loc}, _) ->
-        let labelled =
-          {
-            name = s;
-            opt =
-              (match label with
-              | Optional _ -> true
-              | _ -> false);
-            posStart = Loc.start loc;
-            posEnd = Loc.end_ loc;
-          }
-        in
-        processArgs ~acc:({label = Some labelled; exp = e} :: acc) rest
-      | None -> processArgs ~acc rest)
-    | (Asttypes.Nolabel, (e : Parsetree.expression)) :: rest ->
-      if e.pexp_loc.loc_ghost then processArgs ~acc rest
-      else processArgs ~acc:({label = None; exp = e} :: acc) rest
-    | [] -> List.rev acc
-  in
-  args |> processArgs ~acc:[]
-
 let rec exprToContextPath (e : Parsetree.expression) =
   match e.pexp_desc with
   | Pexp_constant (Pconst_string _) -> Some Completable.CPString
@@ -204,7 +163,7 @@ let completionWithParser1 ~currentFile ~debug ~offset ~path ~posCursor ~text =
     let line, col = posCursor in
     (line, max 0 col - offset + offsetNoWhite)
   in
-  let posBeforeCursor = (fst posCursor, max 0 (snd posCursor - 1)) in
+  let posBeforeCursor = Pos.posBeforeCursor posCursor in
   let charBeforeCursor, blankAfterCursor =
     match Pos.positionToOffset text posCursor with
     | Some offset when offset > 0 -> (

diff --git a/analysis/src/Pos.ml b/analysis/src/Pos.ml
@@ -24,3 +24,5 @@ let positionToOffset text (line, character) =
   | Some bol ->
     if bol + character <= String.length text then Some (bol + character)
     else None
+
+let posBeforeCursor pos = (fst pos, max 0 (snd pos - 1))
diff --git a/analysis/src/Protocol.ml b/analysis/src/Protocol.ml
@@ -16,6 +16,23 @@ type inlayHint = {
   paddingRight: bool;
 }
 
+(* https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#parameterInformation *)
+type parameterInformation = {label: int * int; documentation: markupContent}
+
+(* https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#signatureInformation *)
+type signatureInformation = {
+  label: string;
+  parameters: parameterInformation list;
+  documentation: markupContent option;
+}
+
+(* https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#signatureHelp *)
+type signatureHelp = {
+  signatures: signatureInformation list;
+  activeSignature: int option;
+  activeParameter: int option;
+}
+
 type completionItem = {
   label: string;
   kind: int;
@@ -170,6 +187,45 @@ let stringifyCodeLens (codeLens : codeLens) =
     | None -> ""
     | Some command -> stringifyCommand command)
 
+let stringifyParameterInformation (parameterInformation : parameterInformation)
+    =
+  Printf.sprintf {|{"label": %s, "documentation": %s}|}
+    (let line, chr = parameterInformation.label in
+     "[" ^ string_of_int line ^ ", " ^ string_of_int chr ^ "]")
+    (stringifyMarkupContent parameterInformation.documentation)
+
+let stringifySignatureInformation (signatureInformation : signatureInformation)
+    =
+  Printf.sprintf
+    {|{
+    "label": "%s",
+    "parameters": %s%s
+  }|}
+    (Json.escape signatureInformation.label)
+    (signatureInformation.parameters
+    |> List.map stringifyParameterInformation
+    |> array)
+    (match signatureInformation.documentation with
+    | None -> ""
+    | Some docs ->
+      Printf.sprintf ",\n    \"documentation\": %s"
+        (stringifyMarkupContent docs))
+
+let stringifySignatureHelp (signatureHelp : signatureHelp) =
+  Printf.sprintf
+    {|{
+  "signatures": %s,
+  "activeSignature": %s,
+  "activeParameter": %s
+}|}
+    (signatureHelp.signatures |> List.map stringifySignatureInformation |> array)
+    (match signatureHelp.activeSignature with
+    | None -> null
+    | Some activeSignature -> activeSignature |> string_of_int)
+    (match signatureHelp.activeParameter with
+    | None -> null
+    | Some activeParameter -> activeParameter |> string_of_int)
+
 (* https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#diagnostic *)
 let stringifyDiagnostic d =
   Printf.sprintf