Workspace symbol wrong path

CHANGES.md

@@ -1,3 +1,9 @@
+# Unreleased
+
+## Fixes
+
+- Fix workspace symbols that could have a wrong path in some cases ([#675](https://github.com/ocaml/ocaml-lsp/pull/671))
+
 # 1.10.6
 
 ## Fixes

ocaml-lsp-server/src/workspace_symbol.ml

@@ -213,15 +213,16 @@ let symbols_from_cm_file ~filter root_uri cm_file =
   | Some sourcefile -> (
     match Filename.extension sourcefile with
     | ".ml" | ".mli" -> (
-      let sourcepath = Filename.concat root_uri sourcefile in
       match browse_of_cmt cmt with
       | None -> []
       | Some browse ->
         let outline =
           let browse_tree = Merlin_analysis.Browse_tree.of_node browse in
           Outline.get [ browse_tree ]
         in
-        let uri = Uri.of_path sourcepath in
+        let loc = Mbrowse.node_loc browse in
+        let fname = loc.loc_start.pos_fname in
+        let uri = Uri.of_path (Filename.concat root_uri fname) in
         filter (Document_symbol.symbols_of_outline uri outline))
     | _ -> [])
 

ocaml-lsp-server/test/e2e/__tests__/workspace-symbol.test.ts

@@ -99,13 +99,15 @@ describe("workspace/symbol", () => {
         "a_b_t 15 file://<workspace_symbol_A>/bin/a.ml 3:2 3:21",
         "a_x 12 file://<workspace_symbol_A>/bin/a.ml 0:0 0:11",
         "main_y 12 file://<workspace_symbol_A>/bin/main.ml 0:0 0:22",
+        "vendored_x 12 file://<workspace_symbol_A>/lib/lib.ml 14:0 14:31",
         "lib_type 12 file://<workspace_symbol_A>/lib/lib.ml 12:0 12:38",
         "lib_private_fn 12 file://<workspace_symbol_A>/lib/lib.ml 10:0 10:38",
         "hd 12 file://<workspace_symbol_A>/lib/lib.ml 8:0 8:16",
         "lib_x 12 file://<workspace_symbol_A>/lib/lib.ml 6:0 6:14",
         "user 15 file://<workspace_symbol_A>/lib/lib.ml 3:0 5:1",
         "name 7 file://<workspace_symbol_A>/lib/lib.ml 4:2 4:14",
         "t 15 file://<workspace_symbol_A>/lib/LibTypes.mli 0:0 0:15",
+        "x 12 file://<workspace_symbol_A>/vendor/vendored_lib.ml 0:0 0:9",
       ]
     `);
   });
@@ -177,13 +179,15 @@ describe("workspace/symbol", () => {
         "a_b_t 15 file://<workspace_symbol_A>/bin/a.ml 3:2 3:21",
         "a_x 12 file://<workspace_symbol_A>/bin/a.ml 0:0 0:11",
         "main_y 12 file://<workspace_symbol_A>/bin/main.ml 0:0 0:22",
+        "vendored_x 12 file://<workspace_symbol_A>/lib/lib.ml 14:0 14:31",
         "lib_type 12 file://<workspace_symbol_A>/lib/lib.ml 12:0 12:38",
         "lib_private_fn 12 file://<workspace_symbol_A>/lib/lib.ml 10:0 10:38",
         "hd 12 file://<workspace_symbol_A>/lib/lib.ml 8:0 8:16",
         "lib_x 12 file://<workspace_symbol_A>/lib/lib.ml 6:0 6:14",
         "user 15 file://<workspace_symbol_A>/lib/lib.ml 3:0 5:1",
         "name 7 file://<workspace_symbol_A>/lib/lib.ml 4:2 4:14",
         "t 15 file://<workspace_symbol_A>/lib/LibTypes.mli 0:0 0:15",
+        "x 12 file://<workspace_symbol_A>/vendor/vendored_lib.ml 0:0 0:9",
         "workspace_B 12 file://<workspace_symbol_B>/main.ml 0:0 0:31",
       ]
     `);

ocaml-lsp-server/test/e2e/__tests__/workspace_symbol_A/lib/dune

@@ -3,3 +3,6 @@
  (modules_without_implementation libTypes)
  (flags :standard -w -32-38-27-34)
  (name lib))
+
+
+(copy_files# ../vendor/*.ml{,i})

ocaml-lsp-server/test/e2e/__tests__/workspace_symbol_A/lib/lib.ml

@@ -11,3 +11,5 @@ let hd = List.hd
 let lib_private_fn s = print_endline s
 
 let lib_type: LibTypes.t = "lib_types"
+
+let vendored_x = Vendored_lib.x

ocaml-lsp-server/test/e2e/__tests__/workspace_symbol_A/vendor/vendored_lib.ml

@@ -0,0 +1 @@
+let x = 5