From bce96d2fd483e71826728c6f9ac721fc9dd7d2cf Mon Sep 17 00:00:00 2001
From: William Boman <william@redwill.se>
Date: Sun, 21 Jan 2024 18:47:59 +0100
Subject: feat: don't use vim.g.python3_host_prog as a candidate for python
 (#1606)

This is inconsistent with how other system dependencies are resolved and is not
documented anywhere.
---
 lua/mason-core/installer/managers/pypi.lua |  8 +-------
 lua/mason-core/managers/pip3/init.lua      |  4 +---
 lua/mason/health.lua                       | 18 ------------------
 3 files changed, 2 insertions(+), 28 deletions(-)

(limited to 'lua')

diff --git a/lua/mason-core/installer/managers/pypi.lua b/lua/mason-core/installer/managers/pypi.lua
index 0f3de1fb..7c0e5bb9 100644
--- a/lua/mason-core/installer/managers/pypi.lua
+++ b/lua/mason-core/installer/managers/pypi.lua
@@ -72,13 +72,7 @@ function M.init(opts)
 
         a.scheduler()
 
-        local executables = platform.is.win
-                and _.list_not_nil(
-                    vim.g.python3_host_prog and vim.fn.expand(vim.g.python3_host_prog),
-                    "python",
-                    "python3"
-                )
-            or _.list_not_nil(vim.g.python3_host_prog and vim.fn.expand(vim.g.python3_host_prog), "python3", "python")
+        local executables = platform.is.win and { "python", "python3" } or { "python3", "python" }
 
         -- pip3 will hardcode the full path to venv executables, so we need to promote cwd to make sure pip uses the final destination path.
         ctx:promote_cwd()
diff --git a/lua/mason-core/managers/pip3/init.lua b/lua/mason-core/managers/pip3/init.lua
index 36ad6fc7..813bc9ea 100644
--- a/lua/mason-core/managers/pip3/init.lua
+++ b/lua/mason-core/managers/pip3/init.lua
@@ -48,9 +48,7 @@ function M.install(packages)
 
     a.scheduler()
 
-    local executables = platform.is.win
-            and _.list_not_nil(vim.g.python3_host_prog and vim.fn.expand(vim.g.python3_host_prog), "python", "python3")
-        or _.list_not_nil(vim.g.python3_host_prog and vim.fn.expand(vim.g.python3_host_prog), "python3", "python")
+    local executables = platform.is.win and { "python", "python3" } or { "python3", "python" }
 
     -- pip3 will hardcode the full path to venv executables, so we need to promote cwd to make sure pip uses the final destination path.
     ctx:promote_cwd()
diff --git a/lua/mason/health.lua b/lua/mason/health.lua
index 190a6972..1f8a225f 100644
--- a/lua/mason/health.lua
+++ b/lua/mason/health.lua
@@ -280,24 +280,6 @@ local function check_languages()
                 }
             end
         end,
-        function()
-            a.scheduler()
-            if vim.g.python3_host_prog then
-                check {
-                    cmd = vim.fn.expand(vim.g.python3_host_prog),
-                    args = { "--version" },
-                    name = "python3_host_prog",
-                    relaxed = true,
-                }
-                a.scheduler()
-                check {
-                    cmd = vim.fn.expand(vim.g.python3_host_prog),
-                    args = { "-m", "pip", "--version" },
-                    name = "python3_host_prog pip",
-                    relaxed = true,
-                }
-            end
-        end,
     }
 end
 
-- 
cgit v1.2.3-70-g09d2