From dd04b4105e84620685c37efb6ca935d282e11465 Mon Sep 17 00:00:00 2001
From: William Boman <william@redwill.se>
Date: Tue, 20 Dec 2022 14:58:19 +0100
Subject: fix(spawn): always expand cmd if PATH is not modified (#773)

fix(spawn): always expand cmd on Windows

Closes #720.
---
 lua/mason-core/spawn.lua | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

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

diff --git a/lua/mason-core/spawn.lua b/lua/mason-core/spawn.lua
index 814ef8f7..bfc6ea29 100644
--- a/lua/mason-core/spawn.lua
+++ b/lua/mason-core/spawn.lua
@@ -8,15 +8,6 @@ local log = require "mason-core.log"
 ---@alias JobSpawn table<string, async fun(opts: SpawnArgs): Result>
 ---@type JobSpawn
 local spawn = {
-    _aliases = {
-        npm = platform.is.win and "npm.cmd" or "npm",
-        gem = platform.is.win and "gem.cmd" or "gem",
-        composer = platform.is.win and "composer.bat" or "composer",
-        gradlew = platform.is.win and "gradlew.bat" or "gradlew",
-        -- for hererocks installations
-        luarocks = (platform.is.win and vim.fn.executable "luarocks.bat" == 1) and "luarocks.bat" or "luarocks",
-        rebar3 = platform.is.win and "rebar3.cmd" or "rebar3",
-    },
     _flatten_cmd_args = _.compose(_.filter(_.complement(_.equals(vim.NIL))), _.flatten),
 }
 
@@ -33,11 +24,16 @@ local function Failure(err, cmd)
     }))
 end
 
-local is_executable = _.memoize(function(cmd)
+local exepath = _.memoize(function(cmd)
     if vim.in_fast_event() then
         a.scheduler()
     end
-    return vim.fn.executable(cmd) == 1
+    local exepath = vim.fn.exepath(cmd)
+    if exepath == "" then
+        return nil
+    else
+        return exepath
+    end
 end, _.identity)
 
 ---@class SpawnArgs
@@ -47,11 +43,10 @@ end, _.identity)
 ---@field stdio_sink StdioSink? If provided, will be used to write to stdout and stderr.
 ---@field cwd string?
 ---@field on_spawn (fun(handle: luv_handle, stdio: luv_pipe[], pid: integer))? Will be called when the process successfully spawns.
----@field check_executable boolean? Whether to check if the provided command is executable (defaults to true).
 
 setmetatable(spawn, {
-    ---@param normalized_cmd string
-    __index = function(self, normalized_cmd)
+    ---@param cmd string
+    __index = function(self, cmd)
         ---@param args SpawnArgs
         return function(args)
             local cmd_args = self._flatten_cmd_args(args)
@@ -76,13 +71,16 @@ setmetatable(spawn, {
                 spawn_args.stdio_sink = stdio.sink
             end
 
-            local cmd = self._aliases[normalized_cmd] or normalized_cmd
-
-            if (env and env.PATH) == nil and args.check_executable ~= false and not is_executable(cmd) then
-                log.fmt_debug("%s is not executable", cmd)
-                return Failure({
-                    stderr = ("%s is not executable"):format(cmd),
-                }, cmd)
+            -- Ensure that the cmd is executable (only if PATH is not modified).
+            if (env and env.PATH) == nil then
+                local expanded_cmd = exepath(cmd)
+                if expanded_cmd == nil then
+                    log.fmt_debug("%s is not executable", cmd)
+                    return Failure({
+                        stderr = ("%s is not executable"):format(cmd),
+                    }, cmd)
+                end
+                cmd = expanded_cmd
             end
 
             local _, exit_code, signal = a.wait(function(resolve)
-- 
cgit v1.2.3-70-g09d2