Fix issue 1388

src/dot-merlin/dot_merlin_reader.ml

@@ -461,6 +461,7 @@ let postprocess cfg =
  ; List.concat_map pkg_paths ~f:(fun p -> [ `B p; `S p ])
  ; ppx
  ; List.map failures ~f:(fun s -> `ERROR_MSG s)
+ ; Option.to_list cfg.stdlib |> List.map ~f:(fun std -> `STDLIB std)
  ]
 
 let load dot_merlin_file =

src/kernel/mconfig.ml

@@ -63,6 +63,9 @@ let canonicalize_filename path =
 let marg_path f =
  Marg.param "path" (fun path acc -> f (canonicalize_filename path) acc)
 
+let marg_path_no_canon f =
+ Marg.param "path" (fun path acc -> f path acc)
+
 let marg_commandline f =
  Marg.param "command"
  (fun workval acc -> f {workdir = unsafe_get_cwd (); workval} acc)
@@ -413,7 +416,7 @@ let ocaml_alert_spec =
 let ocaml_flags = [
  (
  "-I",
- marg_path (fun dir ocaml ->
+ marg_path_no_canon (fun dir ocaml ->
  {ocaml with include_dirs = dir :: ocaml.include_dirs}),
  "<dir> Add <dir> to the list of include directories"
  );
@@ -691,7 +694,7 @@ let source_path config =
  config.merlin.source_path]
  |> List.filter_dup
 
-let build_path config = (
+let include_dirs ~stdlib config =
  let dirs =
  match config.ocaml.threads with
  | `None -> config.ocaml.include_dirs
@@ -703,10 +706,12 @@ let build_path config = (
  config.merlin.build_path @
  dirs
  in
+ List.map dirs ~f:(fun dir -> Misc.expand_directory stdlib dir
+ |> Misc.canonicalize_filename)
+
+let build_path config = (
  let stdlib = stdlib config in
- let exp_dirs =
- List.map ~f:(Misc.expand_directory stdlib) dirs
- in
+ let exp_dirs = include_dirs ~stdlib config in
  let stdlib = if config.ocaml.no_std_include then [] else [stdlib] in
  let dirs = List.rev_append exp_dirs stdlib in
  let result =
@@ -721,21 +726,8 @@ let build_path config = (
 )
 
 let cmt_path config = (
- let dirs =
- match config.ocaml.threads with
- | `None -> config.ocaml.include_dirs
- | `Threads -> "+threads" :: config.ocaml.include_dirs
- | `Vmthreads -> "+vmthreads" :: config.ocaml.include_dirs
- in
- let dirs =
- config.merlin.cmt_path @
- config.merlin.build_path @
- dirs
- in
  let stdlib = stdlib config in
- let exp_dirs =
- List.map ~f:(Misc.expand_directory stdlib) dirs
- in
+ let exp_dirs = include_dirs ~stdlib config in
  let stdlib = if config.ocaml.no_std_include then [] else [stdlib] in
  config.query.directory :: List.rev_append exp_dirs stdlib
 )

tests/test-dirs/config/issue1388.t

@@ -0,0 +1,31 @@
+ $ cat >.merlin <<EOF
+ > STDLIB /my/std
+ > FLG -I +../cerberus/flags
+ > S +../cerberus/source
+ > B +../cerberus/build
+ > EOF
+
+ $ echo "" | $MERLIN single dump-configuration -filename test.ml | \
+ > grep -A2 'include_dirs\|source_path\|build_path'
+ "include_dirs": [
+ "+../cerberus/flags"
+ ],
+ --
+ "build_path": [
+ "/my/cerberus/build"
+ ],
+ "source_path": [
+ "/my/cerberus/source"
+ ],
+
+ $ echo "" | $MERLIN single dump -what paths -filename test.ml 
+ {
+ "class": "return",
+ "value": [
+ "$TESTCASE_ROOT",
+ "/my/cerberus/flags",
+ "/my/cerberus/build",
+ "/my/std"
+ ],
+ "notifications": []
+ }