jank/lazy.nvim
1
0
Fork 0
mirror of https://github.com/folke/lazy.nvim.git synced 2025-04-18 20:36:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(util): made Util.lsmod more robust. See #298

Browse source
This commit is contained in:
Folke Lemaitre 2023-01-03 22:31:18 +01:00
parent f36c7cb0dc
commit 953c2791d8
No known key found for this signature in database
GPG key ID: 41F8B1FBACAE2040
3 changed files with 52 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lua/lazy/core/cache.lua
View file

@ -257,14 +257,14 @@ function M.get_topmods(path)
end
---@param modname string
---@return string?, string?
function M.find_dir(modname)
---@return string?
function M.find_root(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
return root
end
else
-- in case modname is just a directory and not a real mod,
@ -286,7 +286,7 @@ function M.find_dir(modname)
local modpath = M.find(modname, { patterns = { "" } })
if modpath then
local root = modpath:gsub("/init%.lua$", ""):gsub("%.lua$", "")
return root, (modpath ~= root and modpath or nil)
return root
end
end

6
lua/lazy/core/util.lua
View file

@ -195,13 +195,13 @@ end
---@param fn fun(modname:string, modpath:string)
function M.lsmod(modname, fn)
local Cache = require("lazy.core.cache")
local root, modpath = Cache.find_dir(modname)
local root = Cache.find_root(modname)
if not root then
return
end
if modpath and not modpath:find("/init%.lua$") and vim.loop.fs_stat(modpath) then
fn(modname, modpath)
if vim.loop.fs_stat(root .. ".lua") then
fn(modname, root .. ".lua")
end
M.ls(root, function(path, name, type)