Refactor: clean up error handling for commands.

Author: cristianoc

analysis/src/Commands.ml

@@ -26,21 +26,18 @@ let dump files =
          let uri = Uri2.fromLocalPath path in
          let result =
            match ProcessCmt.getFullFromCmt ~uri with
-           | Error message ->
-             prerr_endline message;
-             "[]"
-           | Ok (package, {file; extra}) -> dumpLocations ~package ~file ~extra
+           | None -> "[]"
+           | Some (package, {file; extra}) ->
+             dumpLocations ~package ~file ~extra
          in
          print_endline result)
 
 let completion ~path ~line ~col ~currentFile =
   let uri = Uri2.fromLocalPath path in
   let result =
     match ProcessCmt.getFullFromCmt ~uri with
-    | Error message ->
-      prerr_endline message;
-      "[]"
-    | Ok (package, full) ->
+    | None -> "[]"
+    | Some (package, full) ->
       let maybeText = Files.readFile currentFile in
       NewCompletions.computeCompletions ~full ~maybeText ~package
         ~pos:(line, col)
@@ -53,10 +50,8 @@ let hover ~path ~line ~col =
   let uri = Uri2.fromLocalPath path in
   let result =
     match ProcessCmt.getFullFromCmt ~uri with
-    | Error message ->
-      prerr_endline message;
-      Protocol.null
-    | Ok (package, {file; extra}) -> (
+    | None -> Protocol.null
+    | Some (package, {file; extra}) -> (
       let pos = Utils.protocolLineColToCmtLoc ~line ~col in
       match References.locItemForPos ~extra pos with
       | None -> Protocol.null
@@ -93,10 +88,8 @@ let definition ~path ~line ~col =
   let uri = Uri2.fromLocalPath path in
   let result =
     match ProcessCmt.getFullFromCmt ~uri with
-    | Error message ->
-      prerr_endline message;
-      Protocol.null
-    | Ok (package, {file; extra}) -> (
+    | None -> Protocol.null
+    | Some (package, {file; extra}) -> (
       let pos = Utils.protocolLineColToCmtLoc ~line ~col in
 
       match References.locItemForPos ~extra pos with
@@ -132,10 +125,8 @@ let references ~path ~line ~col =
   let uri = Uri2.fromLocalPath path in
   let result =
     match ProcessCmt.getFullFromCmt ~uri with
-    | Error message ->
-      prerr_endline message;
-      Protocol.null
-    | Ok (package, {file; extra}) -> (
+    | None -> Protocol.null
+    | Some (package, {file; extra}) -> (
       let pos = Utils.protocolLineColToCmtLoc ~line ~col in
       match References.locItemForPos ~extra pos with
       | None -> Protocol.null
@@ -164,10 +155,8 @@ let references ~path ~line ~col =
 let documentSymbol ~path =
   let uri = Uri2.fromLocalPath path in
   match ProcessCmt.fileForUri uri with
-  | Error message ->
-    prerr_endline message;
-    print_endline Protocol.null
-  | Ok (file, _extra) ->
+  | None -> print_endline Protocol.null
+  | Some {file} ->
     let open SharedTypes in
     let rec getItems {topLevel} =
       let rec getItem = function

analysis/src/ProcessCmt.ml

@@ -1156,7 +1156,9 @@ let newDocsForCmt ~moduleName cmtCache changed cmt src =
 let getFullFromCmt ~uri =
   let path = Uri2.toPath uri in
   match Packages.getPackage uri with
-  | Error e -> Error e
+  | Error message ->
+    prerr_endline message;
+    None
   | Ok package -> (
     let moduleName =
       BuildSystem.namespacedName package.namespace (FindFiles.getName path)
@@ -1165,27 +1167,28 @@ let getFullFromCmt ~uri =
     | Some paths -> (
       let cmt = SharedTypes.getCmt ~interface:(Utils.endsWith path "i") paths in
       match fullForCmt ~moduleName ~uri cmt with
-      | Error e -> Error e
+      | Error message ->
+        prerr_endline message;
+        None
       | Ok full ->
         Hashtbl.replace package.interModuleDependencies moduleName
           (SharedTypes.hashList full.extra.externalReferences |> List.map fst);
-        Ok (package, full))
-    | None -> Error ("can't find module " ^ moduleName))
+        Some (package, full))
+    | None ->
+      prerr_endline ("can't find module " ^ moduleName);
+      None)
 
 let fileForUri uri =
   match getFullFromCmt ~uri with
-  | Error e -> Error e
-  | Ok (_package, {extra; file}) -> Ok (file, extra)
+  | None -> None
+  | Some (_package, full) -> Some full
 
 let extraForModule ~package modname =
   if Hashtbl.mem package.TopTypes.pathsForModule modname then
     let paths = Hashtbl.find package.pathsForModule modname in
     match SharedTypes.getSrc paths with
     | None -> None
-    | Some src -> (
-      match getFullFromCmt ~uri:(Uri2.fromPath src) with
-      | Ok (_package, {extra}) -> Some extra
-      | Error _ -> None)
+    | Some src -> getFullFromCmt ~uri:(Uri2.fromPath src)
   else None
 
 let docsForCmt ~moduleName cmt src state =

analysis/src/References.ml

@@ -170,10 +170,8 @@ let alternateDeclared ~file ~package declared tip =
       let implUri = Uri2.fromPath impl in
       if intfUri = file.uri then
         match ProcessCmt.fileForUri implUri with
-        | Error e ->
-          Log.log e;
-          None
-        | Ok (file, extra) -> (
+        | None -> None
+        | Some {file; extra} -> (
           match
             declaredForExportedTip ~stamps:file.stamps
               ~exported:file.contents.exported declared.name.txt tip
@@ -182,10 +180,8 @@ let alternateDeclared ~file ~package declared tip =
           | Some declared -> Some (file, extra, declared))
       else
         match ProcessCmt.fileForUri intfUri with
-        | Error e ->
-          Log.log e;
-          None
-        | Ok (file, extra) -> (
+        | None -> None
+        | Some {file; extra} -> (
           match
             declaredForExportedTip ~stamps:file.stamps
               ~exported:file.contents.exported declared.name.txt tip
@@ -418,7 +414,7 @@ let forLocalStamp ~package ~file ~extra stamp tip =
                        | Some file -> (
                          match ProcessCmt.extraForModule ~package name with
                          | None -> None
-                         | Some extra -> (
+                         | Some (_, {extra}) -> (
                            match
                              Hashtbl.find_opt extra.externalReferences
                                thisModuleName
@@ -464,8 +460,8 @@ let allReferencesForLocItem ~package ~file ~extra locItem =
         | None -> []
         | Some stamp -> (
           match ProcessCmt.fileForUri env.qFile.uri with
-          | Error _ -> []
-          | Ok (file, extra) ->
+          | None -> []
+          | Some {file; extra} ->
             maybeLog
               ("Finding references for (global) "
               ^ Uri2.toString env.qFile.uri