mirror/LazyVim.LazyVim
1
0
Fork 0
mirror of https://github.com/LazyVim/LazyVim.git synced 2025-06-23 01:08:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(extras): make sure we use priorities to import extras in correct order

Browse source
This commit is contained in:
Folke Lemaitre 2023-10-12 11:14:02 +02:00
parent 3256abda65
commit a4e393154f
2 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lua/lazyvim/plugins/xtras.lua
View file

@ -1,5 +1,22 @@
local Config = require("lazyvim.config") local Config = require("lazyvim.config")
-- Some extras need to be loaded before others
local prios = {
["editor.aerial"] = 100,
["editor.symbols-outline"] = 100,
["test.core"] = 1,
["dap.core"] = 1,
}
table.sort(Config.json.data.extras, function(a, b)
local pa = prios[a] or 10
local pb = prios[b] or 10
if pa == pb then
return a < b
end
return pa < pb
end)
---@param extra string ---@param extra string
return vim.tbl_map(function(extra) return vim.tbl_map(function(extra)
return { import = "lazyvim.plugins.extras." .. extra } return { import = "lazyvim.plugins.extras." .. extra }

15
lua/lazyvim/util/extras.lua
View file

@ -16,12 +16,6 @@ local Util = require("lazyvim.util")
---@class lazyvim.util.extras ---@class lazyvim.util.extras
local M = {} local M = {}
M.prios = {
["editor.aerial"] = 100,
["test.core"] = 1,
["dap.core"] = 1,
}
M.ns = vim.api.nvim_create_namespace("lazyvim.extras") M.ns = vim.api.nvim_create_namespace("lazyvim.extras")
---@type string[] ---@type string[]
M.state = nil M.state = nil
@ -115,14 +109,7 @@ function X:toggle()
table.insert(Config.json.data.extras, extra.name) table.insert(Config.json.data.extras, extra.name)
M.state[#M.state + 1] = "lazyvim.plugins.extras." .. extra.name M.state[#M.state + 1] = "lazyvim.plugins.extras." .. extra.name
end end
table.sort(Config.json.data.extras, function(a, b) table.sort(Config.json.data.extras)
local pa = M.prios[a] or 10
local pb = M.prios[b] or 10
if pa == pb then
return a < b
end
return pa < pb
end)
Config.json.save() Config.json.save()
Util.info( Util.info(
"`" "`"