jank/lazy.nvim
1
0
Fork 0
mirror of https://github.com/folke/lazy.nvim.git synced 2025-06-28 11:24:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve the local spec name check to fix edge cases

Browse source 
(e.g. config modules named `lazy.lualine`, `user.lazy.lua`, etc. will
not be treated as local specs)
This commit is contained in:
pynappo 2024-06-15 18:51:12 -07:00
commit 151d7068b3
No known key found for this signature in database
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lua/lazy/core/plugin.lua
View file

@ -403,7 +403,9 @@ function Spec:import(spec)
---@type string[] ---@type string[]
local modnames = {} local modnames = {}
if spec.import:find(M.LOCAL_SPEC, 1, true) then -- relies on `find_local_spec` to always insert a `/` before the local spec location
local local_spec_suffix = "/" .. M.LOCAL_SPEC
if spec.import == M.LOCAL_SPEC or spec.import:sub(-#local_spec_suffix) == local_spec_suffix then
modnames = { spec.import } modnames = { spec.import }
else else
Util.lsmod(spec.import, function(modname) Util.lsmod(spec.import, function(modname)
@ -415,8 +417,10 @@ function Spec:import(spec)
for _, modname in ipairs(modnames) do for _, modname in ipairs(modnames) do
imported = imported + 1 imported = imported + 1
local name = modname local name = modname
if modname:find(M.LOCAL_SPEC, 1, true) then local is_local_spec = false
if modname == M.LOCAL_SPEC or modname:sub(-#local_spec_suffix) == local_spec_suffix then
name = vim.fn.fnamemodify(modname, ":~:.") name = vim.fn.fnamemodify(modname, ":~:.")
is_local_spec = true
end end
Util.track({ import = name }) Util.track({ import = name })
self.importing = modname self.importing = modname
@ -425,7 +429,7 @@ function Spec:import(spec)
package.loaded[modname] = nil package.loaded[modname] = nil
Util.try(function() Util.try(function()
local mod = nil local mod = nil
if modname:find(M.LOCAL_SPEC, 1, true) then if is_local_spec then
mod = M.local_spec(modname) mod = M.local_spec(modname)
else else
mod = require(modname) mod = require(modname)