From 8586f60eac3a02bd1f9dc1eab60981412ecc4bfd Mon Sep 17 00:00:00 2001
From: PizieDust <playersrebirth@gmail.com>
Date: Thu, 26 Sep 2024 10:29:26 +0200
Subject: [PATCH 01/10] invert naming and unique kinds

---
 .../src/code_actions/action_jump.ml           |  8 ++-
 ocaml-lsp-server/test/e2e-new/code_actions.ml | 68 ++-----------------
 2 files changed, 10 insertions(+), 66 deletions(-)

diff --git a/ocaml-lsp-server/src/code_actions/action_jump.ml b/ocaml-lsp-server/src/code_actions/action_jump.ml
index 456df1605..2b61a98d2 100644
--- a/ocaml-lsp-server/src/code_actions/action_jump.ml
+++ b/ocaml-lsp-server/src/code_actions/action_jump.ml
@@ -71,12 +71,16 @@ let code_actions
         let+ position = Position.of_lexical_position lexing_pos in
         let uri = Document.uri doc in
         let range = { Range.start = position; end_ = position } in
-        let title = sprintf "Jump to %s" target in
+        let title = sprintf "%s jump" (String.capitalize_ascii target) in
         let command =
           let arguments = [ DocumentUri.yojson_of_t uri; Range.yojson_of_t range ] in
           Command.create ~title ~command:command_name ~arguments ()
         in
-        CodeAction.create ~title ~kind:(CodeActionKind.Other "merlin-jump") ~command ())
+        CodeAction.create
+          ~title
+          ~kind:(CodeActionKind.Other (sprintf "merlin-jump-%s" target))
+          ~command
+          ())
     in
     List.filter_opt actions
   | _ -> Fiber.return []
diff --git a/ocaml-lsp-server/test/e2e-new/code_actions.ml b/ocaml-lsp-server/test/e2e-new/code_actions.ml
index 7d43164d5..b2d4044c9 100644
--- a/ocaml-lsp-server/test/e2e-new/code_actions.ml
+++ b/ocaml-lsp-server/test/e2e-new/code_actions.ml
@@ -1288,25 +1288,10 @@ let f (x : t) (d : bool) =
     let end_ = Position.create ~line:5 ~character:5 in
     Range.create ~start ~end_
   in
-  print_code_actions source range ~filter:(find_action "merlin-jump");
+  print_code_actions source range ~filter:(find_action "merlin-jump-match");
   [%expect
     {|
     Code actions:
-    {
-      "command": {
-        "arguments": [
-          "file:///foo.ml",
-          {
-            "end": { "character": 0, "line": 3 },
-            "start": { "character": 0, "line": 3 }
-          }
-        ],
-        "command": "ocamllsp/merlin-jump-to-target",
-        "title": "Jump to fun"
-      },
-      "kind": "merlin-jump",
-      "title": "Jump to fun"
-    }
     {
       "command": {
         "arguments": [
@@ -1317,55 +1302,10 @@ let f (x : t) (d : bool) =
           }
         ],
         "command": "ocamllsp/merlin-jump-to-target",
-        "title": "Jump to match"
-      },
-      "kind": "merlin-jump",
-      "title": "Jump to match"
-    }
-    {
-      "command": {
-        "arguments": [
-          "file:///foo.ml",
-          {
-            "end": { "character": 0, "line": 3 },
-            "start": { "character": 0, "line": 3 }
-          }
-        ],
-        "command": "ocamllsp/merlin-jump-to-target",
-        "title": "Jump to let"
-      },
-      "kind": "merlin-jump",
-      "title": "Jump to let"
-    }
-    {
-      "command": {
-        "arguments": [
-          "file:///foo.ml",
-          {
-            "end": { "character": 3, "line": 6 },
-            "start": { "character": 3, "line": 6 }
-          }
-        ],
-        "command": "ocamllsp/merlin-jump-to-target",
-        "title": "Jump to match-next-case"
-      },
-      "kind": "merlin-jump",
-      "title": "Jump to match-next-case"
-    }
-    {
-      "command": {
-        "arguments": [
-          "file:///foo.ml",
-          {
-            "end": { "character": 3, "line": 5 },
-            "start": { "character": 3, "line": 5 }
-          }
-        ],
-        "command": "ocamllsp/merlin-jump-to-target",
-        "title": "Jump to match-prev-case"
+        "title": "Match jump"
       },
-      "kind": "merlin-jump",
-      "title": "Jump to match-prev-case"
+      "kind": "merlin-jump-match",
+      "title": "Match jump"
     }
 
        |}]

