Path coming from command-line does not need processing.

Author: cristianoc

analysis/.depend

@@ -33,7 +33,7 @@ src/References.cmx : src/Utils.cmx src/Uri2.cmx src/SharedTypes.cmx \
 src/Shared.cmx : src/PrintType.cmx src/Files.cmx
 src/SharedTypes.cmx : src/Utils.cmx src/Uri2.cmx src/Shared.cmx \
     src/Infix.cmx
-src/Uri2.cmx : src/Files.cmx
+src/Uri2.cmx :
 src/Utils.cmx : src/Protocol.cmx
 src/vendor/Json.cmx :
 src/vendor/res_outcome_printer/res_comment.cmx : \

analysis/src/Commands.ml

@@ -21,7 +21,7 @@ let dump files =
   Shared.cacheTypeToString := true;
   files
   |> List.iter (fun path ->
-         let uri = Uri2.fromLocalPath path in
+         let uri = Uri2.fromPath path in
          let result =
            match ProcessCmt.getFullFromCmt ~uri with
            | None -> "[]"
@@ -30,7 +30,7 @@ let dump files =
          print_endline result)
 
 let completion ~path ~line ~col ~currentFile =
-  let uri = Uri2.fromLocalPath path in
+  let uri = Uri2.fromPath path in
   let result =
     match ProcessCmt.getFullFromCmt ~uri with
     | None -> "[]"
@@ -43,7 +43,7 @@ let completion ~path ~line ~col ~currentFile =
   print_endline result
 
 let hover ~path ~line ~col =
-  let uri = Uri2.fromLocalPath path in
+  let uri = Uri2.fromPath path in
   let result =
     match ProcessCmt.getFullFromCmt ~uri with
     | None -> Protocol.null
@@ -79,7 +79,7 @@ let hover ~path ~line ~col =
   print_endline result
 
 let definition ~path ~line ~col =
-  let uri = Uri2.fromLocalPath path in
+  let uri = Uri2.fromPath path in
   let result =
     match ProcessCmt.getFullFromCmt ~uri with
     | None -> Protocol.null
@@ -114,7 +114,7 @@ let definition ~path ~line ~col =
   print_endline result
 
 let references ~path ~line ~col =
-  let uri = Uri2.fromLocalPath path in
+  let uri = Uri2.fromPath path in
   let result =
     match ProcessCmt.getFullFromCmt ~uri with
     | None -> Protocol.null
@@ -143,7 +143,7 @@ let references ~path ~line ~col =
   print_endline result
 
 let documentSymbol ~path =
-  let uri = Uri2.fromLocalPath path in
+  let uri = Uri2.fromPath path in
   match ProcessCmt.getFullFromCmt ~uri with
   | None -> print_endline Protocol.null
   | Some {file} ->

analysis/src/Files.ml

@@ -106,8 +106,3 @@ let fileConcat a b =
     && b.[1] = Filename.dir_sep.[0]
   then Filename.concat a (String.sub b 2 (String.length b - 2))
   else Filename.concat a b
-
-let isFullPath b =
-  b.[0] = '/' || (Sys.win32 && String.length b > 1 && b.[1] = ':')
-
-let maybeConcat a b = if b <> "" && isFullPath b then b else fileConcat a b

analysis/src/Uri2.ml

@@ -1,8 +1,6 @@
 module Uri : sig
   type t
 
-  val fromLocalPath : string -> t
-
   val fromPath : string -> t
 
   val isInterface : t -> bool
@@ -28,10 +26,6 @@ end = struct
 
   let fromPath path = {path; uri = pathToUri path}
 
-  let fromLocalPath localPath =
-    let path = Files.maybeConcat (Unix.getcwd ()) localPath in
-    fromPath path
-
   let isInterface {path} = Filename.check_suffix path "i"
 
   let toPath {path} = path