From 9a0aab039b174625bfc4ff708ba32f3fc5713649 Mon Sep 17 00:00:00 2001 From: champignoom Date: Sun, 17 Sep 2023 01:18:41 +0800 Subject: [PATCH] fix(concealer): avoid conflict between preset and custom icons --- lua/neorg/modules/core/concealer/module.lua | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/lua/neorg/modules/core/concealer/module.lua b/lua/neorg/modules/core/concealer/module.lua index 3855f83a4..b22907f61 100644 --- a/lua/neorg/modules/core/concealer/module.lua +++ b/lua/neorg/modules/core/concealer/module.lua @@ -1391,20 +1391,18 @@ module.on_event = function(event) end module.load = function() - if - not module.imported[module.name .. ".preset_" .. module.config.public.icon_preset].config.private["icon_preset_" .. module.config.public.icon_preset] - then + local icon_preset = module.imported[module.name .. ".preset_" .. module.config.public.icon_preset].config.private["icon_preset_" .. module.config.public.icon_preset] + if not icon_preset then log.error( ("Unable to load icon preset '%s' - such a preset does not exist"):format(module.config.public.icon_preset) ) return end - module.config.public.icons = vim.tbl_deep_extend( + module.config.public = vim.tbl_deep_extend( "force", - module.config.public.icons, - module.imported[module.name .. ".preset_" .. module.config.public.icon_preset].config.private["icon_preset_" .. module.config.public.icon_preset] - or {}, + module.config.public, + { icons = icon_preset }, module.config.custom )