Skip to content

Commit

Permalink
merlin: roll back changes in default-based-context test
Browse files Browse the repository at this point in the history
Signed-off-by: Javier Chávarri <javier.chavarri@gmail.com>
  • Loading branch information
jchavarri committed Apr 2, 2024
1 parent 4c899d9 commit 6fd6463
Showing 1 changed file with 4 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,15 @@ If Merlin field is absent, default context is chosen

$ dune build

The rules are generated for all contexts, regardless which one is chosen

$ ls -a _build/cross/.merlin-conf
.
..
lib-foo
ls: cannot access '_build/cross/.merlin-conf': No such file or directory
[2]

$ ls -a _build/default/.merlin-conf
.
..
lib-foo

But the default context is used by default

$ dune ocaml merlin dump-config "$PWD"
Foo: _build/default/foo
((STDLIB OPAM_PREFIX)
Expand Down Expand Up @@ -63,9 +58,8 @@ If Merlin field is present, this context is chosen
lib-foo

$ ls -a _build/default/.merlin-conf
.
..
lib-foo
ls: cannot access '_build/default/.merlin-conf': No such file or directory
[2]

$ dune ocaml merlin dump-config "$PWD"
Foo: _build/cross/foo
Expand Down

0 comments on commit 6fd6463

Please sign in to comment.