feat(spec): spec merging now properly works with `Plugin.enabled`

This commit is contained in:
Folke Lemaitre 2023-01-04 10:36:51 +01:00
parent bce0c6e327
commit 81cb352fe6
No known key found for this signature in database
GPG Key ID: 41F8B1FBACAE2040
2 changed files with 54 additions and 20 deletions

View File

@ -86,27 +86,12 @@ function Spec:add(plugin, results, is_dep)
plugin._ = {} plugin._ = {}
plugin._.dep = is_dep plugin._.dep = is_dep
local enabled = plugin.enabled plugin.dependencies = plugin.dependencies and self:normalize(plugin.dependencies, {}, true) or nil
if enabled == nil then if self.plugins[plugin.name] then
enabled = self.disabled[plugin.name] == nil plugin = self:merge(self.plugins[plugin.name], plugin)
else
enabled = plugin.enabled == true or (type(plugin.enabled) == "function" and plugin.enabled())
end
if enabled then
plugin.dependencies = plugin.dependencies and self:normalize(plugin.dependencies, {}, true) or nil
self.disabled[plugin.name] = nil
if self.plugins[plugin.name] then
plugin = self:merge(self.plugins[plugin.name], plugin)
end
self.plugins[plugin.name] = plugin
return results and table.insert(results, plugin.name)
else
-- FIXME: we should somehow merge when needed
plugin._.kind = "disabled"
self.disabled[plugin.name] = plugin
self.plugins[plugin.name] = nil
end end
self.plugins[plugin.name] = plugin
return results and table.insert(results, plugin.name)
end end
function Spec:error(msg) function Spec:error(msg)
@ -117,6 +102,53 @@ function Spec:warn(msg)
self:log(msg, vim.log.levels.WARN) self:log(msg, vim.log.levels.WARN)
end end
function Spec:fix_disabled()
---@type table<string,string[]> plugin to parent plugin
local dep_of = {}
---@type string[] dependencies of disabled plugins
local disabled_deps = {}
for _, plugin in pairs(self.plugins) do
local enabled = not (plugin.enabled == false or (type(plugin.enabled) == "function" and not plugin.enabled()))
if enabled then
for _, dep in ipairs(plugin.dependencies or {}) do
dep_of[dep] = dep_of[dep] or {}
table.insert(dep_of[dep], plugin.name)
end
else
plugin._.kind = "disabled"
self.plugins[plugin.name] = nil
self.disabled[plugin.name] = plugin
if plugin.dependencies then
vim.list_extend(disabled_deps, plugin.dependencies)
end
end
end
-- check deps of disabled plugins
for _, dep in ipairs(disabled_deps) do
-- only check if the plugin is still enabled and it is a dep
if self.plugins[dep] and self.plugins[dep]._.dep then
-- check if the dep is still used by another plugin
local keep = false
for _, parent in ipairs(dep_of[dep] or {}) do
if self.plugins[parent] then
keep = true
break
end
end
-- disable the dep when no longer needed
if not keep then
local plugin = self.plugins[dep]
plugin._.kind = "disabled"
self.plugins[plugin.name] = nil
self.disabled[plugin.name] = plugin
end
end
end
end
---@param msg string ---@param msg string
---@param level number ---@param level number
function Spec:log(msg, level) function Spec:log(msg, level)
@ -289,6 +321,7 @@ function M.load()
end end
lazy._.loaded = {} lazy._.loaded = {}
end end
Config.spec:fix_disabled()
local existing = Config.plugins local existing = Config.plugins
Config.plugins = Config.spec.plugins Config.plugins = Config.spec.plugins

View File

@ -260,6 +260,7 @@ describe("plugin spec opt", function()
} }
for test, ret in pairs(tests) do for test, ret in pairs(tests) do
local spec = Plugin.Spec.new(test) local spec = Plugin.Spec.new(test)
spec:fix_disabled()
assert(#spec.notifs == 0) assert(#spec.notifs == 0)
if ret then if ret then
assert(spec.plugins.bar) assert(spec.plugins.bar)