Read from current buffer for position

Author: shulhi

analysis/bin/main.ml

@@ -161,10 +161,14 @@ let main () =
         (match allowForConstructorPayloads with
         | "true" -> true
         | _ -> false)
+  | [_; "inlayHint"; path; line_start; line_end; maxLength; currentFile] ->
+    Commands.inlayhint ~path
+      ~pos:(int_of_string line_start, int_of_string line_end)
+      ~maxLength ~currentFile:(Some currentFile) ~debug
   | [_; "inlayHint"; path; line_start; line_end; maxLength] ->
     Commands.inlayhint ~path
       ~pos:(int_of_string line_start, int_of_string line_end)
-      ~maxLength ~debug
+      ~maxLength ~currentFile:None ~debug
   | [_; "codeLens"; path] -> Commands.codeLens ~path ~debug
   | [_; "codeAction"; path; startLine; startCol; endLine; endCol; currentFile]
     ->

analysis/src/Commands.ml

@@ -41,9 +41,9 @@ let completionResolve ~path ~modulePath =
   in
   print_endline docstring
 
-let inlayhint ~path ~pos ~maxLength ~debug =
+let inlayhint ~path ~pos ~maxLength ~currentFile ~debug =
   let result =
-    match Hint.inlay ~path ~pos ~maxLength ~debug with
+    match Hint.inlay ~path ~pos ~maxLength ~currentFile ~debug with
     | Some hints -> hints |> Protocol.array
     | None -> Protocol.null
   in
@@ -491,7 +491,7 @@ let test ~path =
               ("Inlay Hint " ^ path ^ " " ^ string_of_int line_start ^ ":"
              ^ string_of_int line_end);
             inlayhint ~path ~pos:(line_start, line_end) ~maxLength:"25"
-              ~debug:false
+              ~currentFile:None ~debug:false
           | "cle" ->
             print_endline ("Code Lens " ^ path);
             codeLens ~path ~debug:false

analysis/src/Hint.ml

@@ -31,7 +31,7 @@ let locItemToTypeHint ~full:{file; package} locItem =
         | `Field -> fromType t))
   | _ -> None
 
-let inlay ~path ~pos ~maxLength ~debug =
+let inlay ~path ~pos ~maxLength ~currentFile ~debug =
   let maxlen = try Some (int_of_string maxLength) with Failure _ -> None in
   let hints = ref [] in
   let start_line, end_line = pos in
@@ -70,11 +70,12 @@ let inlay ~path ~pos ~maxLength ~debug =
     Ast_iterator.default_iterator.value_binding iterator vb
   in
   let iterator = {Ast_iterator.default_iterator with value_binding} in
+  let sourceFile = match currentFile with Some f -> f | None -> path in
   (if Files.classifySourceFile path = Res then
      let parser =
        Res_driver.parsing_engine.parse_implementation ~for_printer:false
      in
-     let {Res_driver.parsetree = structure} = parser ~filename:path in
+     let {Res_driver.parsetree = structure} = parser ~filename:sourceFile in
      iterator.structure iterator structure |> ignore);
   match Cmt.loadFullCmtFromPath ~path with
   | None -> None

server/src/server.ts

@@ -646,7 +646,10 @@ async function inlayHint(msg: p.RequestMessage) {
   const filePath = utils.uriToNormalizedPath(
     params.textDocument.uri as utils.FileURI,
   );
-
+  let code = getOpenedFileContent(params.textDocument.uri as utils.FileURI);
+  let extension = path.extname(params.textDocument.uri);
+  let tmpname = utils.createFileInTempDir(extension);
+  fs.writeFileSync(tmpname, code, { encoding: "utf-8" });
   const response = await utils.runAnalysisCommand(
     filePath,
     [
@@ -655,9 +658,11 @@ async function inlayHint(msg: p.RequestMessage) {
       params.range.start.line,
       params.range.end.line,
       config.extensionConfiguration.inlayHints?.maxLength,
+      tmpname,
     ],
     msg,
   );
+  fs.unlink(tmpname, () => null);
   return response;
 }