From 229c9c54f2ebf1f12cf023b1af18177c61c57aca Mon Sep 17 00:00:00 2001 From: Javier Chavarri Date: Fri, 3 May 2024 12:17:54 +0000 Subject: [PATCH] fix build --- ocaml-lsp-server/src/merlin_config.ml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ocaml-lsp-server/src/merlin_config.ml b/ocaml-lsp-server/src/merlin_config.ml index 99844df0a..7b81f0f60 100644 --- a/ocaml-lsp-server/src/merlin_config.ml +++ b/ocaml-lsp-server/src/merlin_config.ml @@ -195,9 +195,10 @@ module Process = struct Unix.set_close_on_exec stdin_w; let pid = let argv = + let shared = [ prog; "ocaml-merlin"; "--no-print-directory" ] in match !dune_context with - | None -> argv - | Some dune_context -> argv @ [ "--context"; dune_context ] + | None -> shared + | Some dune_context -> shared @ [ "--context"; dune_context ] in Pid.of_int (Spawn.spawn @@ -250,7 +251,7 @@ module Dot_protocol_io = let should_read_dot_merlin = ref false type db = - { running : (String.t, entry) Table.t + { running : (string, entry) Table.t ; pool : Fiber.Pool.t }