style: cleanup & annotations

This commit is contained in:
Folke Lemaitre 2022-11-28 07:36:32 +01:00
parent 02f5528aa3
commit 9179c0a14d
No known key found for this signature in database
GPG Key ID: 41F8B1FBACAE2040
4 changed files with 42 additions and 38 deletions

View File

@ -1,6 +1,13 @@
local Util = require("lazy.core.util") local Util = require("lazy.core.util")
local Loader = require("lazy.core.loader") local Loader = require("lazy.core.loader")
---@class LazyPluginHandlers
---@field event? string|string[]
---@field cmd? string|string[]
---@field ft? string|string[]
---@field module? string|string[]
---@field keys? string|string[]
local M = {} local M = {}
---@alias LazyHandler fun(grouped:table<string, string[]>) ---@alias LazyHandler fun(grouped:table<string, string[]>)

View File

@ -11,30 +11,36 @@ local funs = { config = true, init = true, run = true }
M.dirty = false M.dirty = false
---@class LazyPlugin ---@class LazyPluginHooks
---@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|(fun():boolean)
---@field opt? boolean
---@field init? fun(LazyPlugin) Will always be run ---@field init? fun(LazyPlugin) Will always be run
---@field config? fun(LazyPlugin) Will be executed when loading the plugin ---@field config? fun(LazyPlugin) Will be executed when loading the plugin
---@field event? string|string[] ---@field run? string|fun()
---@field cmd? string|string[]
---@field ft? string|string[] ---@class LazyPluginState
---@field module? string|string[]
---@field keys? string|string[]
---@field requires? string[]
---@field loaded? {[string]:string, time:number} ---@field loaded? {[string]:string, time:number}
---@field installed? boolean ---@field installed? boolean
---@field run? string|fun()
---@field tasks? LazyTask[] ---@field tasks? LazyTask[]
---@field dirty? boolean ---@field dirty? boolean
---@field updated? {from:string, to:string} ---@field updated? {from:string, to:string}
---@class LazySpec ---@class LazyPluginRef
---@field branch? string
---@field tag? string
---@field commit? string
---@field version? string
---@class LazyPlugin: LazyPluginHandlers,LazyPluginHooks,LazyPluginState,LazyPluginRef
---@field [1] string
---@field name string display name and name used for plugin config files
---@field uri string
---@field dir string
---@field enabled? boolean|(fun():boolean)
---@field opt? boolean
---@field requires? string[]
---@alias LazySpec string|LazyPlugin|LazySpec[]|{requires:LazySpec}
---@class LazySpecLoader
---@field modname string ---@field modname string
---@field modpath string ---@field modpath string
---@field plugins table<string, LazyPlugin> ---@field plugins table<string, LazyPlugin>
@ -77,18 +83,19 @@ function Spec:add(plugin)
return self.plugins[plugin.name] return self.plugins[plugin.name]
end end
---@param spec table ---@param spec LazySpec
---@param results? string[] ---@param results? string[]
function Spec:normalize(spec, results) function Spec:normalize(spec, results)
results = results or {} results = results or {}
if type(spec) == "string" then if type(spec) == "string" then
table.insert(results, self:add({ spec }).name) table.insert(results, self:add({ spec }).name)
elseif #spec > 1 or Util.is_list(spec) then elseif #spec > 1 or Util.is_list(spec) then
---@cast spec table[] ---@cast spec LazySpec[]
for _, s in ipairs(spec) do for _, s in ipairs(spec) do
self:normalize(s, results) self:normalize(s, results)
end end
elseif spec.enabled == nil or spec.enabled == true or (type(spec.enabled) == "function" and spec.enabled()) then elseif spec.enabled == nil or spec.enabled == true or (type(spec.enabled) == "function" and spec.enabled()) then
---@cast spec LazyPlugin
local plugin = self:add(spec) local plugin = self:add(spec)
plugin.requires = plugin.requires and self:normalize(plugin.requires, {}) or nil plugin.requires = plugin.requires and self:normalize(plugin.requires, {}) or nil
table.insert(results, plugin.name) table.insert(results, plugin.name)
@ -96,10 +103,10 @@ function Spec:normalize(spec, results)
return results return results
end end
---@param spec LazySpec ---@param spec LazySpecLoader
function Spec.revive(spec) function Spec.revive(spec)
if spec.funs then if spec.funs then
---@type LazySpec ---@type LazySpecLoader
local loaded = nil local loaded = nil
for fun, plugins in pairs(spec.funs) do for fun, plugins in pairs(spec.funs) do
for _, name in pairs(plugins) do for _, name in pairs(plugins) do
@ -160,9 +167,9 @@ function M.process_local(plugin)
end end
end end
---@param cache? table<string,LazySpec> ---@param cache? table<string,LazySpecLoader>
function M.specs(cache) function M.specs(cache)
---@type LazySpec[] ---@type LazySpecLoader[]
local specs = {} local specs = {}
local function _load(name, modpath) local function _load(name, modpath)
@ -215,7 +222,7 @@ end
function M.save() function M.save()
---@class LazyState ---@class LazyState
local state = { local state = {
---@type table<string, LazySpec> ---@type table<string, LazySpecLoader>
specs = {}, specs = {},
handlers = require("lazy.core.handler").group(Config.plugins, true), handlers = require("lazy.core.handler").group(Config.plugins, true),
config = Config.options, config = Config.options,

View File

@ -52,11 +52,11 @@ function M.try(fn, msg)
end end
level = level + 1 level = level + 1
end end
msg = msg .. "\n\n" .. err
if #trace > 0 then
msg = msg .. "\n\n# stacktrace:\n" .. table.concat(trace, "\n")
end
vim.schedule(function() vim.schedule(function()
msg = msg .. "\n\n" .. err
if #trace > 0 then
msg = msg .. "\n\n# stacktrace:\n" .. table.concat(trace, "\n")
end
M.error(msg) M.error(msg)
end) end)
return err return err

View File

@ -55,6 +55,7 @@ function M.spawn(cmd, opts)
return return
end end
---@param data? string
local function on_output(err, data) local function on_output(err, data)
assert(not err, err) assert(not err, err)
@ -76,15 +77,4 @@ function M.spawn(cmd, opts)
return handle return handle
end end
-- FIXME: can be removed?
function M.all_done(slot0)
for slot4, slot5 in ipairs(slot0) do
if slot5 and not slot5:is_closing() then
return false
end
end
return true
end
return M return M