subcrip
/
lazy.nvim
mirror of https://github.com/folke/lazy.nvim.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor(config): package_path => packpath

This commit is contained in:
Folke Lemaitre 2022-11-29 00:14:23 +01:00
parent fb84c081b0
commit 2fa5be3779
No known key found for this signature in database
GPG Key ID: 41F8B1FBACAE2040
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lua/lazy/core/config.lua
View File

@ -12,7 +12,7 @@ M.defaults = {
patterns = {}, patterns = {},
}, },
interactive = true, interactive = true,
package_path = vim.fn.stdpath("data") .. "/site/pack/lazy", packpath = vim.fn.stdpath("data") .. "/site/pack/lazy",
view = { view = {
icons = { icons = {
start = "", start = "",

6
lua/lazy/core/plugin.lua
View File

@ -130,7 +130,7 @@ function M.update_state(check_clean)
---@type table<"opt"|"start", table<string,FileType>> ---@type table<"opt"|"start", table<string,FileType>>
local installed = { opt = {}, start = {} } local installed = { opt = {}, start = {} }
for opt, packs in pairs(installed) do for opt, packs in pairs(installed) do
Util.ls(Config.options.package_path .. "/" .. opt, function(_, name, type) Util.ls(Config.options.packpath .. "/" .. opt, function(_, name, type)
if type == "directory" or type == "link" then if type == "directory" or type == "link" then
packs[name] = type packs[name] = type
end end
@ -144,7 +144,7 @@ function M.update_state(check_clean)
plugin.opt = Config.options.opt plugin.opt = Config.options.opt
end end
local opt = plugin.opt and "opt" or "start" local opt = plugin.opt and "opt" or "start"
plugin.dir = Config.options.package_path .. "/" .. opt .. "/" .. plugin.name plugin.dir = Config.options.packpath .. "/" .. opt .. "/" .. plugin.name
plugin._.is_local = plugin.uri:sub(1, 4) ~= "http" and plugin.uri:sub(1, 3) ~= "git" plugin._.is_local = plugin.uri:sub(1, 4) ~= "http" and plugin.uri:sub(1, 3) ~= "git"
plugin._.is_symlink = installed[opt][plugin.name] == "link" plugin._.is_symlink = installed[opt][plugin.name] == "link"
plugin._.installed = installed[opt][plugin.name] ~= nil plugin._.installed = installed[opt][plugin.name] ~= nil
@ -160,7 +160,7 @@ function M.update_state(check_clean)
table.insert(Config.to_clean, { table.insert(Config.to_clean, {
name = pack, name = pack,
pack = pack, pack = pack,
dir = Config.options.package_path .. "/" .. opt .. "/" .. pack, dir = Config.options.packpath .. "/" .. opt .. "/" .. pack,
opt = opt == "opt", opt = opt == "opt",
_ = { _ = {
installed = true, installed = true,

4
lua/lazy/core/util.lua
View File

@ -40,8 +40,8 @@ function M.try(fn, msg)
end end
if info.what == "Lua" and not info.source:find("lazy.nvim") then if info.what == "Lua" and not info.source:find("lazy.nvim") then
local source = info.source:sub(2) local source = info.source:sub(2)
if source:find(Config.options.package_path, 1, true) == 1 then if source:find(Config.options.packpath, 1, true) == 1 then
source = source:sub(#Config.options.package_path + 1):gsub("^/opt/", ""):gsub("^/start/", "") source = source:sub(#Config.options.packpath + 1):gsub("^/opt/", ""):gsub("^/start/", "")
end end
source = vim.fn.fnamemodify(source, ":p:~:.") source = vim.fn.fnamemodify(source, ":p:~:.")
local line = " - " .. source .. ":" .. info.currentline local line = " - " .. source .. ":" .. info.currentline