From 892cf31a3c8c60fc9adae3c2a9a9fbe4e1b05046 Mon Sep 17 00:00:00 2001
From: PizieDust <playersrebirth@gmail.com>
Date: Thu, 26 Sep 2024 12:05:57 +0200
Subject: [PATCH 02/10] make merlin jump code actions configurable

---
 ocaml-lsp-server/src/config_data.ml | 109 +++++++++++++++++++++++++++-
 1 file changed, 107 insertions(+), 2 deletions(-)

diff --git a/ocaml-lsp-server/src/config_data.ml b/ocaml-lsp-server/src/config_data.ml
index be4166206..e6184b726 100644
--- a/ocaml-lsp-server/src/config_data.ml
+++ b/ocaml-lsp-server/src/config_data.ml
@@ -385,6 +385,78 @@ module SyntaxDocumentation = struct
   [@@@end]
 end
 
+module MerlinJumpCodeActions = struct
+  type t = { enable : bool [@default false] }
+  [@@deriving_inline yojson] [@@yojson.allow_extra_fields]
+
+  let _ = fun (_ : t) -> ()
+
+  let t_of_yojson =
+    (let _tp_loc = "ocaml-lsp-server/src/config_data.ml.MerlinJumpCodeActions.t" in
+     function
+     | `Assoc field_yojsons as yojson ->
+       let enable_field = ref Ppx_yojson_conv_lib.Option.None
+       and duplicates = ref []
+       and extra = ref [] in
+       let rec iter = function
+         | (field_name, _field_yojson) :: tail ->
+           (match field_name with
+            | "enable" ->
+              (match Ppx_yojson_conv_lib.( ! ) enable_field with
+               | Ppx_yojson_conv_lib.Option.None ->
+                 let fvalue = bool_of_yojson _field_yojson in
+                 enable_field := Ppx_yojson_conv_lib.Option.Some fvalue
+               | Ppx_yojson_conv_lib.Option.Some _ ->
+                 duplicates := field_name :: Ppx_yojson_conv_lib.( ! ) duplicates)
+            | _ -> ());
+           iter tail
+         | [] -> ()
+       in
+       iter field_yojsons;
+       (match Ppx_yojson_conv_lib.( ! ) duplicates with
+        | _ :: _ ->
+          Ppx_yojson_conv_lib.Yojson_conv_error.record_duplicate_fields
+            _tp_loc
+            (Ppx_yojson_conv_lib.( ! ) duplicates)
+            yojson
+        | [] ->
+          (match Ppx_yojson_conv_lib.( ! ) extra with
+           | _ :: _ ->
+             Ppx_yojson_conv_lib.Yojson_conv_error.record_extra_fields
+               _tp_loc
+               (Ppx_yojson_conv_lib.( ! ) extra)
+               yojson
+           | [] ->
+             let enable_value = Ppx_yojson_conv_lib.( ! ) enable_field in
+             { enable =
+                 (match enable_value with
+                  | Ppx_yojson_conv_lib.Option.None -> false
+                  | Ppx_yojson_conv_lib.Option.Some v -> v)
+             }))
+     | _ as yojson ->
+       Ppx_yojson_conv_lib.Yojson_conv_error.record_list_instead_atom _tp_loc yojson
+     : Ppx_yojson_conv_lib.Yojson.Safe.t -> t)
+  ;;
+
+  let _ = t_of_yojson
+
+  let yojson_of_t =
+    (function
+     | { enable = v_enable } ->
+       let bnds : (string * Ppx_yojson_conv_lib.Yojson.Safe.t) list = [] in
+       let bnds =
+         let arg = yojson_of_bool v_enable in
+         ("enable", arg) :: bnds
+       in
+       `Assoc bnds
+     : t -> Ppx_yojson_conv_lib.Yojson.Safe.t)
+  ;;
+
+  let _ = yojson_of_t
+
+  [@@@end]
+end
+
 type t =
   { codelens : Lens.t Json.Nullable_option.t [@default None] [@yojson_drop_default ( = )]
   ; extended_hover : ExtendedHover.t Json.Nullable_option.t
@@ -395,6 +467,8 @@ type t =
        [@key "duneDiagnostics"] [@default None] [@yojson_drop_default ( = )]
   ; syntax_documentation : SyntaxDocumentation.t Json.Nullable_option.t
        [@key "syntaxDocumentation"] [@default None] [@yojson_drop_default ( = )]
+  ; merlin_jump_code_actions : MerlinJumpCodeActions.t Json.Nullable_option.t
+       [@key "merlinJumpCodeActions"] [@default None] [@yojson_drop_default ( = )]
   }
 [@@deriving_inline yojson] [@@yojson.allow_extra_fields]
 
