Refactor: remove a bunch of Ok/Error.

Author: cristianoc

analysis/src/BuildSystem.ml

@@ -13,15 +13,15 @@ let getBsPlatformDir rootPath =
     else result
   in
   match result with
-  | Some path -> Ok path
+  | Some path -> Some path
   | None ->
     let message = "bs-platform could not be found" in
     Log.log message;
-    Error message
+    None
 
 let getLibBs root = Files.ifExists (root /+ "lib" /+ "bs")
 
 let getStdlib base =
   match getBsPlatformDir base with
-  | Error e -> Error e
-  | Ok bsPlatformDir -> Ok (bsPlatformDir /+ "lib" /+ "ocaml")
+  | None -> None
+  | Some bsPlatformDir -> Some (bsPlatformDir /+ "lib" /+ "ocaml")

analysis/src/Cmt.ml

@@ -3,10 +3,8 @@ open SharedTypes
 let fromUri ~uri =
   let path = Uri2.toPath uri in
   match Packages.getPackage ~uri with
-  | Error message ->
-    prerr_endline message;
-    None
-  | Ok package -> (
+  | None -> None
+  | Some package -> (
     let moduleName =
       BuildSystem.namespacedName package.namespace (FindFiles.getName path)
     in

analysis/src/FindFiles.ml

@@ -237,11 +237,11 @@ let findDependencyFiles base config =
              ([], []))
   in
   match BuildSystem.getStdlib base with
-  | Error e -> Error e
-  | Ok stdlibDirectory ->
+  | None -> None
+  | Some stdlibDirectory ->
     let compiledDirectories, projectFiles =
       let files, directories = List.split depFiles in
       (List.concat files, List.concat directories)
     in
     let allFiles = projectFiles @ collectFiles stdlibDirectory in
-    Ok (compiledDirectories, allFiles)
+    Some (compiledDirectories, allFiles)

analysis/src/Packages.ml

@@ -11,25 +11,24 @@ let makePathsForModule ~projectFilesAndPaths ~dependenciesFilesAndPaths =
          Hashtbl.replace pathsForModule modName paths);
   pathsForModule
 
-let newBsPackage rootPath =
-  let path = Filename.concat rootPath "bsconfig.json" in
-  match Files.readFile path with
-  | None -> Error ("Unable to read " ^ path)
+let newBsPackage ~rootPath =
+  let bsconfig = Filename.concat rootPath "bsconfig.json" in
+  match Files.readFile bsconfig with
+  | None ->
+    Log.log ("Unable to read " ^ bsconfig);
+    None
   | Some raw -> (
     let config = Json.parse raw in
     Log.log {|📣 📣 NEW BSB PACKAGE 📣 📣|};
     Log.log ("- location: " ^ rootPath);
     let libBs = BuildSystem.getLibBs rootPath in
     match FindFiles.findDependencyFiles rootPath config with
-    | Error e -> Error e
-    | Ok (dependencyDirectories, dependenciesFilesAndPaths) -> (
+    | None -> None
+    | Some (dependencyDirectories, dependenciesFilesAndPaths) -> (
       match libBs with
-      | None ->
-        Error
-          "Please run the build first so that the editor can analyze the \
-           project's artifacts."
+      | None -> None
       | Some libBs ->
-        Ok
+        Some
           (let namespace = FindFiles.getNamespace config in
            let sourceDirectories =
              FindFiles.getSourceDirectories ~includeDev:true ~baseDir:rootPath
@@ -111,17 +110,20 @@ let findRoot ~uri packagesByRoot =
 let getPackage ~uri =
   let open SharedTypes in
   if Hashtbl.mem state.rootForUri uri then
-    Ok (Hashtbl.find state.packagesByRoot (Hashtbl.find state.rootForUri uri))
+    Some (Hashtbl.find state.packagesByRoot (Hashtbl.find state.rootForUri uri))
   else
     match findRoot ~uri state.packagesByRoot with
-    | None -> Error "No root directory found"
+    | None ->
+      Log.log "No root directory found";
+      None
     | Some (`Root rootPath) ->
       Hashtbl.replace state.rootForUri uri rootPath;
-      Ok (Hashtbl.find state.packagesByRoot (Hashtbl.find state.rootForUri uri))
+      Some
+        (Hashtbl.find state.packagesByRoot (Hashtbl.find state.rootForUri uri))
     | Some (`Bs rootPath) -> (
-      match newBsPackage rootPath with
-      | Error e -> Error e
-      | Ok package ->
+      match newBsPackage ~rootPath with
+      | None -> None
+      | Some package ->
         Hashtbl.replace state.rootForUri uri package.rootPath;
         Hashtbl.replace state.packagesByRoot package.rootPath package;
-        Ok package)
+        Some package)