Notify LSP of workspace config when starting

CHANGELOG.md

@@ -3,6 +3,7 @@
 # Unreleased
 
 - Fix direnv compatibility by loading the process.env on every command (#1322)
+- Fix server settings missing on LSP startup (#1321)
 
 ## 1.14.2
 

src/extension_instance.ml

@@ -11,6 +11,8 @@ type t =
   ; documentation_server_info : StatusBarItem.t
   ; sandbox_info : StatusBarItem.t
   ; ast_editor_state : Ast_editor_state.t
+  ; mutable codelens : bool option
+  ; mutable extended_hover : bool option
   }
 
 let sandbox t = t.sandbox
@@ -23,6 +25,35 @@ let lsp_client t = t.lsp_client
 
 let ocaml_version_exn t = Option.value_exn t.ocaml_version
 
+let send_configuration ?codelens ?extended_hover client =
+  let codelens =
+    Option.map codelens ~f:(fun enable ->
+        LanguageClient.OcamllspSettingEnable.create ~enable ())
+  in
+  let extendedHover =
+    Option.map extended_hover ~f:(fun enable ->
+        LanguageClient.OcamllspSettingEnable.create ~enable ())
+  in
+  let settings =
+    LanguageClient.OcamllspSettings.create ?codelens ?extendedHover ()
+  in
+  let payload =
+    let settings = LanguageClient.DidChangeConfiguration.create ~settings () in
+    LanguageClient.DidChangeConfiguration.t_to_js settings
+  in
+  LanguageClient.sendNotification
+    client
+    "workspace/didChangeConfiguration"
+    payload
+
+let set_configuration t ?codelens ?extended_hover () =
+  t.codelens <- codelens;
+  t.extended_hover <- extended_hover;
+  match t.lsp_client with
+  | None -> ()
+  | Some (client, (_ : Ocaml_lsp.t)) ->
+    send_configuration ?codelens ?extended_hover client
+
 let stop_server t =
   match t.lsp_client with
   | None -> Promise.return ()
@@ -133,6 +164,10 @@ end = struct
        with
       | Ok () -> ()
       | Error (`Msg m) -> show_message `Warn "%s" m);
+      send_configuration
+        client
+        ?codelens:t.codelens
+        ?extended_hover:t.extended_hover;
       Ok ()
     in
     match res with
@@ -189,7 +224,7 @@ end = struct
     StatusBarItem.set_text sandbox_info status_bar_item_text
 end
 
-let make () =
+let make ?codelens ?extended_hover () =
   let sandbox = Sandbox.Global in
   let sandbox_info = Sandbox_info.make sandbox in
   let documentation_server_info = documentation_server_info () in
@@ -202,6 +237,8 @@ let make () =
   ; ocaml_version = None
   ; ast_editor_state
   ; documentation_server = None
+  ; codelens
+  ; extended_hover
   }
 
 let set_documentation_context ~running =

src/extension_instance.mli

@@ -2,7 +2,7 @@ open Import
 
 type t
 
-val make : unit -> t
+val make : ?codelens:bool -> ?extended_hover:bool -> unit -> t
 
 val sandbox : t -> Sandbox.t
 
@@ -23,6 +23,9 @@ val ocaml_version_exn : t -> Ocaml_version.t
 
 val start_language_server : t -> unit Promise.t
 
+val set_configuration :
+  t -> ?codelens:bool -> ?extended_hover:bool -> unit -> unit
+
 val open_terminal : Sandbox.t -> unit
 
 val disposable : t -> Disposable.t

src/vscode_ocaml_platform.ml

@@ -23,34 +23,9 @@ let suggest_to_pick_sandbox () =
 let notify_configuration_changes instance =
   Workspace.onDidChangeConfiguration
     ~listener:(fun _event ->
-      match Extension_instance.language_client instance with
-      | None -> ()
-      | Some client ->
-        let codelens =
-          Option.map
-            Settings.(get server_codelens_setting)
-            ~f:(fun enable ->
-              LanguageClient.OcamllspSettingEnable.create ~enable ())
-        in
-        let extendedHover =
-          Option.map
-            Settings.(get server_extendedHover_setting)
-            ~f:(fun enable ->
-              LanguageClient.OcamllspSettingEnable.create ~enable ())
-        in
-        let settings =
-          LanguageClient.OcamllspSettings.create ?codelens ?extendedHover ()
-        in
-        let payload =
-          let settings =
-            LanguageClient.DidChangeConfiguration.create ~settings ()
-          in
-          LanguageClient.DidChangeConfiguration.t_to_js settings
-        in
-        LanguageClient.sendNotification
-          client
-          "workspace/didChangeConfiguration"
-          payload)
+      let codelens = Settings.(get server_codelens_setting) in
+      let extended_hover = Settings.(get server_extendedHover_setting) in
+      Extension_instance.set_configuration instance ?codelens ?extended_hover ())
     ()
 
 let activate (extension : ExtensionContext.t) =