@@ -409,6 +483,7 @@ let t_of_yojson =
      and inlay_hints_field = ref Ppx_yojson_conv_lib.Option.None
      and dune_diagnostics_field = ref Ppx_yojson_conv_lib.Option.None
      and syntax_documentation_field = ref Ppx_yojson_conv_lib.Option.None
+     and merlin_jump_code_actions_field = ref Ppx_yojson_conv_lib.Option.None
      and duplicates = ref []
      and extra = ref [] in
      let rec iter = function
@@ -463,6 +538,17 @@ let t_of_yojson =
                dune_diagnostics_field := Ppx_yojson_conv_lib.Option.Some fvalue
              | Ppx_yojson_conv_lib.Option.Some _ ->
                duplicates := field_name :: Ppx_yojson_conv_lib.( ! ) duplicates)
+          | "merlinJumpCodeActions" ->
+            (match Ppx_yojson_conv_lib.( ! ) merlin_jump_code_actions_field with
+             | Ppx_yojson_conv_lib.Option.None ->
+               let fvalue =
+                 Json.Nullable_option.t_of_yojson
+                   MerlinJumpCodeActions.t_of_yojson
+                   _field_yojson
+               in
+               merlin_jump_code_actions_field := Ppx_yojson_conv_lib.Option.Some fvalue
+             | Ppx_yojson_conv_lib.Option.Some _ ->
+               duplicates := field_name :: Ppx_yojson_conv_lib.( ! ) duplicates)
           | _ -> ());
          iter tail
        | [] -> ()
@@ -486,13 +572,15 @@ let t_of_yojson =
                , extended_hover_value
                , inlay_hints_value
                , dune_diagnostics_value
-               , syntax_documentation_value )
+               , syntax_documentation_value
+               , merlin_jump_code_actions_value )
              =
              ( Ppx_yojson_conv_lib.( ! ) codelens_field
              , Ppx_yojson_conv_lib.( ! ) extended_hover_field
              , Ppx_yojson_conv_lib.( ! ) inlay_hints_field
              , Ppx_yojson_conv_lib.( ! ) dune_diagnostics_field
-             , Ppx_yojson_conv_lib.( ! ) syntax_documentation_field )
+             , Ppx_yojson_conv_lib.( ! ) syntax_documentation_field
+             , Ppx_yojson_conv_lib.( ! ) merlin_jump_code_actions_field )
            in
            { codelens =
                (match codelens_value with
@@ -514,6 +602,10 @@ let t_of_yojson =
                (match syntax_documentation_value with
                 | Ppx_yojson_conv_lib.Option.None -> None
                 | Ppx_yojson_conv_lib.Option.Some v -> v)
+           ; merlin_jump_code_actions =
+               (match merlin_jump_code_actions_value with
+                | Ppx_yojson_conv_lib.Option.None -> None
+                | Ppx_yojson_conv_lib.Option.Some v -> v)
            }))
    | _ as yojson ->
      Ppx_yojson_conv_lib.Yojson_conv_error.record_list_instead_atom _tp_loc yojson
@@ -529,6 +621,7 @@ let yojson_of_t =
      ; inlay_hints = v_inlay_hints
      ; dune_diagnostics = v_dune_diagnostics
      ; syntax_documentation = v_syntax_documentation
