add range params

Author: aspeddro

analysis/examples/larger-project/.merlin

@@ -1,12 +1,12 @@
 ####{BSB GENERATED: NO EDIT
-FLG -ppx '/Users/cristianocalcagno/GitHub/rescript-vscode/analysis/examples/larger-project/node_modules/rescript/darwin/bsc.exe -as-ppx -bs-jsx 3'
-S /Users/cristianocalcagno/GitHub/rescript-vscode/analysis/examples/larger-project/node_modules/rescript/lib/ocaml
-B /Users/cristianocalcagno/GitHub/rescript-vscode/analysis/examples/larger-project/node_modules/rescript/lib/ocaml
+FLG -ppx '/home/pedro/Desktop/Projects/rescript-vscode/analysis/examples/larger-project/node_modules/rescript/linux/bsc.exe -as-ppx -bs-jsx 3'
+S /home/pedro/Desktop/Projects/rescript-vscode/analysis/examples/larger-project/node_modules/rescript/lib/ocaml
+B /home/pedro/Desktop/Projects/rescript-vscode/analysis/examples/larger-project/node_modules/rescript/lib/ocaml
 FLG -w +a-4-9-20-40-41-42-50-61-102
-S /Users/cristianocalcagno/GitHub/rescript-vscode/analysis/examples/larger-project/node_modules/@rescript/react/lib/ocaml
-B /Users/cristianocalcagno/GitHub/rescript-vscode/analysis/examples/larger-project/node_modules/@rescript/react/lib/ocaml
-S /Users/cristianocalcagno/GitHub/rescript-vscode/analysis/examples/larger-project/node_modules/@glennsl/bs-json/lib/ocaml
-B /Users/cristianocalcagno/GitHub/rescript-vscode/analysis/examples/larger-project/node_modules/@glennsl/bs-json/lib/ocaml
+S /home/pedro/Desktop/Projects/rescript-vscode/analysis/examples/larger-project/node_modules/@rescript/react/lib/ocaml
+B /home/pedro/Desktop/Projects/rescript-vscode/analysis/examples/larger-project/node_modules/@rescript/react/lib/ocaml
+S /home/pedro/Desktop/Projects/rescript-vscode/analysis/examples/larger-project/node_modules/@glennsl/bs-json/lib/ocaml
+B /home/pedro/Desktop/Projects/rescript-vscode/analysis/examples/larger-project/node_modules/@glennsl/bs-json/lib/ocaml
 S src
 B lib/bs/src
 S src/exception

analysis/src/Cli.ml

@@ -94,8 +94,10 @@ let main () =
     Commands.hover ~path
       ~pos:(int_of_string line, int_of_string col)
       ~currentFile ~debug:false
-  | [_; "inlayHint"; path; maxLength] ->
-    Commands.inlayhint ~path ~maxLength ~debug:false
+  | [_; "inlayHint"; path; line_start; line_end; maxLength] ->
+    Commands.inlayhint ~path
+      ~pos:(int_of_string line_start, int_of_string line_end)
+      ~maxLength ~debug:false
   | [_; "codeAction"; path; line; col; currentFile] ->
     Commands.codeAction ~path
       ~pos:(int_of_string line, int_of_string col)

analysis/src/Commands.ml

@@ -28,8 +28,8 @@ let completion ~debug ~path ~pos ~currentFile =
     |> List.map Protocol.stringifyCompletionItem
     |> Protocol.array)
 
-let inlayhint ~path ~maxLength ~debug =
-  let result = Hint.inlay ~path ~maxLength ~debug |> Protocol.array in
+let inlayhint ~path ~pos ~maxLength ~debug =
+  let result = Hint.inlay ~path ~pos ~maxLength ~debug |> Protocol.array in
   print_endline result
 
 let hover ~path ~pos ~currentFile ~debug =
@@ -386,7 +386,7 @@ let test ~path =
                                    (Protocol.stringifyRange range)
                                    indent indent newText)))
           | "dia" -> diagnosticSyntax ~path
-          | "hint" -> inlayhint ~path ~maxLength:"25" ~debug:true
+          | "hint" -> inlayhint ~path ~pos:(0, 20) ~maxLength:"25" ~debug:true
           | _ -> ());
           print_newline ())
     in

analysis/src/Hint.ml

