rayelliott
/
paper-tonic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

style(highlite): inline __call specification

This commit is contained in:
Iron-E 2021-01-26 12:54:04 -05:00
parent 8757a6c228
commit 2798132cdf
No known key found for this signature in database
GPG Key ID: 19B71B7B7B021D22
1 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
lua/highlite.lua
View File

@ -158,50 +158,47 @@ function highlite:highlight_terminal(terminal_ansi_colors)
end end
end end
return setmetatable(highlite, { return setmetatable(highlite, {['__call'] = function(self, normal, highlights, terminal_ansi_colors)
['__call'] = function(self, normal, highlights, terminal_ansi_colors) -- function to resolve function highlight groups being defined by function calls.
-- function to resolve function highlight groups being defined by function calls. local function resolve(tbl, key, resolve_links)
local function resolve(tbl, key, resolve_links) local value = tbl[key]
local value = tbl[key] local value_type = type(value)
local value_type = type(value) if value_type == 'function' then
if value_type == 'function' then -- lazily cache the result; next time, if it isn't a function this step will be skipped
-- lazily cache the result; next time, if it isn't a function this step will be skipped tbl[key] = value(setmetatable({}, {
tbl[key] = value(setmetatable({}, { ['__index'] = function(_, inner_key) return resolve(tbl, inner_key, true) end
['__index'] = function(_, inner_key) return resolve(tbl, inner_key, true) end }))
})) elseif value_type == _TYPE_STRING and not string.find(value, '^#') and resolve_links then
elseif value_type == _TYPE_STRING and not string.find(value, '^#') and resolve_links then return resolve(tbl, tbl[key], resolve_links)
return resolve(tbl, tbl[key], resolve_links)
end
return tbl[key]
end end
return tbl[key]
-- save the colors_name before syntax reset
local color_name = vim.g.colors_name
-- Clear the highlighting.
exe 'hi clear'
-- If the syntax has been enabled, reset it.
if fn.exists 'syntax_on' then exe 'syntax reset' end
-- replace the colors_name
vim.g.colors_name = color_name
color_name = nil
-- If we aren't using hex nor 256 colorsets.
if not (_USE_HEX or _USE_256) then vim.o.t_Co = '16' end
-- Highlight the baseline.
self.highlight('Normal', normal)
-- Highlight everything else.
for highlight_group, _ in pairs(highlights) do
self.highlight(highlight_group, resolve(highlights, highlight_group, false))
end
-- Set the terminal highlight colors.
self:highlight_terminal(terminal_ansi_colors)
end end
})
-- save the colors_name before syntax reset
local color_name = vim.g.colors_name
-- Clear the highlighting.
exe 'hi clear'
-- If the syntax has been enabled, reset it.
if fn.exists 'syntax_on' then exe 'syntax reset' end
-- replace the colors_name
vim.g.colors_name = color_name
color_name = nil
-- If we aren't using hex nor 256 colorsets.
if not (_USE_HEX or _USE_256) then vim.o.t_Co = '16' end
-- Highlight the baseline.
self.highlight('Normal', normal)
-- Highlight everything else.
for highlight_group, _ in pairs(highlights) do
self.highlight(highlight_group, resolve(highlights, highlight_group, false))
end
-- Set the terminal highlight colors.
self:highlight_terminal(terminal_ansi_colors)
end})