+     ; merlin_jump_code_actions = v_merlin_jump_code_actions
      } ->
      let bnds : (string * Ppx_yojson_conv_lib.Yojson.Safe.t) list = [] in
      let bnds =
@@ -581,6 +674,17 @@ let yojson_of_t =
          let bnd = "codelens", arg in
          bnd :: bnds)
      in
+     let bnds =
+       if None = v_merlin_jump_code_actions
+       then bnds
+       else (
+         let arg =
+           (Json.Nullable_option.yojson_of_t MerlinJumpCodeActions.yojson_of_t)
+             v_merlin_jump_code_actions
+         in
+         let bnd = "merlinJumpCodeActions", arg in
+         bnd :: bnds)
+     in
      `Assoc bnds
    : t -> Ppx_yojson_conv_lib.Yojson.Safe.t)
 ;;
@@ -595,5 +699,6 @@ let default =
   ; inlay_hints = Some { hint_pattern_variables = false; hint_let_bindings = false }
   ; dune_diagnostics = Some { enable = true }
   ; syntax_documentation = Some { enable = false }
+  ; merlin_jump_code_actions = Some { enable = true }
   }
 ;;

From 5e9268da367ccacd0e2159b833310eac9ace52eb Mon Sep 17 00:00:00 2001
From: PizieDust <playersrebirth@gmail.com>
Date: Thu, 26 Sep 2024 12:08:05 +0200
Subject: [PATCH 03/10] refactor

---
 ocaml-lsp-server/src/code_actions.ml | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/ocaml-lsp-server/src/code_actions.ml b/ocaml-lsp-server/src/code_actions.ml
index cd69d7569..1e1d2e2d4 100644
--- a/ocaml-lsp-server/src/code_actions.ml
+++ b/ocaml-lsp-server/src/code_actions.ml
@@ -110,22 +110,13 @@ let compute server (params : CodeActionParams.t) =
   match doc with
   | None -> Fiber.return (Reply.now (actions dune_actions), state)
   | Some doc ->
-    let open_related =
-      let capabilities =
-        let open Option.O in
-        let* window = (State.client_capabilities state).window in
-        window.showDocument
-      in
-      Action_open_related.for_uri capabilities doc
-    in
-    let* merlin_jumps =
-      let capabilities =
-        let open Option.O in
-        let* window = (State.client_capabilities state).window in
-        window.showDocument
-      in
-      Action_jump.code_actions doc params capabilities
+    let capabilities =
+      let open Option.O in
+      let* window = (State.client_capabilities state).window in
+      window.showDocument
     in
+    let open_related = Action_open_related.for_uri capabilities doc in
+    let* merlin_jumps = Action_jump.code_actions doc params capabilities in
     (match Document.syntax doc with
      | Ocamllex | Menhir | Cram | Dune ->
        Fiber.return (Reply.now (actions (dune_actions @ open_related)), state)

From 9c224720fbcc124dd30acd3e2b04792d8659754e Mon Sep 17 00:00:00 2001
From: PizieDust <playersrebirth@gmail.com>
Date: Fri, 27 Sep 2024 05:04:27 +0200
Subject: [PATCH 04/10] configurable merlin jumps

---
 ocaml-lsp-server/docs/ocamllsp/config.md | 7 +++++++
 ocaml-lsp-server/src/code_actions.ml     | 6 +++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ocaml-lsp-server/docs/ocamllsp/config.md b/ocaml-lsp-server/docs/ocamllsp/config.md
index 2d9bfb2a6..f2727f21c 100644
--- a/ocaml-lsp-server/docs/ocamllsp/config.md
+++ b/ocaml-lsp-server/docs/ocamllsp/config.md
@@ -42,5 +42,12 @@ interface config {
   * @since 1.18
   */
   syntaxDocumentation: { enable : boolean }
+
+  /**
+  * Enable/Disable Merlin Jump codeo actions
+  * @default true
+  * @since 1.19
+  */
+  merlinJumpsCodeAction: { enable : boolean }
 }
 ```
diff --git a/ocaml-lsp-server/src/code_actions.ml b/ocaml-lsp-server/src/code_actions.ml
index 1e1d2e2d4..60fd33730 100644
--- a/ocaml-lsp-server/src/code_actions.ml
+++ b/ocaml-lsp-server/src/code_actions.ml
@@ -116,7 +116,11 @@ let compute server (params : CodeActionParams.t) =
       window.showDocument
     in
     let open_related = Action_open_related.for_uri capabilities doc in
