gabehf/base46
1
0
Fork 0
mirror of https://github.com/gabehf/base46.git synced 2026-03-15 10:15:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix color names not working for hl_add

Browse source
This commit is contained in:
siduck 2023-02-06 15:01:26 +05:30
parent a05577bf6b
commit 226f4b3d4e
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lua/base46/init.lua
View file

@ -22,16 +22,15 @@ M.merge_tb = function(table1, table2)
return vim.tbl_deep_extend("force", table1, table2) return vim.tbl_deep_extend("force", table1, table2)
end end
M.turn_str_to_color = function(tb_in) M.turn_str_to_color = function(tb)
local tb = vim.deepcopy(tb_in)
local colors = M.get_theme_tb "base_30" local colors = M.get_theme_tb "base_30"
for _, groups in pairs(tb) do for _, hlgroups in pairs(tb) do
for k, v in pairs(groups) do for opt, val in pairs(hlgroups) do
if k == "fg" or k == "bg" then if opt == "fg" or opt == "bg" then
if v:sub(1, 1) == "#" or v == "none" or v == "NONE" then if val:sub(1, 1) == "#" or val == "none" or val == "NONE" then
else else
groups[k] = colors[v] hlgroups[opt] = colors[val]
end end
end end
end end
@ -120,7 +119,6 @@ M.saveStr_to_cache = function(filename, tb)
end end
M.compile = function() M.compile = function()
-- All integration modules, each file returns a table -- All integration modules, each file returns a table
local hl_files = vim.g.base46_custom_path or vim.fn.stdpath "data" .. "/lazy/base46/lua/base46/integrations" local hl_files = vim.g.base46_custom_path or vim.fn.stdpath "data" .. "/lazy/base46/lua/base46/integrations"

5
lua/base46/integrations/defaults.lua
View file

@ -255,4 +255,7 @@ local defaults = {
local merge_tb = require("base46").merge_tb local merge_tb = require("base46").merge_tb
defaults = merge_tb(defaults, require("base46").load_highlight "statusline") defaults = merge_tb(defaults, require("base46").load_highlight "statusline")
return merge_tb(defaults, require("core.utils").load_config().ui.hl_add) local hexify_ColorStrs = require("base46").turn_str_to_color
local user_new_highlights = require("core.utils").load_config().ui.hl_add
return merge_tb(defaults, hexify_ColorStrs(user_new_highlights))