fix: correctly output -open flags in merlin

Use the same -open flags that are used for compilation Fixes #8297 Signed-off-by: Rudi Grinberg <me@rgrinberg.com>
ocaml · Jan 7, 2024 · 7b1070e · 7b1070e
1 parent ca004c1
commit 7b1070e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/doc/changes/9659.md b/doc/changes/9659.md
@@ -0,0 +1,2 @@
+- Fix merlin configuration for `(include_subdirs qualified)` modules (#9659,
+  fixes #8297, @rgrinberg)
diff --git a/src/dune_rules/merlin/merlin.ml b/src/dune_rules/merlin/merlin.ml
@@ -577,7 +577,7 @@ module Unprocessed = struct
         |> Path.Build.Set.fold ~init ~f:(fun src acc ->
           let config =
             { Processed.module_ = Module.set_pp m None
-            ; opens = Modules.alias_for modules m |> List.map ~f:Module.name
+            ; opens = Modules.local_open modules m
             }
           in
           (src, config) :: acc))

diff --git a/test/blackbox-tests/test-cases/merlin/include-subdirs-qualified.t b/test/blackbox-tests/test-cases/merlin/include-subdirs-qualified.t
@@ -149,7 +149,7 @@
     $TESTCASE_ROOT/groupintf)
    (S
     $TESTCASE_ROOT/utils)
-   (FLG (-open Utils -open Foo))
+   (FLG (-open Foo__Utils -open Foo))
    (FLG
     (-w
      @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- Fix merlin configuration for `(include_subdirs qualified)` modules (#9659,
		fixes #8297, @rgrinberg)