Merge branch 'main' into feat/1888/pnpm-installer

Author: Rahul Iyer

.github/workflows/cbfmt.yml

@@ -25,7 +25,7 @@ jobs:
             - name: Download Shellharden
               run: |
                   mkdir /tmp/shellharden && cd $_
-                  curl -fsSL -o shellharden.tar.gz https://github.com/alsuren/cargo-quickinstall/releases/download/shellharden-4.2.0-x86_64-unknown-linux-gnu/shellharden-4.2.0-x86_64-unknown-linux-gnu.tar.gz
+                  curl -fsSL -o shellharden.tar.gz https://github.com/anordal/shellharden/releases/download/v4.3.1/shellharden-x86_64-unknown-linux-gnu.tar.gz
                   tar -xvf shellharden.tar.gz
                   mv shellharden /usr/local/bin/
             - name: Run cbfmt check

CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## [2.1.0](https://github.com/mason-org/mason.nvim/compare/v2.0.1...v2.1.0) (2025-09-30)
+
+
+### Features
+
+* **compiler:** make `supported_platforms` a universal source field ([#2002](https://github.com/mason-org/mason.nvim/issues/2002)) ([7dc4fac](https://github.com/mason-org/mason.nvim/commit/7dc4facca9702f95353d5a1f87daf23d78e31c2a))
+
+
+### Bug Fixes
+
+* **process:** close check handles ([#1995](https://github.com/mason-org/mason.nvim/issues/1995)) ([a1fbecc](https://github.com/mason-org/mason.nvim/commit/a1fbecc0fd76300e8fe84879fb1531f35cf7b018))
+* **pypi:** add support for "compatible release" (~=) PEP440 expressions ([#2000](https://github.com/mason-org/mason.nvim/issues/2000)) ([9e25c98](https://github.com/mason-org/mason.nvim/commit/9e25c98d4826998460926f8c5c2284848d80ae89))
+* **spawn:** always expand executable path on Windows ([#2021](https://github.com/mason-org/mason.nvim/issues/2021)) ([a83eabd](https://github.com/mason-org/mason.nvim/commit/a83eabdc8c49c0c93bf5bb162fa3b57404a9d095))
+* **ui:** only set border to none if `'winborder'` doesn't exist ([#1984](https://github.com/mason-org/mason.nvim/issues/1984)) ([3671ab0](https://github.com/mason-org/mason.nvim/commit/3671ab0d40aa5bd24b1686562bd0a23391ecf76a))
+
+## [2.0.1](https://github.com/mason-org/mason.nvim/compare/v2.0.0...v2.0.1) (2025-07-25)
+
+
+### Bug Fixes
+
+* **fetch:** add busybox wget support ([#1829](https://github.com/mason-org/mason.nvim/issues/1829)) ([8024d64](https://github.com/mason-org/mason.nvim/commit/8024d64e1330b86044fed4c8494ef3dcd483a67c))
+* **pypi:** pass --no-user flag ([#1958](https://github.com/mason-org/mason.nvim/issues/1958)) ([1aceba8](https://github.com/mason-org/mason.nvim/commit/1aceba8bc158b5aaf90649077cad06744bc23ac4))
+* **registry:** ensure there's no duplicate registry entries ([#1957](https://github.com/mason-org/mason.nvim/issues/1957)) ([3501b0f](https://github.com/mason-org/mason.nvim/commit/3501b0f96d9f2f878b1947cf3614bc02d053a0c0))
+* **spawn:** fix calling vim.fn when inside fast event loop on Windows ([#1950](https://github.com/mason-org/mason.nvim/issues/1950)) ([888d6ee](https://github.com/mason-org/mason.nvim/commit/888d6ee499d8089a3a4be4309d239d6be1c1e6c0))
+* **spawn:** fix locating exepath on Windows systems using a Unix `'shell'` ([#1991](https://github.com/mason-org/mason.nvim/issues/1991)) ([edd8f7b](https://github.com/mason-org/mason.nvim/commit/edd8f7bce8f86465349b24e235718eb3ea52878d))
+
 ## [2.0.0](https://github.com/mason-org/mason.nvim/compare/v1.11.0...v2.0.0) (2025-05-06)
 
 This release has been an ongoing effort for quite some time now and is now ready for release. Most users should not

README.md

@@ -16,7 +16,7 @@
     <code>:help mason.nvim</code>
 </p>
 <p align="center">
-    <sup>Latest version: v2.0.0</sup> <!-- x-release-please-version -->
+    <sup>Latest version: v2.1.0</sup> <!-- x-release-please-version -->
 </p>
 
 ## Table of Contents

lua/mason-core/fs.lua

@@ -78,6 +78,12 @@ local function make_module(uv)
         end
     end
 
+    ---@param path string
+    function M.rmdir(path)
+        log.debug("fs: rmdir", path)
+        uv.fs_rmdir(path)
+    end
+
     ---@param path string
     ---@param new_path string
     function M.rename(path, new_path)

lua/mason-core/installer/InstallHandle.lua

@@ -173,6 +173,7 @@ function InstallHandle:terminate()
             end
         end
         check:stop()
+        check:close()
         if not self:is_closed() then
             self:close()
         end

lua/mason-core/installer/compiler/compilers/cargo.lua

@@ -1,45 +1,37 @@
 local Result = require "mason-core.result"
 local _ = require "mason-core.functional"
 local providers = require "mason-core.providers"
-local util = require "mason-core.installer.compiler.util"
 
 local M = {}
 
 ---@class CargoSource : RegistryPackageSource
----@field supported_platforms? string[]
 
 ---@param source CargoSource
 ---@param purl Purl
 function M.parse(source, purl)
-    return Result.try(function(try)
-        if source.supported_platforms then
-            try(util.ensure_valid_platform(source.supported_platforms))
-        end
-
-        local repository_url = _.path({ "qualifiers", "repository_url" }, purl)
+    local repository_url = _.path({ "qualifiers", "repository_url" }, purl)
 
-        local git
-        if repository_url then
-            git = {
-                url = repository_url,
-                rev = _.path({ "qualifiers", "rev" }, purl) == "true",
-            }
-        end
+    local git
+    if repository_url then
+        git = {
+            url = repository_url,
+            rev = _.path({ "qualifiers", "rev" }, purl) == "true",
+        }
+    end
 
-        ---@type string?
-        local features = _.path({ "qualifiers", "features" }, purl)
-        local locked = _.path({ "qualifiers", "locked" }, purl)
+    ---@type string?
+    local features = _.path({ "qualifiers", "features" }, purl)
+    local locked = _.path({ "qualifiers", "locked" }, purl)
 
-        ---@class ParsedCargoSource : ParsedPackageSource
-        local parsed_source = {
-            crate = purl.name,
-            version = purl.version,
-            features = features,
-            locked = locked ~= "false",
-            git = git,
-        }
-        return parsed_source
-    end)
+    ---@class ParsedCargoSource : ParsedPackageSource
+    local parsed_source = {
+        crate = purl.name,
+        version = purl.version,
+        features = features,
+        locked = locked ~= "false",
+        git = git,
+    }
+    return Result.success(parsed_source)
 end
 
 ---@async

lua/mason-core/installer/compiler/compilers/gem.lua

@@ -1,30 +1,22 @@
 local Result = require "mason-core.result"
 local _ = require "mason-core.functional"
 local providers = require "mason-core.providers"
-local util = require "mason-core.installer.compiler.util"
 
 local M = {}
 
 ---@class GemSource : RegistryPackageSource
----@field supported_platforms? string[]
 ---@field extra_packages? string[]
 
 ---@param source GemSource
 ---@param purl Purl
 function M.parse(source, purl)
-    return Result.try(function(try)
-        if source.supported_platforms then
-            try(util.ensure_valid_platform(source.supported_platforms))
-        end
-
-        ---@class ParsedGemSource : ParsedPackageSource
-        local parsed_source = {
-            package = purl.name,
-            version = purl.version,
-            extra_packages = source.extra_packages,
-        }
-        return parsed_source
-    end)
+    ---@class ParsedGemSource : ParsedPackageSource
+    local parsed_source = {
+        package = purl.name,
+        version = purl.version,
+        extra_packages = source.extra_packages,
+    }
+    return Result.success(parsed_source)
 end
 
 ---@async

lua/mason-core/installer/compiler/compilers/pypi.lua

@@ -2,36 +2,28 @@ local Result = require "mason-core.result"
 local _ = require "mason-core.functional"
 local providers = require "mason-core.providers"
 local settings = require "mason.settings"
-local util = require "mason-core.installer.compiler.util"
 
 local M = {}
 
 ---@class PypiSource : RegistryPackageSource
 ---@field extra_packages? string[]
----@field supported_platforms? string[]
 
 ---@param source PypiSource
 ---@param purl Purl
 function M.parse(source, purl)
-    return Result.try(function(try)
-        if source.supported_platforms then
-            try(util.ensure_valid_platform(source.supported_platforms))
-        end
-
-        ---@class ParsedPypiSource : ParsedPackageSource
-        local parsed_source = {
-            package = purl.name,
-            version = purl.version --[[ @as string ]],
-            extra = _.path({ "qualifiers", "extra" }, purl),
-            extra_packages = source.extra_packages,
-            pip = {
-                upgrade = settings.current.pip.upgrade_pip,
-                extra_args = settings.current.pip.install_args,
-            },
-        }
-
-        return parsed_source
-    end)
+    ---@class ParsedPypiSource : ParsedPackageSource
+    local parsed_source = {
+        package = purl.name,
+        version = purl.version --[[ @as string ]],
+        extra = _.path({ "qualifiers", "extra" }, purl),
+        extra_packages = source.extra_packages,
+        pip = {
+            upgrade = settings.current.pip.upgrade_pip,
+            extra_args = settings.current.pip.install_args,
+        },
+    }
+
+    return Result.success(parsed_source)
 end
 
 ---@async

lua/mason-core/installer/compiler/init.lua

@@ -72,6 +72,7 @@ end
 
 ---@param source RegistryPackageSource
 ---@param version string?
+---@return RegistryPackageSource
 local function coalesce_source(source, version)
     if version and source.version_overrides then
         for i = #source.version_overrides, 1, -1 do
@@ -117,6 +118,10 @@ function M.parse(spec, opts)
 
         local source = coalesce_source(spec.source, opts.version)
 
+        if source.supported_platforms then
+            try(util.ensure_valid_platform(source.supported_platforms))
+        end
+
         ---@type Purl
         local purl = try(Purl.parse(source.id))
         log.trace("Parsed purl.", source.id, purl)

lua/mason-core/installer/context/init.lua

@@ -86,12 +86,19 @@ function InstallContext:promote_cwd()
     -- 2. Prepare for renaming cwd to destination
     if platform.is.unix then
         -- Some Unix systems will raise an error when renaming a directory to a destination that does not already exist.
-        fs.async.mkdir(install_path)
+        fs.sync.mkdir(install_path)
     end
-    -- 3. Update cwd
+    -- 3. Move the cwd to the final installation directory
+    local rename_success, rename_err = pcall(fs.sync.rename, cwd, install_path)
+    if not rename_success then
+        -- On some file systems, we cannot create the directory before renaming. Therefore, remove it and then rename.
+        log.trace("Call to uv_fs_rename() while promoting cwd failed.", rename_err)
+        fs.sync.rmdir(install_path)
+        assert(fs.sync.dir_exists(cwd), "Current working directory no longer exists after retrying uv_fs_rename().")
+        fs.sync.rename(cwd, install_path)
+    end
+    -- 4. Update cwd
     self.cwd:set(install_path)
-    -- 4. Move the cwd to the final installation directory
-    fs.async.rename(cwd, install_path)
 end
 
 ---@param rel_path string The relative path from the current working directory to change cwd to. Will only restore to the initial cwd after execution of fn (if provided).