make workspaceFolders not an option

ocaml-lang · May 31, 2020 · f6498c7 · f6498c7
1 parent 7903f6e
commit f6498c7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/Toolchain.ml b/src/Toolchain.ml
@@ -249,9 +249,7 @@ let makeResources kind = kind
 
 let selectAndSave () =
   let open Promise.O in
-  let workspaceFolders =
-    Vscode.Workspace.workspaceFolders |. Belt.Option.getWithDefault [||]
-  in
+  let workspaceFolders = Vscode.Workspace.workspaceFolders () in
   sandboxCandidates ~workspaceFolders >>= fun candidates ->
   selectPackageManager candidates >>| function
   | None -> None

diff --git a/src/bindings/Vscode.ml b/src/bindings/Vscode.ml
@@ -104,9 +104,11 @@ module Workspace = struct
   external name : string option = "name"
     [@@bs.module "vscode"] [@@bs.scope "workspace"]
 
-  external workspaceFolders : Folder.t array option = "workspaceFolders"
+  external _workspaceFolders : Folder.t array option = "workspaceFolders"
     [@@bs.module "vscode"] [@@bs.scope "workspace"]
 
+  let workspaceFolders () = _workspaceFolders |. Belt.Option.getWithDefault [||]
+
   external onDidOpenTextDocument : (TextDocument.event -> unit) -> unit
     = "onDidOpenTextDocument"
     [@@bs.module "vscode"] [@@bs.scope "workspace"]

diff --git a/src/bindings/Vscode.mli b/src/bindings/Vscode.mli
@@ -213,7 +213,7 @@ module Workspace : sig
 
   val name : string option
 
-  val workspaceFolders : Folder.t array option
+  val workspaceFolders : unit -> Folder.t array
 
   val onDidOpenTextDocument : (TextDocument.event -> unit) -> unit