Skip to content

Made merlinDiagnostics default to true + fixed documentation (config.md) #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: internal
Choose a base branch
from
Open

Made merlinDiagnostics default to true + fixed documentation (config.md) #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ocaml-lsp-server/docs/ocamllsp/config.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ interface config {
codelens: { enable : boolean }

/**
* Enable/Disable Dune diagnostics
* Enable/Disable Merlin (Dune) diagnostics
* @default true
* @since 1.18
*/
duneDiagnostics: { enable : boolean }
merlinDiagnostics: { enable : boolean }

/**
* Enable/Disable Inlay Hints
Expand Down
4 changes: 2 additions & 2 deletions ocaml-lsp-server/src/config_data.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module SyntaxDocumentation = struct
end

module MerlinDiagnostics = struct
type t = { enable : bool [@default false] }
type t = { enable : bool [@default true] }
[@@deriving yojson] [@@yojson.allow_extra_fields]
end

Expand Down Expand Up @@ -68,7 +68,7 @@ let default =
; hint_let_syntax_ppx = false
}
; syntax_documentation = Some { enable = false }
; merlin_diagnostics = Some { enable = false }
; merlin_diagnostics = Some { enable = true }
; shorten_merlin_diagnostics = Some { enable = false }
; ppx_css_colors = Some { enable = true }
}
Expand Down
4 changes: 2 additions & 2 deletions ocaml-lsp-server/src/configuration.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ let update t { DidChangeConfigurationParams.settings } =

let display_merlin_diagnostics t =
match t.data.merlin_diagnostics with
| Some { enable = true } -> true
| Some { enable = false } | None -> false
| Some { enable = true } | None -> true
| Some { enable = false } -> false
;;

let shorten_merlin_diagnostics t =
Expand Down