Skip to content

Commit

Permalink
Add ocaml.server.duneDiagnostics to disable dune diagnostics reporting
Browse files Browse the repository at this point in the history
  • Loading branch information
EduardoRFS committed Jan 4, 2024
1 parent 6f405a2 commit 7148d94
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 1 deletion.
5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,11 @@
"default": false,
"markdownDescription": "Enable/Disable extended hover"
},
"ocaml.server.duneDiagnostics": {
"type": "boolean",
"default": true,
"markdownDescription": "Enable/Disable dune diagnostics"
},
"ocaml.dune.autoDetect": {
"type": "boolean",
"default": true,
Expand Down
3 changes: 3 additions & 0 deletions src-bindings/vscode_languageclient/vscode_languageclient.ml
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,12 @@ module OcamllspSettings = struct

val extendedHover : t -> OcamllspSettingEnable.t or_undefined [@@js.get]

val duneDiagnostics : t -> OcamllspSettingEnable.t or_undefined [@@js.get]

val create :
?codelens:OcamllspSettingEnable.t
-> ?extendedHover:OcamllspSettingEnable.t
-> ?duneDiagnostics:OcamllspSettingEnable.t
-> unit
-> t
[@@js.builder]]
Expand Down
3 changes: 3 additions & 0 deletions src-bindings/vscode_languageclient/vscode_languageclient.mli
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,12 @@ module OcamllspSettings : sig

val extendedHover : t -> OcamllspSettingEnable.t option

val duneDiagnostics : t -> OcamllspSettingEnable.t option

val create :
?codelens:OcamllspSettingEnable.t
-> ?extendedHover:OcamllspSettingEnable.t
-> ?duneDiagnostics:OcamllspSettingEnable.t
-> unit
-> t
end
Expand Down
7 changes: 7 additions & 0 deletions src/settings.ml
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,10 @@ let server_extendedHover_setting =
~key:"ocaml.server.extendedHover"
~of_json:Jsonoo.Decode.bool
~to_json:Jsonoo.Encode.bool

let server_duneDiagnostics_setting =
create_setting
~scope:ConfigurationTarget.Workspace
~key:"ocaml.server.duneDiagnostics"
~of_json:Jsonoo.Decode.bool
~to_json:Jsonoo.Encode.bool
2 changes: 2 additions & 0 deletions src/settings.mli
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,5 @@ val server_args_setting : string list setting
val server_codelens_setting : bool setting

val server_extendedHover_setting : bool setting

val server_duneDiagnostics_setting : bool setting
12 changes: 11 additions & 1 deletion src/vscode_ocaml_platform.ml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,18 @@ let notify_configuration_changes instance =
~f:(fun enable ->
LanguageClient.OcamllspSettingEnable.create ~enable ())
in
let duneDiagnostics =
Option.map
Settings.(get server_duneDiagnostics_setting)
~f:(fun enable ->
LanguageClient.OcamllspSettingEnable.create ~enable ())
in
let settings =
LanguageClient.OcamllspSettings.create ?codelens ?extendedHover ()
LanguageClient.OcamllspSettings.create
?codelens
?extendedHover
?duneDiagnostics
()
in
let payload =
let settings =
Expand Down

0 comments on commit 7148d94

Please sign in to comment.