Define getUri on paths, and make the returned value not optional.

Author: cristianoc

analysis/src/ProcessCmt.ml

@@ -1256,9 +1256,8 @@ let getFullFromCmt ~uri =
 let extraForModule ~package modname =
   if Hashtbl.mem package.pathsForModule modname then
     let paths = Hashtbl.find package.pathsForModule modname in
-    match SharedTypes.getSrc paths with
-    | None -> None
-    | Some src -> getFullFromCmt ~uri:(Uri2.fromPath src)
+    let uri = SharedTypes.getUri paths in
+    getFullFromCmt ~uri
   else None
 
 let fileForCmt ~moduleName ~cmt ~uri state =
@@ -1287,11 +1286,7 @@ let fileForModule modname ~package =
     let paths = Hashtbl.find package.pathsForModule modname in
     (* TODO: do better *)
     let cmt = SharedTypes.getCmt ~interface:false paths in
-    let uri =
-      match SharedTypes.getSrc paths with
-      | Some sourcePath -> Uri2.fromPath sourcePath
-      | None -> Uri2.fromPath cmt
-    in
+    let uri = SharedTypes.getUri paths in
     Log.log ("FINDING docs for module " ^ SharedTypes.showPaths paths);
     Log.log ("FINDING " ^ cmt ^ " uri " ^ Uri2.toString uri);
     match fileForCmt ~moduleName:modname ~cmt ~uri state with

analysis/src/References.ml

@@ -305,13 +305,6 @@ let definition ~file ~package stamp tip =
       maybeLog ("Inner uri " ^ Uri2.toString uri);
       Some (uri, loc))
 
-let orLog message v =
-  match v with
-  | None ->
-    maybeLog message;
-    None
-  | _ -> v
-
 let definitionForLocItem ~full:{file; package} locItem =
   match locItem.locType with
   | Typed (_, _, Definition (stamp, tip)) -> (
@@ -335,13 +328,11 @@ let definitionForLocItem ~full:{file; package} locItem =
     None
   | TopLevelModule name -> (
     maybeLog ("Toplevel " ^ name);
-    let open Infix in
-    match
-      Hashtbl.find_opt package.pathsForModule name
-      |> orLog "No paths found" |?> getSrc |> orLog "No src found"
-    with
+    match Hashtbl.find_opt package.pathsForModule name with
     | None -> None
-    | Some src -> Some (Uri2.fromPath src, Utils.topLoc src))
+    | Some paths ->
+      let uri = getUri paths in
+      Some (uri, Utils.topLoc (Uri2.toPath uri)))
   | LModule (LocalReference (stamp, tip))
   | Typed (_, _, LocalReference (stamp, tip)) ->
     maybeLog ("Local defn " ^ tipToString tip);

analysis/src/SharedTypes.ml

@@ -130,11 +130,11 @@ let showPaths paths =
   | IntfAndImpl {cmti; resi; cmt; res} ->
     Printf.sprintf "IntfAndImpl(%s, %s, %s, %s)" cmti resi cmt res
 
-let getSrc p =
+let getUri p =
   match p with
-  | Impl {res} -> Some res
-  | Namespace _ -> None
-  | IntfAndImpl {resi} -> Some resi
+  | Impl {res} -> Uri2.fromPath res
+  | Namespace {cmt} -> Uri2.fromPath cmt
+  | IntfAndImpl {resi} -> Uri2.fromPath resi
 
 let getCmt ~interface p =
   match p with