Skip to content

Commit 7288962

Browse files
committed
fix: support adding top-level lua directories
1 parent fca984b commit 7288962

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

lua/lazy/core/module.lua

+5-2
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ local function _add_module(dir, modname)
5858
for _, entry in ipairs(entries) do
5959
local path = dir .. "/" .. entry.name
6060
if entry.type == "directory" then
61-
_add_module(path, modname .. "." .. entry.name)
61+
_add_module(path, modname and (modname .. "." .. entry.name) or entry.name)
6262
else
6363
local childname = entry.name:match("^(.*)%.lua$")
6464
if childname then
65-
local child = entry.name == "init.lua" and modname or (modname .. "." .. childname)
65+
local child = entry.name == "init.lua" and modname or modname and (modname .. "." .. childname) or childname
6666
if child then
6767
M.add(child, path)
6868
end
@@ -76,6 +76,9 @@ local function _add_module(dir, modname)
7676
end
7777

7878
function M.add_module(path)
79+
if path:find("/lua/?$") then
80+
return _add_module(path)
81+
end
7982
---@type string
8083
local modname = path:match("/lua/(.*)/?")
8184
assert(modname)

lua/lazy/init.lua

+4
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ function M.setup(opts)
3939
-- rebuild state
4040
local Plugin = require("lazy.plugin")
4141
Module.add_module(vim.fn.stdpath("config") .. "/lua/" .. Config.options.plugins:gsub("%.", "/"))
42+
-- Module.add_module(vim.fn.stdpath("config") .. "/lua")
43+
-- Module.add_module(Config.options.package_path .. "/start/tokyonight.nvim/lua")
44+
-- Module.add_module(Config.options.package_path .. "/opt/nvim-cmp/lua")
45+
-- Module.add_module(Config.options.package_path .. "/opt/cmp-buffer/lua")
4246
vim.schedule(function()
4347
vim.notify("Reloading")
4448
end)

0 commit comments

Comments
 (0)