Support project wide occurrences

voodoos · Jan 29, 2024 · 69fea3a · 69fea3a
1 parent d3d8de5
commit 69fea3a
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/ocaml-lsp-server/src/ocaml_lsp_server.ml b/ocaml-lsp-server/src/ocaml_lsp_server.ml
@@ -436,12 +436,22 @@ let references (state : State.t)
     let+ locs =
       Document.Merlin.dispatch_exn
         doc
-        (Occurrences (`Ident_at (Position.logical position), `Buffer))
+        (Occurrences (`Ident_at (Position.logical position), `Project))
     in
     Some
       (List.map locs ~f:(fun loc ->
            let range = Range.of_loc loc in
-           (* using original uri because merlin is looking only in local file *)
+           let uri =
+             match loc.loc_start.pos_fname with
+             | "" -> uri
+             | path -> Uri.of_path path
+           in
+           Log.log ~section:"debug" (fun () ->
+               Log.msg
+                 "merlin returned fname %a"
+                 [ ("pos_fname", `String loc.loc_start.pos_fname)
+                 ; ("uri", `String (Uri.to_string uri))
+                 ]);
            { Location.uri; range }))
 
 let highlight (state : State.t)