From 950de76ea03f5405854717c49a8733922bf0b7b5 Mon Sep 17 00:00:00 2001 From: Steven de Oliveira Date: Wed, 15 Nov 2023 11:59:10 +0100 Subject: [PATCH] Poetry --- .../superbol_instance.ml | 16 ++++++++++------ .../vscode_languageclient.ml | 2 +- .../vscode_languageclient.mli | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/vscode/superbol-vscode-platform/superbol_instance.ml b/src/vscode/superbol-vscode-platform/superbol_instance.ml index ac8be00fa..d6889c2c1 100644 --- a/src/vscode/superbol-vscode-platform/superbol_instance.ml +++ b/src/vscode/superbol-vscode-platform/superbol_instance.ml @@ -20,6 +20,11 @@ type t = { } type client = LanguageClient.t + +let id = "superbol-free-lsp" + +let name = "SuperBOL Language Server" + let make ~bundled_superbol () = { bundled_superbol; language_client = None @@ -47,9 +52,9 @@ let start_language_server t = let client = let cmd = Executable.command serverOptions in if String.starts_with ~prefix:"ws://" cmd then - LanguageClient.make_ - ~id:"cobolServer" - ~name:"Cobol Server" + LanguageClient.make_stream + ~id + ~name (fun () -> let njs_stream = Vscode_languageclient.StreamInfo.njs_stream_of_string cmd @@ -64,15 +69,14 @@ let start_language_server t = else let clientOptions = Superbol_languageclient.clientOptions () in LanguageClient.make () - ~id: "superbol-free-lsp" - ~name: "SuperBOL Language Server" + ~id + ~name ~serverOptions ~clientOptions in let+ () = LanguageClient.start client in t.language_client <- Some client - let current_document_uri ?text_editor () = match match text_editor with None -> Vscode.Window.activeTextEditor () | e -> e diff --git a/src/vscode/vscode-languageclient-js-stubs/vscode_languageclient.ml b/src/vscode/vscode-languageclient-js-stubs/vscode_languageclient.ml index 197756a53..8414e38f7 100644 --- a/src/vscode/vscode-languageclient-js-stubs/vscode_languageclient.ml +++ b/src/vscode/vscode-languageclient-js-stubs/vscode_languageclient.ml @@ -242,7 +242,7 @@ module LanguageClient = struct -> t [@@js.new "vscode_languageclient.LanguageClient"] - val make_ : + val make_stream : id:string -> name:string -> (unit -> StreamInfo.t Promise.t) diff --git a/src/vscode/vscode-languageclient-js-stubs/vscode_languageclient.mli b/src/vscode/vscode-languageclient-js-stubs/vscode_languageclient.mli index cf0b2e65f..ecb8acef0 100644 --- a/src/vscode/vscode-languageclient-js-stubs/vscode_languageclient.mli +++ b/src/vscode/vscode-languageclient-js-stubs/vscode_languageclient.mli @@ -200,7 +200,7 @@ module LanguageClient : sig -> unit -> t - val make_ : + val make_stream : id:string -> name:string -> (unit -> StreamInfo.t Promise.t)