simon/linol
1
0
Fork 0
mirror of https://github.com/c-cube/linol.git synced 2026-05-05 08:54:26 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #62 from wintersteiger/christoph/allow-response-errors

Browse source 
Allow request handlers to return Response.Errors
This commit is contained in:
Simon Cruanes 2026-04-07 21:06:12 -04:00 • committed by GitHub
commit 5ae0d593ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/jsonrpc2.ml
View file

@ -228,10 +228,7 @@ module Make (IO : IO) : S with module IO = IO = struct
| Ok reply -> | Ok reply ->
let reply_json = Lsp.Client_request.yojson_of_result r reply in let reply_json = Lsp.Client_request.yojson_of_result r reply in
Jsonrpc.Response.ok id reply_json Jsonrpc.Response.ok id reply_json
| Error message -> | Error err -> Jsonrpc.Response.error id err
Jsonrpc.Response.error id
(Jsonrpc.Response.Error.make
~code:Jsonrpc.Response.Error.Code.InternalError ~message ())
in in
send_response self response send_response self response

25
src/server.ml
View file

@ -61,7 +61,7 @@ module Make (IO : IO) = struct
server_request:send_request -> server_request:send_request ->
id:Req_id.t -> id:Req_id.t ->
'a Lsp.Client_request.t -> 'a Lsp.Client_request.t ->
('a, string) result IO.t ('a, Jsonrpc.Response.Error.t) result IO.t
(** Method called to handle client requests. (** Method called to handle client requests.
@param notify_back @param notify_back
an object used to reply to the client, send progress messages, an object used to reply to the client, send progress messages,
@ -379,21 +379,31 @@ module Make (IO : IO) = struct
server_request:_ -> server_request:_ ->
id:Req_id.t -> id:Req_id.t ->
r Lsp.Client_request.t -> r Lsp.Client_request.t ->
(r, string) result IO.t = (r, Jsonrpc.Response.Error.t) result IO.t =
fun ~notify_back ~server_request ~id (r : _ Lsp.Client_request.t) -> fun ~notify_back ~server_request ~id (r : _ Lsp.Client_request.t) ->
Trace.with_span ~__FILE__ ~__LINE__ "linol.on-request" Trace.with_span ~__FILE__ ~__LINE__ "linol.on-request"
@@ fun _sp : (r, string) result IO.t -> @@ fun _sp : (r, Jsonrpc.Response.Error.t) result IO.t ->
(* handler to catch all errors *) (* handler to catch all errors *)
let try_catch : (unit -> (r, _) result IO.t) -> (r, _) result IO.t = let try_catch :
(unit -> (r, Jsonrpc.Response.Error.t) result IO.t) ->
(r, Jsonrpc.Response.Error.t) result IO.t =
fun f -> fun f ->
IO.catch f (fun exn bt -> IO.catch f (fun (exn : exn) bt ->
match exn with
| Linol_jsonrpc.Jsonrpc.Response.Error.E e ->
IO.return @@ Error e
| _ ->
let msg = let msg =
spf "LSP request handler failed with %s\n%s" spf "LSP request handler failed with %s\n%s"
(Printexc.to_string exn) (Printexc.to_string exn)
(Printexc.raw_backtrace_to_string bt) (Printexc.raw_backtrace_to_string bt)
in in
Log.err (fun k -> k "%s" msg); Log.err (fun k -> k "%s" msg);
IO.return @@ Error msg) IO.return
@@ Error
(Jsonrpc.Response.Error.make
~code:Jsonrpc.Response.Error.Code.InternalError
~message:msg ()))
in in
try_catch @@ fun () -> try_catch @@ fun () ->
@ -737,7 +747,8 @@ module Make (IO : IO) = struct
in in
let new_doc : Lsp.Text_document.t = let new_doc : Lsp.Text_document.t =
Lsp.Text_document.apply_content_changes old_doc c Lsp.Text_document.apply_content_changes ~version:doc.version
old_doc c
in in
let new_st : doc_state = let new_st : doc_state =