From c7f6ed8d9a99c038403c08c4522d23169956dd73 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Sat, 10 Jun 2023 11:10:19 +0100 Subject: [PATCH] feature: disable code lens by default This feature seems to annoy quite a few users so we disable it by default. It can be enabled through configuration. Signed-off-by: Rudi Grinberg --- CHANGES.md | 3 +++ ocaml-lsp-server/src/config_data.ml | 2 +- ocaml-lsp-server/src/ocaml_lsp_server.ml | 4 ++-- .../test/e2e/__tests__/textDocument-codeLens.test.ts | 5 +++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index a13b451f8..c757200c6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,9 @@ ## Fixes +- Disable code lens by default. The support can be re-enabled by explicitly + setting it in the configuration. (#1134) + - Fix initilization of `ocamlformat-rpc` in some edge cases when ocamlformat is initialized concurrently (#1132) diff --git a/ocaml-lsp-server/src/config_data.ml b/ocaml-lsp-server/src/config_data.ml index 522a6f477..8c2359203 100644 --- a/ocaml-lsp-server/src/config_data.ml +++ b/ocaml-lsp-server/src/config_data.ml @@ -257,6 +257,6 @@ let _ = yojson_of_t [@@@end] let default = - { codelens = Some { enable = true } + { codelens = Some { enable = false } ; extended_hover = Some { enable = false } } diff --git a/ocaml-lsp-server/src/ocaml_lsp_server.ml b/ocaml-lsp-server/src/ocaml_lsp_server.ml index 4ac3c050d..945aef167 100644 --- a/ocaml-lsp-server/src/ocaml_lsp_server.ml +++ b/ocaml-lsp-server/src/ocaml_lsp_server.ml @@ -609,8 +609,8 @@ let on_request : | TextDocumentCodeLensResolve codeLens -> now codeLens | TextDocumentCodeLens req -> ( match state.configuration.data.codelens with - | Some { enable = true } | None -> later text_document_lens req - | Some _ -> now []) + | Some { enable = true } -> later text_document_lens req + | _ -> now []) | TextDocumentHighlight req -> later highlight req | DocumentSymbol { textDocument = { uri }; _ } -> later document_symbol uri | TextDocumentDeclaration { textDocument = { uri }; position } -> diff --git a/ocaml-lsp-server/test/e2e/__tests__/textDocument-codeLens.test.ts b/ocaml-lsp-server/test/e2e/__tests__/textDocument-codeLens.test.ts index da6c91a62..76abcabb6 100644 --- a/ocaml-lsp-server/test/e2e/__tests__/textDocument-codeLens.test.ts +++ b/ocaml-lsp-server/test/e2e/__tests__/textDocument-codeLens.test.ts @@ -28,6 +28,11 @@ describe("textDocument/references", () => { beforeEach(async () => { languageServer = await LanguageServer.startAndInitialize(); + languageServer.sendNotification("workspace/didChangeConfiguration", { + settings: { + codelens: { enable: true }, + }, + }); }); afterEach(async () => {