Merge branch 'master' into welcome_screen

Author: PizieDust

.github/workflows/main.yml

@@ -45,7 +45,7 @@ jobs:
 
       - name: Generate artifact attestation
         if: github.event_name == 'release'
-        uses: actions/attest-build-provenance@v2
+        uses: actions/attest-build-provenance@v3
         with:
           subject-path: ocaml-platform.vsix
 

CHANGELOG.md

@@ -3,6 +3,28 @@
 ## Unreleased
 
 - Add OCaml onboarding welcome screen. (#1737)
+- Fix Windows path handling regression introduced in 1.32.1 by using
+  `Uri.fsPath` instead of `Uri.path` in workspace root detection, preventing
+  LSP start failures (`ENOENT -4058`). (#1929)
+
+## 1.32.1
+
+- Fix DPM error when invoking `ocamlc --version` without a working directory by
+  providing an explicit cwd. (#1925)
+- Prefer POSIX-style flags for OCaml compiler (e.g. use `-version` instead of
+  `--version`) to maintain compatibility with older OCaml compilers (< 4.02).
+  (#1925)
+- Unify cwd detection for `Cmd.output` calls by using
+  `Sandbox.workspace_root ()` where commands depend on the workspace context.
+  This removes ad-hoc `Workspace.workspaceFolders()` handling and improves
+  consistency. (#1925)
+- Add explicit cwd for tool presence checks executed via the sandbox (e.g.
+  `utop --version`, `ocamlearlybird --help`, `odig --version`,
+  `ocamlobjinfo <file>`). This ensures commands resolve correctly under Dune
+  Package Management. (#1925)
+- Replace Markdown backticks in notifications and message popups with double
+  quotes, since VS Code does not render Markdown in
+  `showInformationMessage`/`showWarningMessage`/`showErrorMessage`. (#1926)
 
 ## 1.32.0
 

dune-project

@@ -1,4 +1,4 @@
-(lang dune 3.19)
+(lang dune 3.20)
 
 (name vscode-ocaml-platform)
 

flake.lock

@@ -1,7 +1,7 @@
 {
   "name": "ocaml-platform",
   "displayName": "OCaml Platform",
-  "version": "1.32.0",
+  "version": "1.32.1",
   "private": true,
   "description": "Official OCaml language extension for VSCode",
   "categories": [
@@ -1471,7 +1471,7 @@
     "ovsx": "0.10.5",
     "typescript": "5.9.2"
   },
-  "packageManager": "[email protected].2",
+  "packageManager": "[email protected].4",
   "engines": {
     "vscode": "^1.86.0"
   },

package.json

@@ -24,7 +24,8 @@ end = struct
       let sandbox = Extension_instance.sandbox instance in
       Sandbox.get_command sandbox "ocamlobjinfo" [ file_path ] `Exec
     in
-    Cmd.output command
+    let cwd = Sandbox.workspace_root () in
+    Cmd.output ?cwd command
   ;;
 
   let create ~(uri : Uri.t) =

src/cm_editor.ml

@@ -38,7 +38,8 @@ let check_earlybird_available (sandbox : Sandbox.t) =
     (* earlybird <= 1.1.0 doesn't have --version *)
     Sandbox.get_command sandbox "ocamlearlybird" [ "--help" ] `Tool
   in
-  Cmd.output earlybird_help
+  let cwd = Sandbox.workspace_root () in
+  Cmd.output ?cwd earlybird_help
   |> Promise.Result.fold
        ~ok:(fun (_ : string) -> ())
        ~error:(fun (_ : string) ->

src/earlybird.ml

@@ -108,7 +108,7 @@ let _install_dune_lsp_server =
             let options =
               ProgressOptions.create
                 ~location:(`ProgressLocation Notification)
-                ~title:"Installing ocaml-lsp server using `dune tools install ocamllsp`"
+                ~title:"Installing ocaml-lsp server using \"dune tools install ocamllsp\""
                 ~cancellable:false
                 ()
             in
@@ -152,7 +152,7 @@ let _run_dune_pkg_lock =
         let options =
           ProgressOptions.create
             ~location:(`ProgressLocation Notification)
-            ~title:"Running `dune pkg lock`"
+            ~title:"Running \"dune pkg lock\""
             ~cancellable:false
             ()
         in
@@ -554,7 +554,7 @@ end = struct
     | Error (`Msg msg) ->
       show_message
         `Warn
-        "The installed version of `ocamllsp` does not support typed holes. %s"
+        "The installed version of \"ocamllsp\" does not support typed holes. %s"
         msg
   ;;
 
@@ -780,7 +780,7 @@ module Copy_type_under_cursor = struct
     | Error (`Msg msg) ->
       show_message
         `Warn
-        "The installed version of `ocamllsp` does not support type enclosings. %s"
+        "The installed version of \"ocamllsp\" does not support type enclosings. %s"
         msg
   ;;
 
@@ -1322,7 +1322,7 @@ module Search_by_type = struct
            let _ =
              Ocaml_lsp.suggest_to_upgrade_ocaml_lsp_server
                ~message:
-                 "The installed version of `ocamllsp` does not support type search."
+                 "The installed version of \"ocamllsp\" does not support type search."
                ()
            in
            ()

src/extension_commands.ml

@@ -144,21 +144,17 @@ let check_ocaml_lsp_available (sandbox : Sandbox.t) =
     let+ dune_lsp_present = Dune.is_ocamllsp_present dune in
     if dune_lsp_present
     then Ok ()
-    else Error "`ocaml-lsp-server` is not installed in the current dune sandbox."
+    else Error "\"ocaml-lsp-server\" is not installed in the current dune sandbox."
   | _ ->
     let ocaml_lsp_version sandbox =
       Sandbox.get_command sandbox "ocamllsp" [ "--version" ] `Tool
     in
-    let cwd =
-      match Workspace.workspaceFolders () with
-      | [ cwd ] -> Some (cwd |> WorkspaceFolder.uri |> Uri.fsPath |> Path.of_string)
-      | _ -> None
-    in
+    let cwd = Sandbox.workspace_root () in
     Cmd.output ?cwd (ocaml_lsp_version sandbox)
     |> Promise.Result.fold
          ~ok:(fun (_ : string) -> ())
          ~error:(fun (_ : string) ->
-           "Sandbox initialization failed: `ocaml-lsp-server` is not installed in the \
+           "Sandbox initialization failed: \"ocaml-lsp-server\" is not installed in the \
             current sandbox.")
 ;;
 
@@ -216,8 +212,8 @@ end = struct
       let* selection =
         Window.showInformationMessage
           ~message:
-            "Failed to start the language server. `ocaml-lsp-server` is not installed in \
-             the current sandbox."
+            "Failed to start the language server. \"ocaml-lsp-server\" is not installed \
+             in the current sandbox."
           ~choices:
             [ install_lsp_text, `Install_lsp; select_different_sandbox, `Select_sandbox ]
           ()
@@ -282,7 +278,7 @@ end = struct
        | Error s ->
          show_message
            `Error
-           "An error occurred starting the language server `ocamllsp`. %s"
+           "An error occurred starting the language server \"ocamllsp\". %s"
            s)
     | Error _ -> suggest_or_install_ocaml_lsp_server t
   ;;
@@ -427,7 +423,10 @@ let close_repl t = t.repl <- None
 let update_ocaml_info t =
   let open Promise.Syntax in
   let+ ocaml_version =
-    let+ r = Sandbox.get_command t.sandbox "ocamlc" [ "--version" ] `Exec |> Cmd.output in
+    let cwd = Sandbox.workspace_root () in
+    let+ r =
+      Sandbox.get_command t.sandbox "ocamlc" [ "-version" ] `Exec |> Cmd.output ?cwd
+    in
     match r with
     | Ok v ->
       Ocaml_version.of_string v
@@ -436,7 +435,7 @@ let update_ocaml_info t =
       log_chan
         ~section:"Ocaml.version_semver"
         `Warn
-        "Error running `ocamlc --version`: %s"
+        "Error running \"ocamlc -version\": %s"
         e;
       Error `Ocamlc_missing
   in
@@ -450,7 +449,7 @@ let update_ocaml_info t =
      | `Unable_to_parse_version (`Version v, `Msg msg) ->
        show_message
          `Error
-         "OCaml bytecode compiler `ocamlc` version could not be parsed. Version: %s. \
+         "OCaml bytecode compiler \"ocamlc\" version could not be parsed. Version: %s. \
           Error %s"
          v
          msg
@@ -459,7 +458,7 @@ let update_ocaml_info t =
          let+ maybe_choice =
            Window.showWarningMessage
              ~message:
-               "OCaml bytecode compiler `ocamlc` was not found in the current sandbox. \
+               "OCaml bytecode compiler \"ocamlc\" was not found in the current sandbox. \
                 Do you have OCaml installed in the current sandbox?"
              ~choices:
                [ ( "Pick another sandbox"

src/extension_instance.ml

@@ -12,10 +12,11 @@ let of_sandbox (sandbox : Sandbox.t) =
   let make_odig_cmd = make_odig_cmd sandbox in
   let odig_version = make_odig_cmd [ "--version" ] in
   let open Promise.Syntax in
-  let* output = Cmd.output odig_version in
+  let cwd = Sandbox.workspace_root () in
+  let* output = Cmd.output ?cwd odig_version in
   match output with
   | Ok _ ->
-    let+ cache_dir = Cmd.output (make_odig_cmd [ "cache"; "path" ]) in
+    let+ cache_dir = Cmd.output ?cwd (make_odig_cmd [ "cache"; "path" ]) in
     (match cache_dir with
      | Ok cache_dir ->
        let cache_dir = cache_dir |> String.strip |> Path.of_string in
@@ -28,7 +29,11 @@ let of_sandbox (sandbox : Sandbox.t) =
           generate documentation.")
 ;;
 
-let cmd_output ~sandbox ~args = Cmd.output (make_odig_cmd sandbox args)
+let cmd_output ~sandbox ~args =
+  let cwd = Sandbox.workspace_root () in
+  Cmd.output ?cwd (make_odig_cmd sandbox args)
+;;
+
 let html_dir t = Path.(t.cache_dir / "/html/")
 
 let odoc_exec t ~sandbox ~package_name =