matthieu
/
dune
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix merlin generation 

The optional build contexts were being dropped from the obj dirs instead of the
source dirs.

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
This commit is contained in:
Rudi Grinberg 2018-05-30 14:39:47 +07:00
parent 62edd42d8a
commit 8f16afe293
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/merlin.ml
View File

@ -129,10 +129,10 @@ let dot_merlin sctx ~dir ~scope ({ requires; flags; _ } as t) =
let (src_dirs, obj_dirs) = let (src_dirs, obj_dirs) =
Lib.Set.fold requires ~init:(Path.Set.empty, Path.Set.empty) Lib.Set.fold requires ~init:(Path.Set.empty, Path.Set.empty)
~f:(fun (lib : Lib.t) (src_dirs, build_dirs) -> ~f:(fun (lib : Lib.t) (src_dirs, build_dirs) ->
( Path.Set.add src_dirs (Lib.src_dir lib) ( Path.Set.add src_dirs (
, Path.Set.add build_dirs ( Lib.src_dir lib
Lib.obj_dir lib |> Path.drop_optional_build_context)
|> Path.drop_optional_build_context))) , Path.Set.add build_dirs (Lib.obj_dir lib)))
in in
Dot_file.to_string Dot_file.to_string
~remaindir ~remaindir

4
test/blackbox-tests/test-cases/merlin-tests/run.t
View File

@ -9,12 +9,12 @@
B $LIB_PREFIX/lib/findlib B $LIB_PREFIX/lib/findlib
B $LIB_PREFIX/lib/ocaml B $LIB_PREFIX/lib/ocaml
B ../_build/default/exe/.x.eobjs 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/bytes
S $LIB_PREFIX/lib/findlib S $LIB_PREFIX/lib/findlib
S $LIB_PREFIX/lib/ocaml S $LIB_PREFIX/lib/ocaml
S ../_build/default/lib
S . S .
S ../lib
FLG -w -40 FLG -w -40
# Processing lib/.merlin # Processing lib/.merlin
B $LIB_PREFIX/lib/bytes B $LIB_PREFIX/lib/bytes