Prepare for release 1.20.1-4.14 (#1413)

ocaml · Dec 2, 2024 · 40c5106 · 40c5106
1 parent 83cdcd6
commit 40c5106
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,11 @@
+# 1.20.1
+
+## Fixes
+
+- Deactivate the `jump` code actions by default. Clients can enable them with
+  the `merlinJumpCodeActions` configuration option. Alternatively a custom
+  request is provided for ad hoc use of the feature. (#1411)
+
 # 1.20.0
 
 ## Features

diff --git a/dune-project b/dune-project
@@ -45,7 +45,7 @@ possible and does not make any assumptions about IO.
  (description "An LSP server for OCaml.")
  (depends
   yojson
-  base
+  (base (>= v0.16.0))
   (lsp (= :version))
   (jsonrpc (= :version))
   (re (>= 1.5.0))

diff --git a/ocaml-lsp-server.opam b/ocaml-lsp-server.opam
@@ -21,7 +21,7 @@ bug-reports: "https://github.com/ocaml/ocaml-lsp/issues"
 depends: [
   "dune" {>= "3.0"}
   "yojson"
-  "base"
+  "base" {>= "v0.16.0"}
   "lsp" {= version}
   "jsonrpc" {= version}
   "re" {>= "1.5.0"}

diff --git a/ocaml-lsp-server/src/code_actions.ml b/ocaml-lsp-server/src/code_actions.ml
@@ -118,8 +118,8 @@ let compute server (params : CodeActionParams.t) =
     let open_related = Action_open_related.for_uri capabilities doc in
     let* merlin_jumps =
       match state.configuration.data.merlin_jump_code_actions with
-      | Some { enable = true } | None -> Action_jump.code_actions doc params capabilities
-      | Some { enable = false } -> Fiber.return []
+      | Some { enable = true } -> Action_jump.code_actions doc params capabilities
+      | Some { enable = false } | None -> Fiber.return []
     in
     (match Document.syntax doc with
      | Ocamllex | Menhir | Cram | Dune ->