Repair jump code action test

The code action need explicit enabling

Author: voodoos

ocaml-lsp-server/test/e2e-new/code_actions.ml

@@ -1272,6 +1272,14 @@ module M : sig type t = I of int | B of bool end
     |}]
 ;;
 
+let activate_jump client =
+  let config =
+    DidChangeConfigurationParams.create
+      ~settings:(`Assoc [ "merlinJumpCodeActions", `Assoc [ "enable", `Bool true ] ])
+  in
+  change_config ~client config
+;;
+
 let%expect_test "can jump to match target" =
   let source =
     {ocaml|
@@ -1288,7 +1296,11 @@ 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");
+  print_code_actions
+    ~prep:activate_jump
+    source
+    range
+    ~filter:(find_action "merlin-jump-match");
   [%expect
     {|
     Code actions:
@@ -1327,7 +1339,11 @@ 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-next-case");
+  print_code_actions
+    ~prep:activate_jump
+    source
+    range
+    ~filter:(find_action "merlin-jump-next-case");
   [%expect
     {|
     Code actions:
@@ -1364,7 +1380,11 @@ 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-prev-case");
+  print_code_actions
+    ~prep:activate_jump
+    source
+    range
+    ~filter:(find_action "merlin-jump-prev-case");
   [%expect
     {|
     Code actions:
@@ -1401,7 +1421,11 @@ 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-let");
+  print_code_actions
+    ~prep:activate_jump
+    source
+    range
+    ~filter:(find_action "merlin-jump-let");
   [%expect
     {|
     Code actions:
@@ -1438,7 +1462,11 @@ 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-fun");
+  print_code_actions
+    ~prep:activate_jump
+    source
+    range
+    ~filter:(find_action "merlin-jump-fun");
   [%expect
     {|
     Code actions:
@@ -1476,7 +1504,11 @@ let f (x : t) (d : bool) =
     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");
+  print_code_actions
+    ~prep:activate_jump
+    source
+    range
+    ~filter:(find_action "merlin-jump-module");
   [%expect
     {|
     Code actions:
@@ -1517,7 +1549,11 @@ let%expect_test "can jump to module-type target" =
     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");
+  print_code_actions
+    ~prep:activate_jump
+    source
+    range
+    ~filter:(find_action "merlin-jump-module-type");
   [%expect
     {|
       Code actions:
@@ -1553,7 +1589,11 @@ let%expect_test "shouldn't find the jump target on the same line" =
     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");
+  print_code_actions
+    ~prep:activate_jump
+    source
+    range
+    ~filter:(find_action "merlin-jump-fun");
   [%expect {|
       No code actions |}]
 ;;

ocaml-lsp-server/test/e2e-new/lsp_helpers.ml

@@ -1,5 +1,7 @@
 open Test.Import
 
+let change_config ~client params = Client.notification client (ChangeConfiguration params)
+
 let open_document ~client ~uri ~source =
   let textDocument =
     TextDocumentItem.create ~uri ~languageId:"ocaml" ~version:0 ~text:source

ocaml-lsp-server/test/e2e-new/lsp_helpers.mli

@@ -1,5 +1,8 @@
 open Test.Import
 
+(** Send the given configuration to the language server *)
+val change_config : client:'a Client.t -> DidChangeConfigurationParams.t -> unit Fiber.t
+
 (** Opens a document with the language server. This must be done before trying
     to access it *)
 val open_document

ocaml-lsp-server/test/e2e-new/syntax_doc_tests.ml

@@ -1,6 +1,6 @@
 open! Test.Import
+open Lsp_helpers
 
-let change_config client params = Client.notification client (ChangeConfiguration params)
 let uri = DocumentUri.of_path "test.ml"
 let create_postion line character = Position.create ~line ~character
 
@@ -67,7 +67,7 @@ type color = Red|Blue
 |ocaml} in
   let position = create_postion 1 9 in
   let req client =
-    let* () = change_config client activate_syntax_doc in
+    let* () = change_config ~client activate_syntax_doc in
     let* resp = hover_req client position in
     let () = print_hover resp in
     Fiber.return ()
@@ -94,7 +94,7 @@ type color = Red|Blue
 |ocaml} in
   let position = create_postion 1 9 in
   let req client =
-    let* () = change_config client deactivate_syntax_doc in
+    let* () = change_config ~client deactivate_syntax_doc in
     let* resp = hover_req client position in
     let () = print_hover resp in
     Fiber.return ()
@@ -117,7 +117,7 @@ type t = ..
 |ocaml} in
   let position = create_postion 1 5 in
   let req client =
-    let* () = change_config client activate_syntax_doc in
+    let* () = change_config ~client activate_syntax_doc in
     let* resp = hover_req client position in
     let () = print_hover resp in
     Fiber.return ()
@@ -143,7 +143,7 @@ let%expect_test "should receive no hover response" =
   |ocaml} in
   let position = create_postion 1 5 in
   let req client =
-    let* () = change_config client activate_syntax_doc in
+    let* () = change_config ~client activate_syntax_doc in
     let* resp = hover_req client position in
     let () = print_hover resp in
     Fiber.return ()