From 8f16afe293dbeb19a2d940debe992adc14fce7ad Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Wed, 30 May 2018 14:39:47 +0700 Subject: [PATCH] Fix merlin generation The optional build contexts were being dropped from the obj dirs instead of the source dirs. Signed-off-by: Rudi Grinberg --- src/merlin.ml | 8 ++++---- test/blackbox-tests/test-cases/merlin-tests/run.t | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/merlin.ml b/src/merlin.ml index fb7c5ead..33016aba 100644 --- a/src/merlin.ml +++ b/src/merlin.ml @@ -129,10 +129,10 @@ let dot_merlin sctx ~dir ~scope ({ requires; flags; _ } as t) = let (src_dirs, obj_dirs) = Lib.Set.fold requires ~init:(Path.Set.empty, Path.Set.empty) ~f:(fun (lib : Lib.t) (src_dirs, build_dirs) -> - ( Path.Set.add src_dirs (Lib.src_dir lib) - , Path.Set.add build_dirs ( - Lib.obj_dir lib - |> Path.drop_optional_build_context))) + ( Path.Set.add src_dirs ( + Lib.src_dir lib + |> Path.drop_optional_build_context) + , Path.Set.add build_dirs (Lib.obj_dir lib))) in Dot_file.to_string ~remaindir diff --git a/test/blackbox-tests/test-cases/merlin-tests/run.t b/test/blackbox-tests/test-cases/merlin-tests/run.t index dce196b8..29297ed2 100644 --- a/test/blackbox-tests/test-cases/merlin-tests/run.t +++ b/test/blackbox-tests/test-cases/merlin-tests/run.t @@ -9,12 +9,12 @@ B $LIB_PREFIX/lib/findlib B $LIB_PREFIX/lib/ocaml B ../_build/default/exe/.x.eobjs - B ../lib/.foo.objs + B ../_build/default/lib/.foo.objs S $LIB_PREFIX/lib/bytes S $LIB_PREFIX/lib/findlib S $LIB_PREFIX/lib/ocaml - S ../_build/default/lib S . + S ../lib FLG -w -40 # Processing lib/.merlin B $LIB_PREFIX/lib/bytes