refactor: move path canonicalization to caller

ocaml · May 12, 2022 · 55d06b2 · 55d06b2
1 parent 150d54a
commit 55d06b2
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/ocaml-lsp-server/src/merlin_config.ml b/ocaml-lsp-server/src/merlin_config.ml
@@ -195,8 +195,7 @@ module Process = struct
       let* stdin = make stdin_w Output in
       let+ stdout = make stdout_r Input in
       let session = Lev_fiber_csexp.Session.create ~socket:false stdout stdin in
-      let initial_cwd = Misc.canonicalize_filename dir in
-      { pid; initial_cwd; stdin; stdout; session }
+      { pid; initial_cwd = dir; stdin; stdout; session }
 end
 
 module Dot_protocol_io =
@@ -319,7 +318,9 @@ let find_project_context start_dir =
       List.find_map [ "dune-project"; "dune-workspace" ] ~f:(fun f ->
           let fname = Filename.concat dir f in
           if file_exists fname then
-            let workdir = Option.value ~default:dir workdir in
+            let workdir =
+              Misc.canonicalize_filename (Option.value ~default:dir workdir)
+            in
             Some ({ workdir; process_dir = dir }, fname)
           else None)
     with