Skip to content

Fix merlin handling of private module #1653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 13, 2018
Merged

Fix merlin handling of private module #1653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
unreleased
----------

- Fix merlin handling of private module visibility (#1653 @bobot)

- unstable-fmt: use boxes to wrap some lists (#1608, fix #1153, @emillon,
thanks to @rgrinberg)

Expand Down
8 changes: 7 additions & 1 deletion src/lib_rules.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,13 +538,19 @@ module Gen (P : Install_rules.Params) = struct
; compile_info
};

let objs_dirs = Path.Set.singleton obj_dir in
let objs_dirs = if Lib_modules.has_private_modules lib_modules then
Path.Set.add objs_dirs private_obj_dir
else objs_dirs in

(cctx,
Merlin.make ()
~requires:(Lib.Compile.requires compile_info)
~flags
~preprocess:(Buildable.single_preprocess lib.buildable)
~libname:(snd lib.name)
~objs_dirs:(Path.Set.singleton obj_dir))
~objs_dirs
)

let rules (lib : Library.t) ~dir_contents ~dir ~expander ~scope
~dir_kind : Compilation_context.t * Merlin.t =
Expand Down
5 changes: 1 addition & 4 deletions src/merlin.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,7 @@ let dot_merlin sctx ~dir ~more_src_dirs ~scope ~dir_kind
Lib.src_dir lib
|> Path.drop_optional_build_context)
,
let obj_dirs = Path.Set.add obj_dirs (Lib.obj_dir lib) in
match Lib.private_obj_dir lib with
| None -> obj_dirs
| Some private_obj_dir -> Path.Set.add obj_dirs private_obj_dir
Path.Set.add obj_dirs (Lib.obj_dir lib)
))
in
let src_dirs =
Expand Down
2 changes: 1 addition & 1 deletion test/blackbox-tests/test-cases/merlin-tests/run.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
B $LIB_PREFIX/lib/ocaml
B ../_build/default/exe/.x.eobjs
B ../_build/default/lib/.foo.objs
B ../_build/default/lib/.foo.objs/.private
S $LIB_PREFIX/lib/bytes
S $LIB_PREFIX/lib/findlib
S $LIB_PREFIX/lib/ocaml
Expand All @@ -25,6 +24,7 @@
B $LIB_PREFIX/lib/ocaml
B ../_build/default/lib/.bar.objs
B ../_build/default/lib/.foo.objs
B ../_build/default/lib/.foo.objs/.private
S $LIB_PREFIX/lib/bytes
S $LIB_PREFIX/lib/findlib
S $LIB_PREFIX/lib/ocaml
Expand Down