fix(spec): allow a spec module to be on the rtp and not only in config

This commit is contained in:
Folke Lemaitre 2023-01-01 20:19:09 +01:00
parent 963e6f72a7
commit 51c23b661e
No known key found for this signature in database
GPG Key ID: 41F8B1FBACAE2040
5 changed files with 131 additions and 19 deletions

View File

@ -62,11 +62,11 @@ function M.check_path(modname, modpath)
-- the correct lazy path should be part of rtp. -- the correct lazy path should be part of rtp.
-- so if we get here, this is folke using the local dev instance ;) -- so if we get here, this is folke using the local dev instance ;)
if modname:sub(1, 4) == "lazy" then if modname and modname:sub(1, 4) == "lazy" then
return false return false
end end
return M.check_autoload(modname, modpath) return modname and M.check_autoload(modname, modpath)
end end
function M.check_autoload(modname, modpath) function M.check_autoload(modname, modpath)
@ -246,8 +246,43 @@ function M.get_topmods(path)
end end
---@param modname string ---@param modname string
---@return string?, string?
function M.find_dir(modname)
if M.cache[modname] then
-- check if modname is in cache
local modpath = M.cache[modname].modpath
if M.check_path(modname, modpath) then
local root = modpath:gsub("/init%.lua$", ""):gsub("%.lua$", "")
return root, modpath
end
else
-- in case modname is just a directory and not a real mod,
-- check for any children in the cache
for child, entry in pairs(M.cache) do
if child:find(modname, 1, true) == 1 and M.check_path(nil, entry.modpath) then
local basename = modname:gsub("%.", "/")
local childbase = child:gsub("%.", "/")
local ret = entry.modpath:gsub("/init%.lua$", ""):gsub("%.lua$", "")
local idx = assert(ret:find(childbase, 1, true))
return ret:sub(1, idx - 1) .. basename
end
end
end
-- not found in cache, so find the root with the special pattern
local modpath = M.find(modname, { patterns = { "" } })
if modpath then
local root = modpath:gsub("/init%.lua$", ""):gsub("%.lua$", "")
return root, root ~= modpath and modpath or nil
end
end
---@param modname string
---@param opts? {patterns?:string[]}
---@return string? ---@return string?
function M.find(modname) function M.find(modname, opts)
opts = opts or {}
M.stats.find.total = M.stats.find.total + 1 M.stats.find.total = M.stats.find.total + 1
local start = uv.hrtime() local start = uv.hrtime()
local basename = modname:gsub("%.", "/") local basename = modname:gsub("%.", "/")
@ -257,6 +292,10 @@ function M.find(modname)
-- search for a directory first when topmod == modname -- search for a directory first when topmod == modname
local patterns = topmod == modname and { "/init.lua", ".lua" } or { ".lua", "/init.lua" } local patterns = topmod == modname and { "/init.lua", ".lua" } or { ".lua", "/init.lua" }
if opts.patterns then
vim.list_extend(patterns, opts.patterns)
end
-- check top-level mods to find the module -- check top-level mods to find the module
local function _find() local function _find()
for _, toppath in ipairs(M.topmods[topmod] or {}) do for _, toppath in ipairs(M.topmods[topmod] or {}) do

View File

@ -176,25 +176,21 @@ function M.walk(path, fn)
end end
---@param modname string ---@param modname string
---@param root string
---@param fn fun(modname:string, modpath:string) ---@param fn fun(modname:string, modpath:string)
---@overload fun(modname:string, fn: fun(modname:string, modpath:string)) function M.lsmod(modname, fn)
function M.lsmod(modname, root, fn) local Cache = require("lazy.core.cache")
if type(root) == "function" then local root, modpath = Cache.find_dir(modname)
fn = root if not root then
root = vim.fn.stdpath("config") .. "/lua" return
end end
root = root .. "/" .. modname:gsub("%.", "/")
if vim.loop.fs_stat(root .. ".lua") then if modpath and vim.loop.fs_stat(modpath) then
fn(modname, root .. ".lua") fn(modname, modpath)
end end
M.ls(root, function(path, name, type) M.ls(root, function(path, name, type)
if (type == "file" or type == "link") and name:sub(-4) == ".lua" then if name ~= "init.lua" and (type == "file" or type == "link") and name:sub(-4) == ".lua" then
if name == "init.lua" then fn(modname .. "." .. name:sub(1, -5), path)
fn(modname, path)
else
fn(modname .. "." .. name:sub(1, -5), path)
end
elseif type == "directory" and vim.loop.fs_stat(path .. "/init.lua") then elseif type == "directory" and vim.loop.fs_stat(path .. "/init.lua") then
fn(modname .. "." .. name, path .. "/init.lua") fn(modname .. "." .. name, path .. "/init.lua")
end end

View File

@ -55,7 +55,7 @@ function M.check(start)
end end
end end
Util.lsmod(Config.spec --[[@as string]], M.root, check) Util.lsmod(Config.spec --[[@as string]], check)
for file in pairs(M.files) do for file in pairs(M.files) do
if not checked[file] then if not checked[file] then

40
tests/core/util_spec.lua Normal file
View File

@ -0,0 +1,40 @@
local Util = require("lazy.util")
local Cache = require("lazy.core.cache")
local Helpers = require("tests.helpers")
describe("util", function()
before_each(function()
Helpers.fs_rm("")
end)
it("lsmod lists all mods in dir", function()
local tests = {
{
files = { "lua/foo/one.lua", "lua/foo/two.lua", "lua/foo/init.lua" },
mods = { "foo", "foo.one", "foo.two" },
},
{
files = { "lua/foo/one.lua", "lua/foo/two.lua", "lua/foo.lua" },
mods = { "foo", "foo.one", "foo.two" },
},
{
files = { "lua/foo/one.lua", "lua/foo/two.lua" },
mods = { "foo.one", "foo.two" },
},
}
vim.opt.rtp:append(Helpers.path(""))
for _, test in ipairs(tests) do
Cache.cache = {}
table.sort(test.mods)
Helpers.fs_rm("")
Helpers.fs_create(test.files)
local mods = {}
Util.lsmod("foo", function(modname, modpath)
mods[#mods + 1] = modname
end)
table.sort(mods)
assert.same(test.mods, mods)
end
end)
end)

37
tests/helpers.lua Normal file
View File

@ -0,0 +1,37 @@
local Util = require("lazy.util")
local M = {}
M.fs_root = vim.fn.fnamemodify("./.tests/fs", ":p")
function M.path(path)
return Util.norm(M.fs_root .. "/" .. path)
end
---@param files string[]
function M.fs_create(files)
---@type string[]
local ret = {}
for _, file in ipairs(files) do
ret[#ret + 1] = Util.norm(M.fs_root .. "/" .. file)
local parent = vim.fn.fnamemodify(ret[#ret], ":h:p")
vim.fn.mkdir(parent, "p")
Util.write_file(ret[#ret], "")
end
return ret
end
function M.fs_rm(dir)
dir = Util.norm(M.fs_root .. dir)
Util.walk(dir, function(path, _, type)
if type == "directory" then
vim.loop.fs_rmdir(path)
else
vim.loop.fs_unlink(path)
end
end)
vim.loop.fs_rmdir(dir)
end
return M