@@ -32,15 +32,21 @@ let locItemToTypeHint ~full:{file; package} locItem =
         | `Field -> fromType t))
   | _ -> None
 
-let inlay ~path ~maxLength ~debug =
-  let maxlen = try Some(int_of_string maxLength) with Failure _ -> None in
+let inlay ~path ~pos ~maxLength ~debug =
+  let maxlen = try Some (int_of_string maxLength) with Failure _ -> None in
   let hints = ref [] in
+  let start_line, end_line = pos in
+  let push loc kind =
+    let range = Utils.cmtLocToRange loc in
+    if start_line <= range.end_.line && end_line >= range.start.line then
+      hints := (range, kind) :: !hints
+  in
   let rec processFunction (exp : Parsetree.expression) =
     match exp.pexp_desc with
     | Pexp_fun (_, _, pat_exp, e) -> (
       match pat_exp with
       | {ppat_desc = Ppat_var _} ->
-        hints := (pat_exp.ppat_loc, Type) :: !hints;
+        push pat_exp.ppat_loc Type;
         processFunction e
       | _ -> processFunction e)
     | _ -> ()
@@ -59,18 +65,17 @@ let inlay ~path ~maxLength ~debug =
            | Pexp_send _ | Pexp_field _ | Pexp_open _ );
        };
     } ->
-      hints := (vb.pvb_pat.ppat_loc, Type) :: !hints
+      push vb.pvb_pat.ppat_loc Type
     | {pvb_pat = {ppat_desc = Ppat_tuple tuples}} ->
       List.iter
-        (fun (tuple : Parsetree.pattern) ->
-          hints := (tuple.ppat_loc, Type) :: !hints)
+        (fun (tuple : Parsetree.pattern) -> push tuple.ppat_loc Type)
         tuples
     | {
      pvb_pat = {ppat_desc = Ppat_var _};
      pvb_expr = {pexp_desc = Pexp_fun (_, _, pat, e)};
     } ->
       (match pat with
-      | {ppat_desc = Ppat_var _} -> hints := (pat.ppat_loc, Type) :: !hints
+      | {ppat_desc = Ppat_var _} -> push pat.ppat_loc Type
       | _ -> ());
       processFunction e
     | _ -> ());
@@ -82,14 +87,9 @@ let inlay ~path ~maxLength ~debug =
      Res_driver.parsingEngine.parseImplementation ~forPrinter:false
    in
    let {Res_driver.parsetree = structure} = parser ~filename:path in
-   iterator.structure iterator structure |> ignore
-  else
-    let parser = Res_driver.parsingEngine.parseInterface ~forPrinter:false in
-    let {Res_driver.parsetree = signature} = parser ~filename:path in
-    iterator.signature iterator signature |> ignore);
+   iterator.structure iterator structure |> ignore);
   !hints
-  |> List.filter_map (fun (locOfName, hintKind) ->
-         let range = Utils.cmtLocToRange locOfName in
+  |> List.filter_map (fun ((range : Protocol.range), hintKind) ->
          match Cmt.fullFromPath ~path with
          | None -> None
          | Some full -> (
@@ -116,6 +116,7 @@ let inlay ~path ~maxLength ~debug =
                    }
                in
                match maxlen with
-               | Some value -> if (String.length label) > value then None else Some(result)
-               | None -> Some(result))
+               | Some value ->
+                 if String.length label > value then None else Some result
+               | None -> Some result)
              | None -> None)))

server/src/server.ts

@@ -12,6 +12,7 @@ import {
   DidCloseTextDocumentNotification,
   DidChangeConfigurationNotification,
   InitializeParams,
+  InlayHintParams,
 } from "vscode-languageserver-protocol";
 import * as utils from "./utils";
 import * as codeActions from "./codeActions";
@@ -71,7 +72,7 @@ let projectsFiles: Map<
 let codeActionsFromDiagnostics: codeActions.filesCodeActions = {};
 
 // will be properly defined later depending on the mode (stdio/node-rpc)
-let send: (msg: p.Message) => void = (_) => {};
+let send: (msg: p.Message) => void = (_) => { };
 
 let findBinaryDirPathFromProjectRoot = (
   directory: p.DocumentUri // This must be a directory and not a file!
@@ -395,7 +396,7 @@ function inlayHint(msg: p.RequestMessage) {
 
   const response = utils.runAnalysisCommand(
     filePath,
-    ["inlayHint", filePath, extensionConfiguration.inlayHints.maxLength],
+    ["inlayHint", filePath, params.range.start.line, params.range.end.line, extensionConfiguration.inlayHints.maxLength],
     msg
   );
   return response;
@@ -1080,7 +1081,11 @@ function onMessage(msg: p.Message) {
     } else if (msg.method === openCompiledFileRequest.method) {
       send(openCompiledFile(msg));
     } else if (msg.method === p.InlayHintRequest.method) {
-      send(inlayHint(msg));
+      let params = msg.params as InlayHintParams;
+      let extName = path.extname(params.textDocument.uri);
+      if (extName === c.resExt) {
+        send(inlayHint(msg));
+      }
     } else {
       let response: p.ResponseMessage = {
         jsonrpc: c.jsonrpcVersion,