|
|
|
@ -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"
|
|
|
|
|
|
|
|
|
|
|
|
|