-    let* merlin_jumps = Action_jump.code_actions doc params capabilities in
+    let* merlin_jumps =
+      match state.configuration.data.merlin_jump_code_actions with
+      | Some { enable = true } -> Action_jump.code_actions doc params capabilities
+      | _ -> Fiber.return []
+    in
     (match Document.syntax doc with
      | Ocamllex | Menhir | Cram | Dune ->
        Fiber.return (Reply.now (actions (dune_actions @ open_related)), state)

From 36f9fe1ba40be29f0a2f1f3cf64e7dba9623ec9c Mon Sep 17 00:00:00 2001
From: PizieDust <playersrebirth@gmail.com>
Date: Fri, 27 Sep 2024 05:24:25 +0200
Subject: [PATCH 05/10] fix typo

---
 ocaml-lsp-server/docs/ocamllsp/config.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ocaml-lsp-server/docs/ocamllsp/config.md b/ocaml-lsp-server/docs/ocamllsp/config.md
index f2727f21c..fd6186d13 100644
--- a/ocaml-lsp-server/docs/ocamllsp/config.md
+++ b/ocaml-lsp-server/docs/ocamllsp/config.md
@@ -44,7 +44,7 @@ interface config {
   syntaxDocumentation: { enable : boolean }
 
   /**
-  * Enable/Disable Merlin Jump codeo actions
+  * Enable/Disable Merlin Jump code actions
   * @default true
   * @since 1.19
   */

From bc8f33ee25869aaea27bf67f7786f4fc1507ff33 Mon Sep 17 00:00:00 2001
From: PizieDust <playersrebirth@gmail.com>
Date: Fri, 27 Sep 2024 12:10:44 +0200
Subject: [PATCH 06/10] more tests

---
 ocaml-lsp-server/test/e2e-new/code_actions.ml | 249 +++++++++++++++++-
 1 file changed, 248 insertions(+), 1 deletion(-)

diff --git a/ocaml-lsp-server/test/e2e-new/code_actions.ml b/ocaml-lsp-server/test/e2e-new/code_actions.ml
index b2d4044c9..a77a922a3 100644
--- a/ocaml-lsp-server/test/e2e-new/code_actions.ml
+++ b/ocaml-lsp-server/test/e2e-new/code_actions.ml
@@ -1272,7 +1272,7 @@ module M : sig type t = I of int | B of bool end
     |}]
 ;;
 
-let%expect_test "can jump to target" =
+let%expect_test "can jump to match target" =
   let source =
     {ocaml|
 type t = Foo of int | Bar of bool
@@ -1311,6 +1311,253 @@ let f (x : t) (d : bool) =
        |}]
 ;;
 
