refactor topLoc

Author: cristianoc

analysis/src/Commands.ml

@@ -130,7 +130,7 @@ let references ~path ~line ~col =
                  let loc =
                    match locOpt with
                    | Some loc -> loc
-                   | None -> Utils.topLoc (Uri2.toPath uri2)
+                   | None -> Uri2.toTopLevelLoc uri2
                  in
                  Protocol.stringifyLocation
                    {uri = Uri2.toString uri2; range = Utils.cmtLocToRange loc}

analysis/src/References.ml

@@ -279,7 +279,7 @@ let resolveModuleDefinition ~(file : File.t) ~package stamp =
     | Some (file, declared) ->
       let loc =
         match declared with
-        | None -> Utils.topLoc (Uri2.toPath file.uri)
+        | None -> Uri2.toTopLevelLoc file.uri
         | Some declared -> validateLoc declared.name.loc declared.extentLoc
       in
       Some (file.uri, loc))
@@ -332,7 +332,7 @@ let definitionForLocItem ~full:{file; package} locItem =
     | None -> None
     | Some paths ->
       let uri = getUri paths in
-      Some (uri, Utils.topLoc (Uri2.toPath uri)))
+      Some (uri, Uri2.toTopLevelLoc uri))
   | LModule (LocalReference (stamp, tip))
   | Typed (_, _, LocalReference (stamp, tip)) ->
     maybeLog ("Local defn " ^ tipToString tip);

analysis/src/Uri2.ml

@@ -10,6 +10,8 @@ module Uri : sig
   val toPath : t -> string
 
   val toString : t -> string
+
+  val toTopLevelLoc : t -> Location.t
 end = struct
   type t = {path : string; uri : string}
 
@@ -30,6 +32,12 @@ end = struct
 
   let toPath {path} = path
 
+  let toTopLevelLoc {path} =
+    let topPos =
+      {Lexing.pos_fname = path; pos_lnum = 1; pos_bol = 0; pos_cnum = 0}
+    in
+    {Location.loc_start = topPos; Location.loc_end = topPos; loc_ghost = false}
+
   let toString {uri} = if !stripPath then Filename.basename uri else uri
 end
 

analysis/src/Utils.ml

@@ -1,12 +1,3 @@
-let topLoc fname =
-  {
-    Location.loc_start =
-      {Lexing.pos_fname = fname; pos_lnum = 1; pos_bol = 0; pos_cnum = 0};
-    Location.loc_end =
-      {Lexing.pos_fname = fname; pos_lnum = 1; pos_bol = 0; pos_cnum = 0};
-    loc_ghost = false;
-  }
-
 (**
  * `startsWith(string, prefix)`
  * true if the string starts with the prefix