mirror of https://github.com/folke/lazy.nvim.git
refactor: merge plugin & state in one file
This commit is contained in:
Folke Lemaitre
parent
fe33e4e3dd
commit
3e8fbaffba
|
|
@ -0,0 +1,263 @@
|
|||
local Config = require("lazy.core.config")
|
||||
local Util = require("lazy.core.util")
|
||||
local Module = require("lazy.core.module")
|
||||
local Cache = require("lazy.core.cache")
|
||||
|
||||
local M = {}
|
||||
|
||||
---@alias CachedPlugin LazyPlugin | {_funs: string[]}
|
||||
local skip = { installed = true, loaded = true, tasks = true, dirty = true, dir = true }
|
||||
local funs = { config = true, init = true, run = true }
|
||||
|
||||
---@class LazyPlugin
|
||||
---@field [1] string
|
||||
---@field name string display name and name used for plugin config files
|
||||
---@field uri string
|
||||
---@field branch? string
|
||||
---@field dir string
|
||||
---@field enabled? boolean
|
||||
---@field opt? boolean
|
||||
---@field init? fun(LazyPlugin) Will always be run
|
||||
---@field config? fun(LazyPlugin) Will be executed when loading the plugin
|
||||
---@field event? string|string[]
|
||||
---@field cmd? string|string[]
|
||||
---@field ft? string|string[]
|
||||
---@field module? string|string[]
|
||||
---@field keys? string|string[]
|
||||
---@field requires? string[]
|
||||
---@field loaded? {[string]:string, time:number}
|
||||
---@field installed? boolean
|
||||
---@field run? string|fun()
|
||||
---@field tasks? LazyTask[]
|
||||
---@field dirty? boolean
|
||||
---@field updated? {from:string, to:string}
|
||||
|
||||
---@class LazySpec
|
||||
---@field modname string
|
||||
---@field modpath string
|
||||
---@field plugins table<string, LazyPlugin>
|
||||
local Spec = {}
|
||||
|
||||
---@param modname string
|
||||
---@param modpath string
|
||||
function Spec.load(modname, modpath)
|
||||
local self = setmetatable({}, { __index = Spec })
|
||||
self.plugins = {}
|
||||
self.modname = modname
|
||||
self.modpath = modpath
|
||||
self:normalize(assert(Module.load(modname, modpath)))
|
||||
if modname == Config.options.plugins and not self.plugins["lazy.nvim"] then
|
||||
self:add({ "folke/lazy.nvim", opt = false })
|
||||
end
|
||||
return self
|
||||
end
|
||||
|
||||
---@param plugin LazyPlugin
|
||||
function Spec:add(plugin)
|
||||
if type(plugin[1]) ~= "string" then
|
||||
Util.error("Invalid plugin spec " .. vim.inspect(plugin))
|
||||
end
|
||||
plugin.uri = plugin.uri or ("https://github.com/" .. plugin[1] .. ".git")
|
||||
if not plugin.name then
|
||||
-- PERF: optimized code to get package name without using lua patterns
|
||||
local name = plugin[1]:sub(-4) == ".git" and plugin[1]:sub(1, -5) or plugin[1]
|
||||
local slash = name:reverse():find("/", 1, true) --[[@as number?]]
|
||||
plugin.name = slash and name:sub(#name - slash + 2) or plugin[1]:gsub("%W+", "_")
|
||||
end
|
||||
|
||||
M.process_local(plugin)
|
||||
local other = self.plugins[plugin.name]
|
||||
self.plugins[plugin.name] = other and vim.tbl_extend("force", self.plugins[plugin.name], plugin) or plugin
|
||||
return self.plugins[plugin.name]
|
||||
end
|
||||
|
||||
---@param spec table
|
||||
---@param results? string[]
|
||||
function Spec:normalize(spec, results)
|
||||
results = results or {}
|
||||
if type(spec) == "string" then
|
||||
table.insert(results, self:add({ spec }).name)
|
||||
elseif #spec > 1 or Util.is_list(spec) then
|
||||
---@cast spec table[]
|
||||
for _, s in ipairs(spec) do
|
||||
self:normalize(s, results)
|
||||
end
|
||||
elseif spec.enabled ~= false then
|
||||
local plugin = self:add(spec)
|
||||
plugin.requires = plugin.requires and self:normalize(plugin.requires, {}) or nil
|
||||
table.insert(results, plugin.name)
|
||||
end
|
||||
return results
|
||||
end
|
||||
|
||||
---@param spec CachedSpec
|
||||
function Spec.revive(spec)
|
||||
if spec.funs then
|
||||
---@type LazySpec
|
||||
local loaded = nil
|
||||
for fun, plugins in pairs(spec.funs) do
|
||||
for _, name in pairs(plugins) do
|
||||
spec.plugins[name][fun] = function(...)
|
||||
loaded = loaded or Spec.load(spec.modname, spec.modpath)
|
||||
return loaded.plugins[name][fun](...)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
return spec
|
||||
end
|
||||
|
||||
function M.update_state(check_clean)
|
||||
---@type table<"opt"|"start", table<string,boolean>>
|
||||
local installed = { opt = {}, start = {} }
|
||||
for opt, packs in pairs(installed) do
|
||||
Util.scandir(Config.options.package_path .. "/" .. opt, function(_, name, type)
|
||||
if type == "directory" or type == "link" then
|
||||
packs[name] = true
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
for _, plugin in pairs(Config.plugins) do
|
||||
plugin[1] = plugin["1"] or plugin[1]
|
||||
plugin.opt = plugin.opt == nil and Config.options.opt or plugin.opt
|
||||
local opt = plugin.opt and "opt" or "start"
|
||||
plugin.dir = Config.options.package_path .. "/" .. opt .. "/" .. plugin.name
|
||||
plugin.installed = installed[opt][plugin.name] == true
|
||||
installed[opt][plugin.name] = nil
|
||||
end
|
||||
|
||||
if check_clean then
|
||||
Config.to_clean = {}
|
||||
for opt, packs in pairs(installed) do
|
||||
for pack in pairs(packs) do
|
||||
table.insert(Config.to_clean, {
|
||||
name = pack,
|
||||
pack = pack,
|
||||
dir = Config.options.package_path .. "/" .. opt .. "/" .. pack,
|
||||
opt = opt == "opt",
|
||||
installed = true,
|
||||
})
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
---@param plugin LazyPlugin
|
||||
function M.process_local(plugin)
|
||||
for _, pattern in ipairs(Config.options.plugins_local.patterns) do
|
||||
if plugin[1]:find(pattern, 1, true) then
|
||||
plugin.uri = Config.options.plugins_local.path .. "/" .. plugin.name
|
||||
return
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
---@alias LazySpecLoader fun(modname:string, modpath:string):LazySpec
|
||||
---@param loader? LazySpecLoader
|
||||
function M.specs(loader)
|
||||
loader = loader or Spec.load
|
||||
---@type LazySpec[]
|
||||
local specs = {}
|
||||
|
||||
local function _load(modname, modpath)
|
||||
local spec = Util.try(function()
|
||||
return loader(modname, modpath)
|
||||
end, "Failed to load **" .. modname .. "**")
|
||||
if spec then
|
||||
table.insert(specs, spec)
|
||||
end
|
||||
end
|
||||
|
||||
_load(Config.options.plugins, Config.paths.main)
|
||||
Util.lsmod(Config.paths.plugins, function(name, modpath)
|
||||
_load(Config.options.plugins .. "." .. name, modpath)
|
||||
end)
|
||||
return specs
|
||||
end
|
||||
|
||||
function M.load()
|
||||
local dirty = false
|
||||
|
||||
---@type boolean, LazyState?
|
||||
local ok, state = pcall(vim.json.decode, Cache.get("cache.state"))
|
||||
if not (ok and state and vim.deep_equal(Config.options, state.config)) then
|
||||
dirty = true
|
||||
state = nil
|
||||
end
|
||||
|
||||
local loader = state
|
||||
and function(modname, modpath)
|
||||
local spec = state and state.specs[modname]
|
||||
if (not spec) or Module.is_dirty(modname, modpath) then
|
||||
dirty = true
|
||||
vim.schedule(function()
|
||||
vim.notify("Reloading " .. modname)
|
||||
end)
|
||||
return Spec.load(modname, modpath)
|
||||
end
|
||||
return Spec.revive(spec)
|
||||
end
|
||||
|
||||
-- load specs
|
||||
Util.track("specs")
|
||||
local specs = M.specs(loader)
|
||||
Util.track()
|
||||
|
||||
-- merge
|
||||
Config.plugins = {}
|
||||
for _, spec in ipairs(specs) do
|
||||
for _, plugin in pairs(spec.plugins) do
|
||||
local other = Config.plugins[plugin.name]
|
||||
Config.plugins[plugin.name] = other and vim.tbl_extend("force", other, plugin) or plugin
|
||||
end
|
||||
end
|
||||
|
||||
Util.track("state")
|
||||
M.update_state()
|
||||
Util.track()
|
||||
|
||||
if dirty then
|
||||
Cache.dirty = true
|
||||
elseif state then
|
||||
require("lazy.core.loader").loaders = state.loaders
|
||||
end
|
||||
end
|
||||
|
||||
function M.save()
|
||||
if not M.dirty then
|
||||
return
|
||||
end
|
||||
|
||||
---@alias CachedSpec LazySpec|{funs:table<string, string[]>}
|
||||
---@class LazyState
|
||||
local state = {
|
||||
---@type table<string, CachedSpec>
|
||||
specs = {},
|
||||
loaders = require("lazy.core.loader").loaders,
|
||||
config = Config.options,
|
||||
}
|
||||
|
||||
for _, spec in ipairs(M.specs()) do
|
||||
---@cast spec CachedSpec
|
||||
spec.funs = {}
|
||||
state.specs[spec.modname] = spec
|
||||
for _, plugin in pairs(spec.plugins) do
|
||||
---@cast plugin CachedPlugin
|
||||
for k, v in pairs(plugin) do
|
||||
if type(v) == "function" then
|
||||
if funs[k] then
|
||||
spec.funs[k] = spec.funs[k] or {}
|
||||
table.insert(spec.funs[k], plugin.name)
|
||||
end
|
||||
plugin[k] = nil
|
||||
elseif skip[k] then
|
||||
plugin[k] = nil
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
Cache.set("cache.state", vim.json.encode(state))
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
@ -1,131 +0,0 @@
|
|||
local Cache = require("lazy.core.cache")
|
||||
local Module = require("lazy.core.module")
|
||||
local Config = require("lazy.core.config")
|
||||
|
||||
local M = {}
|
||||
|
||||
M.dirty = true
|
||||
|
||||
---@alias CachedPlugin LazyPlugin | {_funs: string[]}
|
||||
local skip = { installed = true, loaded = true, tasks = true, dirty = true, dir = true }
|
||||
local funs = { config = true, init = true, run = true }
|
||||
|
||||
function M.update_state(check_clean)
|
||||
local Util = require("lazy.core.util")
|
||||
|
||||
---@type table<"opt"|"start", table<string,boolean>>
|
||||
local installed = { opt = {}, start = {} }
|
||||
for opt, packs in pairs(installed) do
|
||||
Util.scandir(Config.options.package_path .. "/" .. opt, function(_, name, type)
|
||||
if type == "directory" or type == "link" then
|
||||
packs[name] = true
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
for _, plugin in pairs(Config.plugins) do
|
||||
plugin.opt = plugin.opt == nil and Config.options.opt or plugin.opt
|
||||
local opt = plugin.opt and "opt" or "start"
|
||||
plugin.dir = Config.options.package_path .. "/" .. opt .. "/" .. plugin.name
|
||||
plugin.installed = installed[opt][plugin.name] == true
|
||||
installed[opt][plugin.name] = nil
|
||||
end
|
||||
|
||||
if check_clean then
|
||||
Config.to_clean = {}
|
||||
for opt, packs in pairs(installed) do
|
||||
for pack in pairs(packs) do
|
||||
table.insert(Config.to_clean, {
|
||||
name = pack,
|
||||
pack = pack,
|
||||
dir = Config.options.package_path .. "/" .. opt .. "/" .. pack,
|
||||
opt = opt == "opt",
|
||||
installed = true,
|
||||
})
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function M.save()
|
||||
if not M.dirty then
|
||||
return
|
||||
end
|
||||
local Plugin = require("lazy.plugin")
|
||||
|
||||
---@class LazyState
|
||||
local state = {
|
||||
---@type table<string, LazySpec>
|
||||
specs = {},
|
||||
loaders = require("lazy.core.loader").loaders,
|
||||
config = Config.options,
|
||||
}
|
||||
|
||||
for _, spec in ipairs(Plugin.specs()) do
|
||||
state.specs[spec.modname] = spec
|
||||
for _, plugin in pairs(spec.plugins) do
|
||||
---@cast plugin CachedPlugin
|
||||
for k, v in pairs(plugin) do
|
||||
if type(v) == "function" then
|
||||
if funs[k] then
|
||||
plugin._funs = plugin._funs or {}
|
||||
table.insert(plugin._funs, k)
|
||||
end
|
||||
plugin[k] = nil
|
||||
elseif skip[k] then
|
||||
plugin[k] = nil
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
Cache.set("cache.state", vim.json.encode(state))
|
||||
end
|
||||
|
||||
function M.load()
|
||||
local Plugin = require("lazy.plugin")
|
||||
local dirty = false
|
||||
|
||||
---@type boolean, LazyState?
|
||||
local ok, state = pcall(vim.json.decode, Cache.get("cache.state"))
|
||||
if not (ok and state and vim.deep_equal(Config.options, state.config)) then
|
||||
dirty = true
|
||||
state = nil
|
||||
end
|
||||
|
||||
local function _loader(modname, modpath)
|
||||
local spec = state and state.specs[modname]
|
||||
if (not spec) or Module.is_dirty(modname, modpath) then
|
||||
dirty = true
|
||||
vim.schedule(function()
|
||||
vim.notify("Reloading " .. modname)
|
||||
end)
|
||||
return Plugin.Spec.load(modname, modpath)
|
||||
end
|
||||
---@type LazySpec
|
||||
local loaded = nil
|
||||
|
||||
for name, plugin in pairs(spec.plugins) do
|
||||
---@cast plugin CachedPlugin
|
||||
for _, fun in ipairs(plugin._funs or {}) do
|
||||
plugin[fun] = function(...)
|
||||
loaded = loaded or Plugin.Spec.load(spec.modname, spec.modpath)
|
||||
return loaded.plugins[name][fun](...)
|
||||
end
|
||||
end
|
||||
end
|
||||
return spec
|
||||
end
|
||||
|
||||
Plugin.load(_loader)
|
||||
|
||||
if state and not dirty then
|
||||
require("lazy.core.loader").loaders = state.loaders
|
||||
else
|
||||
Cache.dirty()
|
||||
end
|
||||
|
||||
M.dirty = dirty
|
||||
return not dirty
|
||||
end
|
||||
|
||||
return M
|
||||
|
|
@ -23,7 +23,7 @@ function M.setup(opts)
|
|||
local Util = require("lazy.core.util")
|
||||
local Config = require("lazy.core.config")
|
||||
local Loader = require("lazy.core.loader")
|
||||
local State = require("lazy.core.state")
|
||||
local Plugin = require("lazy.core.plugin")
|
||||
|
||||
Util.track("cache.setup", module_start - cache_start)
|
||||
Util.track("module.setup", require_start - module_start)
|
||||
|
|
@ -36,7 +36,7 @@ function M.setup(opts)
|
|||
Util.track()
|
||||
|
||||
Util.track("state")
|
||||
State.load()
|
||||
Plugin.load()
|
||||
Util.track()
|
||||
|
||||
Util.track("install")
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
local Config = require("lazy.core.config")
|
||||
local Task = require("lazy.task")
|
||||
local Runner = require("lazy.runner")
|
||||
local State = require("lazy.core.state")
|
||||
local Plugin = require("lazy.core.plugin")
|
||||
|
||||
local M = {}
|
||||
|
||||
|
|
@ -107,7 +107,7 @@ end
|
|||
---@param opts? ManagerOpts
|
||||
function M.clean(opts)
|
||||
opts = opts or {}
|
||||
State.update_state(true)
|
||||
Plugin.update_state(true)
|
||||
opts.plugins = vim.tbl_values(Config.to_clean)
|
||||
M.run("clean", opts)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,134 +0,0 @@
|
|||
local Config = require("lazy.core.config")
|
||||
local Util = require("lazy.core.util")
|
||||
local Module = require("lazy.core.module")
|
||||
local State = require("lazy.core.state")
|
||||
|
||||
local M = {}
|
||||
|
||||
---@class LazyPlugin
|
||||
---@field [1] string
|
||||
---@field name string display name and name used for plugin config files
|
||||
---@field uri string
|
||||
---@field branch? string
|
||||
---@field dir string
|
||||
---@field enabled? boolean
|
||||
---@field opt? boolean
|
||||
---@field init? fun(LazyPlugin) Will always be run
|
||||
---@field config? fun(LazyPlugin) Will be executed when loading the plugin
|
||||
---@field event? string|string[]
|
||||
---@field cmd? string|string[]
|
||||
---@field ft? string|string[]
|
||||
---@field module? string|string[]
|
||||
---@field keys? string|string[]
|
||||
---@field requires? string[]
|
||||
---@field loaded? {[string]:string, time:number}
|
||||
---@field installed? boolean
|
||||
---@field run? string|fun()
|
||||
---@field tasks? LazyTask[]
|
||||
---@field dirty? boolean
|
||||
---@field updated? {from:string, to:string}
|
||||
|
||||
---@class LazySpec
|
||||
---@field modname string
|
||||
---@field modpath string
|
||||
---@field plugins table<string, LazyPlugin>
|
||||
local Spec = {}
|
||||
|
||||
---@param modname string
|
||||
---@param modpath string
|
||||
function Spec.load(modname, modpath)
|
||||
local self = setmetatable({}, { __index = Spec })
|
||||
self.plugins = {}
|
||||
self.modname = modname
|
||||
self.modpath = modpath
|
||||
self:normalize(assert(Module.load(modname, modpath)))
|
||||
if modname == Config.options.plugins and not self.plugins["lazy.nvim"] then
|
||||
self:add({ "folke/lazy.nvim", opt = false })
|
||||
end
|
||||
return self
|
||||
end
|
||||
|
||||
---@param plugin LazyPlugin
|
||||
function Spec:add(plugin)
|
||||
if type(plugin[1]) ~= "string" then
|
||||
Util.error("Invalid plugin spec " .. vim.inspect(plugin))
|
||||
end
|
||||
plugin.uri = plugin.uri or ("https://github.com/" .. plugin[1] .. ".git")
|
||||
if not plugin.name then
|
||||
-- PERF: optimized code to get package name without using lua patterns
|
||||
local name = plugin[1]:sub(-4) == ".git" and plugin[1]:sub(1, -5) or plugin[1]
|
||||
local slash = name:reverse():find("/", 1, true) --[[@as number?]]
|
||||
plugin.name = slash and name:sub(#name - slash + 2) or plugin[1]:gsub("%W+", "_")
|
||||
end
|
||||
|
||||
M.process_local(plugin)
|
||||
local other = self.plugins[plugin.name]
|
||||
self.plugins[plugin.name] = other and vim.tbl_extend("force", self.plugins[plugin.name], plugin) or plugin
|
||||
return self.plugins[plugin.name]
|
||||
end
|
||||
|
||||
---@param spec table
|
||||
---@param results? string[]
|
||||
function Spec:normalize(spec, results)
|
||||
results = results or {}
|
||||
if type(spec) == "string" then
|
||||
table.insert(results, self:add({ spec }).name)
|
||||
elseif #spec > 1 or Util.is_list(spec) then
|
||||
---@cast spec table[]
|
||||
for _, s in ipairs(spec) do
|
||||
self:normalize(s, results)
|
||||
end
|
||||
elseif spec.enabled ~= false then
|
||||
local plugin = self:add(spec)
|
||||
plugin.requires = plugin.requires and self:normalize(plugin.requires, {}) or nil
|
||||
table.insert(results, plugin.name)
|
||||
end
|
||||
return results
|
||||
end
|
||||
|
||||
---@param plugin LazyPlugin
|
||||
function M.process_local(plugin)
|
||||
for _, pattern in ipairs(Config.options.plugins_local.patterns) do
|
||||
if plugin[1]:find(pattern, 1, true) then
|
||||
plugin.uri = Config.options.plugins_local.path .. "/" .. plugin.name
|
||||
return
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
---@alias LazySpecLoader fun(modname:string, modpath:string):LazySpec
|
||||
---@param loader? LazySpecLoader
|
||||
function M.specs(loader)
|
||||
loader = loader or Spec.load
|
||||
---@type LazySpec[]
|
||||
local specs = {}
|
||||
table.insert(specs, loader(Config.options.plugins, Config.paths.main))
|
||||
Util.lsmod(Config.paths.plugins, function(name, modpath)
|
||||
table.insert(specs, loader(Config.options.plugins .. "." .. name, modpath))
|
||||
end)
|
||||
return specs
|
||||
end
|
||||
|
||||
---@param loader? LazySpecLoader
|
||||
function M.load(loader)
|
||||
Util.track("specs")
|
||||
local specs = M.specs(loader)
|
||||
Util.track()
|
||||
|
||||
Config.plugins = {}
|
||||
|
||||
for _, spec in ipairs(specs) do
|
||||
for _, plugin in pairs(spec.plugins) do
|
||||
local other = Config.plugins[plugin.name]
|
||||
Config.plugins[plugin.name] = other and vim.tbl_extend("force", other, plugin) or plugin
|
||||
end
|
||||
end
|
||||
|
||||
Util.track("state")
|
||||
State.update_state()
|
||||
Util.track()
|
||||
end
|
||||
|
||||
M.Spec = Spec
|
||||
|
||||
return M
|
||||
|
|
@ -2,7 +2,7 @@ local Config = require("lazy.core.config")
|
|||
local Util = require("lazy.util")
|
||||
local Sections = require("lazy.view.sections")
|
||||
local Loader = require("lazy.core.loader")
|
||||
local State = require("lazy.core.state")
|
||||
local Plugin = require("lazy.core.plugin")
|
||||
|
||||
local Text = require("lazy.view.text")
|
||||
|
||||
|
|
@ -33,7 +33,7 @@ function M:update()
|
|||
self._diagnostics = {}
|
||||
self.plugin_range = {}
|
||||
|
||||
State.update_state(true)
|
||||
Plugin.update_state(true)
|
||||
|
||||
self.plugins = vim.tbl_values(Config.plugins)
|
||||
vim.list_extend(self.plugins, vim.tbl_values(Config.to_clean))
|
||||
|
|
|
|||
Loading…
Reference in New Issue