Use canonicalized URIs/paths for jump to definition

Author: fhammerschmidt

analysis/bin/main.ml

@@ -189,6 +189,7 @@ let main () =
     Printf.printf "\"%s\"" (Json.escape (Commands.format ~path))
   | [_; "test"; path] ->
     Cfg.supportsSnippets := true;
+    Cfg.isTestMode := true;
     Commands.test ~path
   | args when List.mem "-h" args || List.mem "--help" args -> prerr_endline help
   | _ ->

analysis/src/Cfg.ml

@@ -3,3 +3,5 @@ let supportsSnippets = ref false
 let debugFollowCtxPath = ref false
 
 let isDocGenFromCompiler = ref false
+
+let isTestMode = ref false

analysis/src/Commands.ml

@@ -112,7 +112,10 @@ let definition ~path ~pos ~debug =
           if skipLoc then None
           else
             Some
-              {Protocol.uri = Uri.toString uri; range = Utils.cmtLocToRange loc}
+              {
+                Protocol.uri = Files.canonicalizeUri uri;
+                range = Utils.cmtLocToRange loc;
+              }
         | Some _ -> None))
   in
   print_endline
@@ -132,7 +135,10 @@ let typeDefinition ~path ~pos ~debug =
         | None -> None
         | Some (uri, loc) ->
           Some
-            {Protocol.uri = Uri.toString uri; range = Utils.cmtLocToRange loc}))
+            {
+              Protocol.uri = Files.canonicalizeUri uri;
+              range = Utils.cmtLocToRange loc;
+            }))
   in
   print_endline
     (match maybeLocation with

analysis/src/Files.ml

@@ -20,7 +20,7 @@ let relpath base path =
     let baselen = String.length base in
     let rest = String.sub path baselen (String.length path - baselen) in
     (if rest <> "" && rest.[0] = Filename.dir_sep.[0] then sliceToEnd rest 1
-    else rest)
+     else rest)
     |> removeExtraDots
   else
     let rec loop bp pp =
@@ -102,3 +102,9 @@ let classifySourceFile path =
   if Filename.check_suffix path ".res" && exists path then Res
   else if Filename.check_suffix path ".resi" && exists path then Resi
   else Other
+
+let canonicalizeUri uri =
+  if Cfg.isTestMode.contents then uri |> Uri.toString
+  else
+    let path = Uri.toPath uri in
+    path |> Unix.realpath