+let%expect_test "can jump to match-next-case target" =
+  let source =
+    {ocaml|
+type t = Foo of int | Bar of bool
+let square x = x * x
+let f (x : t) (d : bool) =
+  match x with
+  |Bar x -> x
+  |Foo _ -> d
+|ocaml}
+  in
+  let range =
+    let start = Position.create ~line:5 ~character:5 in
+    let end_ = Position.create ~line:5 ~character:5 in
+    Range.create ~start ~end_
+  in
+  print_code_actions source range ~filter:(find_action "merlin-jump-match-next-case");
+  [%expect
+    {|
+    Code actions:
+    {
+      "command": {
+        "arguments": [
+          "file:///foo.ml",
+          {
+            "end": { "character": 3, "line": 6 },
+            "start": { "character": 3, "line": 6 }
+          }
+        ],
+        "command": "ocamllsp/merlin-jump-to-target",
+        "title": "Match-next-case jump"
+      },
+      "kind": "merlin-jump-match-next-case",
+      "title": "Match-next-case jump"
+    } |}]
+;;
+
+let%expect_test "can jump to  match-prev-case target" =
+  let source =
+    {ocaml|
+type t = Foo of int | Bar of bool
+let square x = x * x
+let f (x : t) (d : bool) =
+  match x with
+  |Bar x -> x
+  |Foo _ -> d
+|ocaml}
+  in
+  let range =
+    let start = Position.create ~line:5 ~character:5 in
+    let end_ = Position.create ~line:5 ~character:5 in
+    Range.create ~start ~end_
+  in
+  print_code_actions source range ~filter:(find_action "merlin-jump-match-prev-case");
+  [%expect
+    {|
+    Code actions:
+    {
+      "command": {
+        "arguments": [
+          "file:///foo.ml",
+          {
+            "end": { "character": 3, "line": 5 },
+            "start": { "character": 3, "line": 5 }
+          }
+        ],
+        "command": "ocamllsp/merlin-jump-to-target",
+        "title": "Match-prev-case jump"
+      },
+      "kind": "merlin-jump-match-prev-case",
+      "title": "Match-prev-case jump"
+    } |}]
+;;
+
+let%expect_test "can jump to let target" =
+  let source =
+    {ocaml|
+type t = Foo of int | Bar of bool
+let square x = x * x
+let f (x : t) (d : bool) =
+  match x with
+  |Bar x -> x
+  |Foo _ -> d
+|ocaml}
+  in
+  let range =
+    let start = Position.create ~line:5 ~character:5 in
+    let end_ = Position.create ~line:5 ~character:5 in
+    Range.create ~start ~end_
+  in
+  print_code_actions source range ~filter:(find_action "merlin-jump-let");
+  [%expect
+    {|
+    Code actions:
+    {
+      "command": {
+        "arguments": [
+          "file:///foo.ml",
+          {
+            "end": { "character": 0, "line": 3 },
+            "start": { "character": 0, "line": 3 }
+          }
+        ],
+        "command": "ocamllsp/merlin-jump-to-target",
+        "title": "Let jump"
+      },
+      "kind": "merlin-jump-let",
+      "title": "Let jump"
+    } |}]
+;;
+
+let%expect_test "can jump to fun target" =
+  let source =
+    {ocaml|
+type t = Foo of int | Bar of bool
+let square x = x * x
+let f (x : t) (d : bool) =
+  match x with
+  |Bar x -> x
+  |Foo _ -> d
+|ocaml}
+  in
+  let range =
+    let start = Position.create ~line:5 ~character:5 in
+    let end_ = Position.create ~line:5 ~character:5 in
+    Range.create ~start ~end_
+  in
+  print_code_actions source range ~filter:(find_action "merlin-jump-fun");
+  [%expect
+    {|
+    Code actions:
+    {
+      "command": {
+        "arguments": [
+          "file:///foo.ml",
+          {
+            "end": { "character": 0, "line": 3 },
+            "start": { "character": 0, "line": 3 }
+          }
+        ],
+        "command": "ocamllsp/merlin-jump-to-target",
+        "title": "Fun jump"
+      },
+      "kind": "merlin-jump-fun",
+      "title": "Fun jump"
+    } |}]
+;;
+
+let%expect_test "can jump to module target" =
+  let source =
+    {ocaml|
+module FooBar = struct
+  type t = Foo of int | Bar of bool
+end
+let f (x : t) (d : bool) =
+  match x with
+  |Bar x -> x
+  |Foo _ -> d
+|ocaml}
+  in
+  let range =
+    let start = Position.create ~line:2 ~character:5 in
+    let end_ = Position.create ~line:2 ~character:5 in
+    Range.create ~start ~end_
+  in
+  print_code_actions source range ~filter:(find_action "merlin-jump-module");
+  [%expect
+    {|
+    Code actions:
+    {
+      "command": {
+        "arguments": [
+          "file:///foo.ml",
+          {
+            "end": { "character": 0, "line": 1 },
+            "start": { "character": 0, "line": 1 }
+          }
+        ],
+        "command": "ocamllsp/merlin-jump-to-target",
+        "title": "Module jump"
+      },
+      "kind": "merlin-jump-module",
+      "title": "Module jump"
+    } |}]
+;;
+
+let%expect_test "can jump to module-type target" =
+  let source =
+    {ocaml|
+  module type ORDER = sig
+    type t
+    val leq : t -> t -> bool
+    val equal : t -> t -> bool
+  end
+
+  let f (x : t) (d : bool) =
+    match x with
+    |Bar x -> x
+    |Foo _ -> d
+  |ocaml}
+  in
+  let range =
+    let start = Position.create ~line:4 ~character:5 in
+    let end_ = Position.create ~line:4 ~character:5 in
+    Range.create ~start ~end_
+  in
+  print_code_actions source range ~filter:(find_action "merlin-jump-module-type");
+  [%expect
+    {|
+      Code actions:
+      {
+        "command": {
+          "arguments": [
+            "file:///foo.ml",
+            {
+              "end": { "character": 2, "line": 1 },
+              "start": { "character": 2, "line": 1 }
+            }
+          ],
+          "command": "ocamllsp/merlin-jump-to-target",
+          "title": "Module-type jump"
+        },
+        "kind": "merlin-jump-module-type",
+        "title": "Module-type jump"
+      } |}]
+;;
+
+let%expect_test "shouldn't find the jump target on the same line" =
+  let source =
+    {ocaml|
+  let square x = x * x
+  let f (x : t) (d : bool) =
+    match x with
+    |Bar x -> x
+    |Foo _ -> d
+  |ocaml}
+  in
+  let range =
+    let start = Position.create ~line:0 ~character:5 in
+    let end_ = Position.create ~line:0 ~character:5 in
+    Range.create ~start ~end_
+  in
+  print_code_actions source range ~filter:(find_action "merlin-jump-fun");
+  [%expect {|
+      No code actions |}]
+;;
+
 let position_of_offset src x =
   assert (0 <= x && x < String.length src);
   let cnum = ref 0

