simon/linol
1
0
Fork 0
mirror of https://github.com/c-cube/linol.git synced 2025-12-05 19:00:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #42 from vincent-botbol/vbot/fix-positionEncoding

Browse source 
Use positionEncoding advertised by clients
This commit is contained in:
Simon Cruanes 2024-08-22 09:38:28 -04:00 • committed by GitHub
commit a779942f95
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/server.ml
View file

@ -173,6 +173,7 @@ module Make (IO : IO) = struct
val mutable status : [ `Running | `ReceivedShutdown | `ReceivedExit ] =
`Running
val mutable positionEncoding : [ `UTF8 | `UTF16 ] = `UTF16
val docs : (DocumentUri.t, doc_state) Hashtbl.t = Hashtbl.create 16
method get_status = status
@ -183,6 +184,26 @@ module Make (IO : IO) = struct
try Some (Hashtbl.find docs uri) with Not_found -> None
(** Find current state of the given document, if present. *)
method set_positionEncoding (i : InitializeParams.t) : unit =
match i.capabilities.general with
| Some { positionEncodings = Some el; _ } ->
let l =
List.filter_map
(function
| PositionEncodingKind.UTF8 -> Some `UTF8
| UTF16 -> Some `UTF16
| _ -> None)
el
|> List.sort_uniq compare
in
let encoding =
match l with
| [ `UTF8 ] -> `UTF8
| [] | [ `UTF16 ] | [ `UTF16; _ ] | [ _; `UTF16 ] | _ -> `UTF16
in
positionEncoding <- encoding
| _ -> ()
method on_request_unhandled : type r.
notify_back:notify_back ->
id:Req_id.t ->
@ -251,8 +272,14 @@ module Make (IO : IO) = struct
(** List of commands available *)
method on_req_initialize ~notify_back:(_ : notify_back)
(_i : InitializeParams.t) : InitializeResult.t IO.t =
(i : InitializeParams.t) : InitializeResult.t IO.t =
let sync_opts = self#config_sync_opts in
self#set_positionEncoding i;
let positionEncoding =
match positionEncoding with
| `UTF8 -> PositionEncodingKind.UTF8
| `UTF16 -> UTF16
in
let capabilities =
ServerCapabilities.create
?codeLensProvider:self#config_code_lens_options
@ -265,7 +292,8 @@ module Make (IO : IO) = struct
?hoverProvider:self#config_hover
?inlayHintProvider:self#config_inlay_hints
?documentSymbolProvider:self#config_symbol
~textDocumentSync:(`TextDocumentSyncOptions sync_opts) ()
~textDocumentSync:(`TextDocumentSyncOptions sync_opts)
~positionEncoding ()
|> self#config_modify_capabilities
in
IO.return @@ InitializeResult.create ~capabilities ()
@ -387,6 +415,7 @@ module Make (IO : IO) = struct
~partialResultToken:None ~workDoneToken:i.workDoneToken
~notify_back ~server_request ()
in
self#set_positionEncoding i;
lift_ok @@ self#on_req_initialize ~notify_back i
| Lsp.Client_request.TextDocumentHover
{ textDocument; position; workDoneToken } ->
@ -666,13 +695,13 @@ module Make (IO : IO) = struct
let languageId = "" in
(* FIXME*)
Lsp.Text_document.make ~position_encoding:`UTF8
Lsp.Text_document.make ~position_encoding:positionEncoding
(DidOpenTextDocumentParams.create
~textDocument:
(TextDocumentItem.create ~languageId ~uri:doc.uri ~version
~text:""))
| Some st ->
Lsp.Text_document.make ~position_encoding:`UTF8
Lsp.Text_document.make ~position_encoding:positionEncoding
(DidOpenTextDocumentParams.create
~textDocument:
(TextDocumentItem.create ~languageId:st.languageId