From c7dc1ed99f591e9c8c0a0c0fdd97f2e891e08404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= Date: Fri, 22 Apr 2022 19:29:27 +0100 Subject: [PATCH] fix(dune): enable dune rpc by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dune build --watch integration relies on dune RPC, but this was only enabled during tests. Enable Dune integration by default instead, as suggested by @rgrinberg. Fixes https://github.com/ocaml/ocaml-lsp/issues/690 Signed-off-by: Edwin Török ps-id: 458AE51C-44DA-4CA6-B457-F0431E27FA3E --- CHANGES.md | 6 ++++++ ocaml-lsp-server/src/dune.ml | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 9c4553187..c77d582bd 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,9 @@ +# 1.11.3 + +## Fixes + +- Enable dune rpc integration by default (#691, fixes #690) + # 1.11.2 ## Fixes diff --git a/ocaml-lsp-server/src/dune.ml b/ocaml-lsp-server/src/dune.ml index f4f9ded23..355857236 100644 --- a/ocaml-lsp-server/src/dune.ml +++ b/ocaml-lsp-server/src/dune.ml @@ -713,10 +713,10 @@ let create workspaces (client_capabilities : ClientCapabilities.t) diagnostics let create workspaces (client_capabilities : ClientCapabilities.t) diagnostics progress document_store ~log = - if inside_test then + if inside_test then ref Closed + else create workspaces client_capabilities diagnostics progress document_store ~log - else ref Closed let run_loop t = Fiber.repeat_while ~init:() ~f:(fun () ->