From a6512c2193997738dede2ee0a4834e010d78185a Mon Sep 17 00:00:00 2001
From: PizieDust <playersrebirth@gmail.com>
Date: Mon, 30 Sep 2024 14:45:27 +0200
Subject: [PATCH 07/10] add changelog

---
 CHANGES.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 8855c5fa6..81ccc072f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,7 @@
 - Fix fd leak in running external processes for preprocessing (#1349)
 - Fix prefix parsing for completion of object methods (#1363, fixes #1358)
 
+
 # 1.19.0
 
 ## Features
@@ -15,6 +16,8 @@
 
 - Add a code-action for syntactic and semantic movement shortcuts based on Merlin's Jump command (#1364)
 
+- Make MerlinJump code action configurable (#1376)
+
 ## Fixes
 
 - Kill unnecessary ocamlformat processes with sigterm rather than sigint or

From 31c2a289184b9ec9cc378f43e96728bd54126be1 Mon Sep 17 00:00:00 2001
From: PizieDust <playersrebirth@gmail.com>
Date: Mon, 30 Sep 2024 16:05:45 +0200
Subject: [PATCH 08/10] fix typos

---
 ocaml-lsp-server/docs/ocamllsp/config.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ocaml-lsp-server/docs/ocamllsp/config.md b/ocaml-lsp-server/docs/ocamllsp/config.md
index fd6186d13..aea4ddfc3 100644
--- a/ocaml-lsp-server/docs/ocamllsp/config.md
+++ b/ocaml-lsp-server/docs/ocamllsp/config.md
@@ -48,6 +48,6 @@ interface config {
   * @default true
   * @since 1.19
   */
-  merlinJumpsCodeAction: { enable : boolean }
+  merlinJumpCodeActions: { enable : boolean }
 }
 ```

From a44d895a7526d49080def8d3d5a31276ac462648 Mon Sep 17 00:00:00 2001
From: PizieDust <playersrebirth@gmail.com>
Date: Mon, 30 Sep 2024 16:06:45 +0200
Subject: [PATCH 09/10] refactor according to review

---
 ocaml-lsp-server/src/code_actions/action_jump.ml | 10 ++++++++--
 ocaml-lsp-server/test/e2e-new/code_actions.ml    | 16 ++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ocaml-lsp-server/src/code_actions/action_jump.ml b/ocaml-lsp-server/src/code_actions/action_jump.ml
index 2b61a98d2..c33a0c451 100644
--- a/ocaml-lsp-server/src/code_actions/action_jump.ml
+++ b/ocaml-lsp-server/src/code_actions/action_jump.ml
@@ -8,6 +8,12 @@ let targets =
   [ "fun"; "match"; "let"; "module"; "module-type"; "match-next-case"; "match-prev-case" ]
 ;;
 
+let rename_target target =
+  if String.starts_with ~prefix:"match-" target
+  then String.sub target ~pos:6 ~len:(String.length target - 6)
+  else target
+;;
+
 let available (capabilities : ShowDocumentClientCapabilities.t option) =
   match capabilities with
   | Some { support } -> support
@@ -71,14 +77,14 @@ let code_actions
         let+ position = Position.of_lexical_position lexing_pos in
         let uri = Document.uri doc in
         let range = { Range.start = position; end_ = position } in
-        let title = sprintf "%s jump" (String.capitalize_ascii target) in
+        let title = sprintf "%s jump" (String.capitalize_ascii (rename_target target)) in
         let command =
           let arguments = [ DocumentUri.yojson_of_t uri; Range.yojson_of_t range ] in
           Command.create ~title ~command:command_name ~arguments ()
         in
         CodeAction.create
           ~title
-          ~kind:(CodeActionKind.Other (sprintf "merlin-jump-%s" target))
+          ~kind:(CodeActionKind.Other (sprintf "merlin-jump-%s" (rename_target target)))
           ~command
           ())
     in
diff --git a/ocaml-lsp-server/test/e2e-new/code_actions.ml b/ocaml-lsp-server/test/e2e-new/code_actions.ml
index a77a922a3..8e28ecb89 100644
--- a/ocaml-lsp-server/test/e2e-new/code_actions.ml
+++ b/ocaml-lsp-server/test/e2e-new/code_actions.ml
@@ -1327,7 +1327,7 @@ let f (x : t) (d : bool) =
     let end_ = Position.create ~line:5 ~character:5 in
     Range.create ~start ~end_
   in
-  print_code_actions source range ~filter:(find_action "merlin-jump-match-next-case");
+  print_code_actions source range ~filter:(find_action "merlin-jump-next-case");
   [%expect
     {|
     Code actions:
@@ -1341,10 +1341,10 @@ let f (x : t) (d : bool) =
           }
         ],
         "command": "ocamllsp/merlin-jump-to-target",
-        "title": "Match-next-case jump"
+        "title": "Next-case jump"
       },
-      "kind": "merlin-jump-match-next-case",
-      "title": "Match-next-case jump"
+      "kind": "merlin-jump-next-case",
+      "title": "Next-case jump"
     } |}]
 ;;
 
@@ -1364,7 +1364,7 @@ let f (x : t) (d : bool) =
     let end_ = Position.create ~line:5 ~character:5 in
     Range.create ~start ~end_
   in
-  print_code_actions source range ~filter:(find_action "merlin-jump-match-prev-case");
+  print_code_actions source range ~filter:(find_action "merlin-jump-prev-case");
   [%expect
     {|
     Code actions:
@@ -1378,10 +1378,10 @@ let f (x : t) (d : bool) =
           }
         ],
         "command": "ocamllsp/merlin-jump-to-target",
-        "title": "Match-prev-case jump"
+        "title": "Prev-case jump"
       },
-      "kind": "merlin-jump-match-prev-case",
-      "title": "Match-prev-case jump"
+      "kind": "merlin-jump-prev-case",
+      "title": "Prev-case jump"
     } |}]
 ;;
 

From 5a7d97a5cf5a84887c48070e053c96c7ddbe9128 Mon Sep 17 00:00:00 2001
From: PizieDust <playersrebirth@gmail.com>
Date: Tue, 1 Oct 2024 16:07:48 +0200
Subject: [PATCH 10/10] move changelog to unrealeased section

---
 CHANGES.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 81ccc072f..0bb05a512 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,7 @@
 # Unreleased
 
+- Make MerlinJump code action configurable (#1376)
+
 ## Fixes
 
 - Fix fd leak in running external processes for preprocessing (#1349)
@@ -16,8 +18,6 @@
 
 - Add a code-action for syntactic and semantic movement shortcuts based on Merlin's Jump command (#1364)
 
-- Make MerlinJump code action configurable (#1376)
-
 ## Fixes
 
 - Kill unnecessary ocamlformat processes with sigterm rather than sigint or