Merge remote-tracking branch 'origin/main' into vuxuanhungg/main

* origin/main:
  fix(fs): fall back to `fs_stat` if entry type is not returned by `fs_readdir` (mason-org#1783)
  fix: avoid calling vim.fn in fast event (mason-org#1878)
  fix(ui): reposition window if border is different than "none" (mason-org#1859)
  fix: replace deprecated calls to vim.validate (mason-org#1876)
  tests: add new nvim versions to test matrix (mason-org#1877)

Author: williamboman

.github/workflows/tests.yml

@@ -12,8 +12,6 @@ jobs:
             fail-fast: false
             matrix:
                 nvim_version:
-                    - v0.7.0
-                    - v0.7.2
                     - v0.8.0
                     - v0.8.1
                     - v0.8.2
@@ -24,6 +22,10 @@ jobs:
                     - v0.9.4
                     - v0.9.5
                     - v0.10.0
+                    - v0.10.1
+                    - v0.10.2
+                    - v0.10.3
+                    - v0.10.4
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v4

lua/mason-core/fs.lua

@@ -134,6 +134,13 @@ local function make_module(uv)
             log.trace("fs: fs_readdir", path, entries)
             if entries and #entries > 0 then
                 for i = 1, #entries do
+                    if entries[i].name and not entries[i].type then
+                        -- See https://github.com/luvit/luv/issues/660
+                        local full_path = Path.concat { path, entries[i].name }
+                        log.trace("fs: fs_readdir falling back to fs_stat to find type", full_path)
+                        local stat = uv.fs_stat(full_path)
+                        entries[i].type = stat.type
+                    end
                     all_entries[#all_entries + 1] = entries[i]
                 end
             else

lua/mason-core/package/init.lua

@@ -7,6 +7,7 @@ local a = require "mason-core.async"
 local fs = require "mason-core.fs"
 local log = require "mason-core.log"
 local path = require "mason-core.path"
+local platform = require "mason-core.platform"
 local registry = require "mason-registry"
 
 local is_not_nil = _.complement(_.is_nil)
@@ -86,30 +87,33 @@ local PackageMt = { __index = Package }
 ---@field opt table<string, string>?
 
 ---@param spec PackageSpec | RegistryPackageSpec
-function Package.new(spec)
+local function validate_spec(spec)
+    if platform.cached_features["nvim-0.11"] ~= 1 then
+        return
+    end
     if is_registry_spec(spec) then
-        vim.validate {
-            name = { spec.name, "s" },
-            description = { spec.description, "s" },
-            homepage = { spec.homepage, "s" },
-            licenses = { spec.licenses, "t" },
-            categories = { spec.categories, "t" },
-            languages = { spec.languages, "t" },
-            source = { spec.source, "t" },
-            bin = { spec.bin, { "t", "nil" } },
-            share = { spec.share, { "t", "nil" } },
-        }
+        vim.validate("name", spec.name, "string")
+        vim.validate("description", spec.description, "string")
+        vim.validate("homepage", spec.homepage, "string")
+        vim.validate("licenses", spec.licenses, "table")
+        vim.validate("categories", spec.categories, "table")
+        vim.validate("languages", spec.languages, "table")
+        vim.validate("source", spec.source, "table")
+        vim.validate("bin", spec.bin, { "table", "nil" })
+        vim.validate("share", spec.share, { "table", "nil" })
     else
-        vim.validate {
-            name = { spec.name, "s" },
-            desc = { spec.desc, "s" },
-            homepage = { spec.homepage, "s" },
-            categories = { spec.categories, "t" },
-            languages = { spec.languages, "t" },
-            install = { spec.install, "f" },
-        }
+        vim.validate("name", spec.name, "string")
+        vim.validate("desc", spec.desc, "string")
+        vim.validate("homepage", spec.homepage, "string")
+        vim.validate("categories", spec.categories, "table")
+        vim.validate("languages", spec.languages, "table")
+        vim.validate("install", spec.install, "function")
     end
+end
 
+---@param spec PackageSpec | RegistryPackageSpec
+function Package.new(spec)
+    validate_spec(spec)
     return EventEmitter.init(setmetatable({
         name = spec.name, -- for convenient access
         spec = spec,

lua/mason-core/platform.lua

@@ -66,14 +66,15 @@ end)
 
 -- Most of the code that calls into these functions executes outside of the main event loop, where API/fn functions are
 -- disabled. We evaluate these immediately here to avoid issues with main loop synchronization.
-local cached_features = {
+M.cached_features = {
     ["win"] = vim.fn.has "win32",
     ["win32"] = vim.fn.has "win32",
     ["win64"] = vim.fn.has "win64",
     ["mac"] = vim.fn.has "mac",
     ["darwin"] = vim.fn.has "mac",
     ["unix"] = vim.fn.has "unix",
     ["linux"] = vim.fn.has "linux",
+    ["nvim-0.11"] = vim.fn.has "nvim-0.11",
 }
 
 ---@type fun(env: string): boolean
@@ -104,7 +105,7 @@ local check_env = _.memoize(_.cond {
 M.is = setmetatable({}, {
     __index = function(__, key)
         local os, arch, env = unpack(vim.split(key, "_", { plain = true }))
-        if not cached_features[os] or cached_features[os] ~= 1 then
+        if not M.cached_features[os] or M.cached_features[os] ~= 1 then
             return false
         end
         if arch and arch ~= M.arch then

lua/mason-core/ui/display.lua

@@ -170,13 +170,10 @@ M._render_node = render_node
 
 ---@alias WindowOpts { effects?: table<string, fun()>, winhighlight?: string[], border?: string|table }
 
----@param size integer | float
+---@param size number
 ---@param viewport integer
 local function calc_size(size, viewport)
-    if size <= 1 then
-        return math.ceil(size * viewport)
-    end
-    return math.min(size, viewport)
+    return size > 1 and math.min(size, viewport) or math.floor(size * viewport)
 end
 
 ---@param opts WindowOpts
@@ -188,6 +185,11 @@ local function create_popup_window_opts(opts, sizes_only)
     local width = calc_size(settings.current.ui.width, columns)
     local row = math.floor((lines - height) / 2)
     local col = math.floor((columns - width) / 2)
+    if opts.border ~= "none" then
+        row = math.max(row - 1, 0)
+        col = math.max(col - 1, 0)
+    end
+
     local popup_layout = {
         height = height,
         width = width,

tests/mason-core/package/package_spec.lua

@@ -23,60 +23,62 @@ describe("package", function()
         assert.same({ "rust-analyzer", "nightly" }, parse "rust-analyzer@nightly")
     end)
 
-    it("should validate spec", function()
-        local valid_spec = {
-            name = "Package name",
-            desc = "Package description",
-            homepage = "https://example.com",
-            categories = { Pkg.Cat.LSP },
-            languages = { Pkg.Lang.Rust },
-            install = function() end,
-        }
-        local function spec(fields)
-            return setmetatable(fields, { __index = valid_spec })
-        end
-        assert.equals(
-            "name: expected string, got number",
-            assert.has_error(function()
-                Pkg.new(spec { name = 23 })
-            end)
-        )
+    if vim.fn.has "nvim-0.11" == 1 then
+        it("should validate spec", function()
+            local valid_spec = {
+                name = "Package name",
+                desc = "Package description",
+                homepage = "https://example.com",
+                categories = { Pkg.Cat.LSP },
+                languages = { Pkg.Lang.Rust },
+                install = function() end,
+            }
+            local function spec(fields)
+                return setmetatable(fields, { __index = valid_spec })
+            end
+            assert.equals(
+                "name: expected string, got number",
+                assert.has_error(function()
+                    Pkg.new(spec { name = 23 })
+                end)
+            )
 
-        assert.equals(
-            "desc: expected string, got number",
-            assert.has_error(function()
-                Pkg.new(spec { desc = 23 })
-            end)
-        )
+            assert.equals(
+                "desc: expected string, got number",
+                assert.has_error(function()
+                    Pkg.new(spec { desc = 23 })
+                end)
+            )
 
-        assert.equals(
-            "homepage: expected string, got number",
-            assert.has_error(function()
-                Pkg.new(spec { homepage = 23 })
-            end)
-        )
+            assert.equals(
+                "homepage: expected string, got number",
+                assert.has_error(function()
+                    Pkg.new(spec { homepage = 23 })
+                end)
+            )
 
-        assert.equals(
-            "categories: expected table, got number",
-            assert.has_error(function()
-                Pkg.new(spec { categories = 23 })
-            end)
-        )
+            assert.equals(
+                "categories: expected table, got number",
+                assert.has_error(function()
+                    Pkg.new(spec { categories = 23 })
+                end)
+            )
 
-        assert.equals(
-            "languages: expected table, got number",
-            assert.has_error(function()
-                Pkg.new(spec { languages = 23 })
-            end)
-        )
+            assert.equals(
+                "languages: expected table, got number",
+                assert.has_error(function()
+                    Pkg.new(spec { languages = 23 })
+                end)
+            )
 
-        assert.equals(
-            "install: expected function, got number",
-            assert.has_error(function()
-                Pkg.new(spec { install = 23 })
-            end)
-        )
-    end)
+            assert.equals(
+                "install: expected function, got number",
+                assert.has_error(function()
+                    Pkg.new(spec { install = 23 })
+                end)
+            )
+        end)
+    end
 
     it("should create new handle", function()
         local dummy = registry.get_package "dummy"
@@ -191,4 +193,28 @@ describe("package", function()
             end)
         end)
     )
+
+    it(
+        "should be able to instantiate package outside of main loop",
+        async_test(function()
+            local dummy = registry.get_package "registry"
+
+            -- Move outside the main loop
+            a.wait(function(resolve)
+                local timer = vim.loop.new_timer()
+                timer:start(0, 0, function()
+                    timer:close()
+                    resolve()
+                end)
+            end)
+
+            assert.is_true(vim.in_fast_event())
+
+            local pkg = assert.is_not.has_error(function()
+                return Pkg.new(dummy.spec)
+            end)
+
+            assert.same(dummy.spec, pkg.spec)
+        end)
+    )
 end)