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

Merge pull request #824 from rgrinberg/merlin-fix 

Merlin fix
This commit is contained in:
Rudi Grinberg 2018-05-30 21:52:23 +07:00 committed by GitHub
parent 29f711985d 03c5ffb805
commit 3974ac3fa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/merlin.ml
View File

@ -127,19 +127,19 @@ let dot_merlin sctx ~dir ~scope ({ requires; flags; _ } as t) =
flags flags
>>^ (fun flags -> >>^ (fun flags ->
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:(t.source_dirs, t.objs_dirs)
~f:(fun (lib : Lib.t) (src_dirs, build_dirs) -> ~f:(fun (lib : Lib.t) (src_dirs, obj_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 obj_dirs (Lib.obj_dir lib)))
in in
Dot_file.to_string Dot_file.to_string
~remaindir ~remaindir
~ppx:(ppx_flags sctx ~dir ~scope ~src_dir:remaindir t) ~ppx:(ppx_flags sctx ~dir ~scope ~src_dir:remaindir t)
~flags ~flags
~src_dirs:(Path.Set.union src_dirs t.source_dirs) ~src_dirs
~obj_dirs:(Path.Set.union obj_dirs t.objs_dirs)) ~obj_dirs)
>>> >>>
Build.write_file_dyn merlin_file) Build.write_file_dyn merlin_file)

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