fix(plugin): ignore any installed deps of a disabled conditional plugin. Fixes #1053

This commit is contained in:
Folke Lemaitre 2023-09-29 10:52:52 +02:00
parent aa5135255c
commit f91203e4f6
No known key found for this signature in database
GPG Key ID: 41F8B1FBACAE2040
1 changed files with 12 additions and 4 deletions

View File

@ -11,6 +11,7 @@ M.loading = false
---@field fragments table<number, LazyPlugin> ---@field fragments table<number, LazyPlugin>
---@field disabled table<string, LazyPlugin> ---@field disabled table<string, LazyPlugin>
---@field dirty table<string, true> ---@field dirty table<string, true>
---@field ignore_installed table<string, true>
---@field modules string[] ---@field modules string[]
---@field notifs {msg:string, level:number, file?:string}[] ---@field notifs {msg:string, level:number, file?:string}[]
---@field importing? string ---@field importing? string
@ -30,6 +31,7 @@ function Spec.new(spec, opts)
self.modules = {} self.modules = {}
self.dirty = {} self.dirty = {}
self.notifs = {} self.notifs = {}
self.ignore_installed = {}
self.optional = opts and opts.optional self.optional = opts and opts.optional
if spec then if spec then
self:parse(spec) self:parse(spec)
@ -247,6 +249,14 @@ function Spec:fix_cond()
end end
if cond == false or (type(cond) == "function" and not cond(plugin)) then if cond == false or (type(cond) == "function" and not cond(plugin)) then
plugin._.cond = false plugin._.cond = false
local stack = { plugin }
while #stack > 0 do
local p = table.remove(stack)
for _, dep in ipairs(p.dependencies or {}) do
table.insert(stack, self.plugins[dep])
end
self.ignore_installed[p.name] = true
end
plugin.enabled = false plugin.enabled = false
end end
end end
@ -469,10 +479,8 @@ function M.update_state()
end end
end end
for _, plugin in pairs(Config.spec.disabled) do for name in pairs(Config.spec.ignore_installed) do
if plugin._.cond == false then installed[name] = nil
installed[plugin.name] = nil
end
end end
Config.to_clean = {} Config.to_clean = {}