Handle command in Action destruct

Author: xvw

ocaml-lsp-server/src/code_actions/action_destruct.ml

@@ -14,7 +14,16 @@ let code_action_of_case_analysis doc uri (loc, newText) =
     WorkspaceEdit.create ~documentChanges:[ `TextDocumentEdit edit ] ()
   in
   let title = String.capitalize_ascii action_kind in
-  let command = None in
+  let+ command =
+    let+ holes =
+      doc |> Document.merlin_exn |> Typed_hole.all ~pipeline_name:"action-destruct"
+    in
+    holes
+    |> Typed_hole.find ~range ~position:range.start ~direction:`Next
+    |> Option.map ~f:(fun range ->
+      let arguments = [ DocumentUri.yojson_of_t uri; Range.yojson_of_t range ] in
+      Command.create ~arguments ~command:Action_jump.command_name ~title ())
+  in
   CodeAction.create
     ~title
     ~kind:(CodeActionKind.Other action_kind)
@@ -38,7 +47,7 @@ let code_action doc (params : CodeActionParams.t) =
     let* res = Document.Merlin.dispatch ~name:"destruct" merlin command in
     (match res with
      | Ok (loc, newText) ->
-       Fiber.return (Some (code_action_of_case_analysis doc uri (loc, newText)))
+       Fiber.map ~f:Option.some (code_action_of_case_analysis doc uri (loc, newText))
      | Error
          { exn =
              ( Merlin_analysis.Destruct.Wrong_parent _

ocaml-lsp-server/src/custom_requests/req_jump_to_typed_hole.ml

@@ -76,7 +76,7 @@ let on_request ~(params : Jsonrpc.Structured.t option) (state : State.t) =
       let open Fiber.O in
       let merlin = Document.merlin_exn doc in
       let+ holes = Typed_hole.all ~pipeline_name:"jump-to-typed-hole" merlin in
-      holes |> Typed_hole.find ~position ~range ~direction |> yojson_of_t
+      holes |> Typed_hole.find ~position ?range ~direction |> yojson_of_t
     | None ->
       Jsonrpc.Response.Error.raise
       @@ Jsonrpc.Response.Error.make

ocaml-lsp-server/src/typed_hole.ml

@@ -34,7 +34,7 @@ let find_next ~range ~position holes =
   | hole -> hole
 ;;
 
-let find ~range ~position ~direction holes =
+let find ?range ~position ~direction holes =
   match direction with
   | `Prev -> find_prev ~range ~position holes
   | `Next -> find_next ~range ~position holes

ocaml-lsp-server/src/typed_hole.mli

@@ -1,5 +1,5 @@
 val find
-  :  range:Range.t option
+  :  ?range:Range.t
   -> position:Position.t
   -> direction:[< `Next | `Prev ]
   -> Range.t list