From edd8f7bce8f86465349b24e235718eb3ea52878d Mon Sep 17 00:00:00 2001
From: William Boman <william@redwill.se>
Date: Fri, 25 Jul 2025 09:54:47 +0200
Subject: fix(spawn): fix locating exepath on Windows systems using a Unix
 `'shell'` (#1991)

Fixes #1961.
---
 lua/mason-core/spawn.lua | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'lua/mason-core/spawn.lua')

diff --git a/lua/mason-core/spawn.lua b/lua/mason-core/spawn.lua
index 038d7853..d604dfe2 100644
--- a/lua/mason-core/spawn.lua
+++ b/lua/mason-core/spawn.lua
@@ -13,6 +13,21 @@ local spawn = {
     _flatten_cmd_args = _.compose(_.filter(is_not_nil), _.flatten),
 }
 
+---@param cmd string
+local function exepath(cmd)
+    if platform.is.win then
+        -- On Windows, exepath() assumes the system is capable of executing "Unix-like" executables if the shell is a Unix
+        -- shell. We temporarily override it to a Windows shell ("powershell") to avoid that behaviour.
+        local old_shell = vim.o.shell
+        vim.o.shell = "powershell"
+        local expanded_cmd = vim.fn.exepath(cmd)
+        vim.o.shell = old_shell
+        return expanded_cmd
+    else
+        return vim.fn.exepath(cmd)
+    end
+end
+
 local function Failure(err, cmd)
     return Result.failure(setmetatable(err, {
         __tostring = function()
@@ -67,7 +82,7 @@ setmetatable(spawn, {
             -- in PATH.
             if platform.is.win and (spawn_args.env and has_path(spawn_args.env)) == nil then
                 a.scheduler()
-                local expanded_cmd = vim.fn.exepath(canonical_cmd)
+                local expanded_cmd = exepath(canonical_cmd)
                 if expanded_cmd ~= "" then
                     cmd = expanded_cmd
                 end
-- 
cgit v1.2.3-70-g09d2