mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(loader): add typing for package.loaders

Browse Source
This commit is contained in:
Lewis Russell
2023-03-26 12:49:38 +01:00
parent fab8dab6b6
commit ffd8cd1a96
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
runtime/lua/vim/loader.lua
View File

@@ -1,5 +1,8 @@
local uv = vim.loop local uv = vim.loop
--- @type (fun(modename: string): fun()|string)[]
local loaders = package.loaders
local M = {} local M = {}
---@alias CacheHash {mtime: {sec:number, nsec:number}, size:number} ---@alias CacheHash {mtime: {sec:number, nsec:number}, size:number}
@@ -399,13 +402,13 @@ function M.enable()
vim.fn.mkdir(vim.fn.fnamemodify(M.path, ':p'), 'p') vim.fn.mkdir(vim.fn.fnamemodify(M.path, ':p'), 'p')
_G.loadfile = Loader.loadfile _G.loadfile = Loader.loadfile
-- add lua loader -- add lua loader
table.insert(package.loaders, 2, Loader.loader) table.insert(loaders, 2, Loader.loader)
-- add libs loader -- add libs loader
table.insert(package.loaders, 3, Loader.loader_lib) table.insert(loaders, 3, Loader.loader_lib)
-- remove Neovim loader -- remove Neovim loader
for l, loader in ipairs(package.loaders) do for l, loader in ipairs(loaders) do
if loader == vim._load_package then if loader == vim._load_package then
table.remove(package.loaders, l) table.remove(loaders, l)
break break
end end
end end
@@ -420,13 +423,12 @@ function M.disable()
end end
M.enabled = false M.enabled = false
_G.loadfile = Loader._loadfile _G.loadfile = Loader._loadfile
---@diagnostic disable-next-line: no-unknown for l, loader in ipairs(loaders) do
for l, loader in ipairs(package.loaders) do
if loader == Loader.loader or loader == Loader.loader_lib then if loader == Loader.loader or loader == Loader.loader_lib then
table.remove(package.loaders, l) table.remove(loaders, l)
end end
end end
table.insert(package.loaders, 2, vim._load_package) table.insert(loaders, 2, vim._load_package)
end end
--- Return the top-level `/lua/*` modules for this path --- Return the top-level `/lua/*` modules for this path
@@ -466,9 +468,9 @@ end
--- Debug function that wrapps all loaders and tracks stats --- Debug function that wrapps all loaders and tracks stats
---@private ---@private
function M._profile_loaders() function M._profile_loaders()
for l, loader in pairs(package.loaders) do for l, loader in pairs(loaders) do
local loc = debug.getinfo(loader, 'Sn').source:sub(2) local loc = debug.getinfo(loader, 'Sn').source:sub(2)
package.loaders[l] = function(modname) loaders[l] = function(modname)
local start = vim.loop.hrtime() local start = vim.loop.hrtime()
local ret = loader(modname) local ret = loader(modname)
Loader.track('loader ' .. l .. ': ' .. loc, start) Loader.track('loader ' .. l .. ': ' .. loc, start)