Skip to content

Commit

Permalink
Fix merlin config merging
Browse files Browse the repository at this point in the history
  • Loading branch information
voodoos committed Jan 29, 2024
1 parent 55ab533 commit 2367339
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion ocaml-lsp-server/src/merlin_config.ml
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ module Config = struct
; extensions = t.extensions @ merlin.extensions
; suffixes = t.suffixes @ merlin.suffixes
; stdlib = (if t.stdlib = None then merlin.stdlib else t.stdlib)
; index_file = merlin.index_file
; index_file = t.index_file
; reader = (if t.reader = [] then merlin.reader else t.reader)
; flags_to_apply = t.flags @ merlin.flags_to_apply
; failures = failures @ merlin.failures
Expand Down

0 comments on commit 2367339

Please sign in to comment.