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

Initial simplification before light/dark support

This commit is contained in:
Iron_E 2020-09-06 12:33:48 -04:00
parent c717579f6c
commit 576ea2b6a1
No known key found for this signature in database
GPG Key ID: B0B37DE7EDC2335F
1 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lua/highlite.lua
View File

@ -23,7 +23,6 @@ if not using_hex_or_256 then vim.o.t_Co = 16 end
local PALETTE_ANSI = 3 local PALETTE_ANSI = 3
local PALETTE_256 = 2 local PALETTE_256 = 2
local PALETTE_HEX = 1 local PALETTE_HEX = 1
local NONE = "NONE"
-- Get the color value of a color variable, or "NONE" as a default. -- Get the color value of a color variable, or "NONE" as a default.
local function get(color, index) local function get(color, index)
@ -32,27 +31,42 @@ local function get(color, index)
elseif type(color) == 'string' then elseif type(color) == 'string' then
return color return color
else else
return NONE return "NONE"
end
end
-- Add the 'blend' parameter to some highlight command, if there is one.
local function blend(command, attributes)
if attributes.blend then -- There is a value for the `highlight-blend` field.
command[#command + 1] = ' blend='..attributes.blend
end end
end end
--[[ If using hex and 256-bit colors, then populate the gui* and cterm* args. --[[ If using hex and 256-bit colors, then populate the gui* and cterm* args.
If using 16-bit colors, just populate the cterm* args. ]] If using 16-bit colors, just populate the cterm* args. ]]
local colorize = using_hex_or_256 and function(command, attributes) command[#command + 1] = local colorize = using_hex_or_256 and function(command, attributes)
command[#command + 1] =
' ctermbg='..get(attributes.bg, PALETTE_256) ' ctermbg='..get(attributes.bg, PALETTE_256)
..' ctermfg='..get(attributes.fg, PALETTE_256) ..' ctermfg='..get(attributes.fg, PALETTE_256)
..' guibg='..get(attributes.bg, PALETTE_HEX) ..' guibg='..get(attributes.bg, PALETTE_HEX)
..' guifg='..get(attributes.fg, PALETTE_HEX) ..' guifg='..get(attributes.fg, PALETTE_HEX)
end or function(command, attributes) command[#command + 1] = blend(command, attributes)
end or function(command, attributes)
command[#command + 1] =
' ctermbg='..get(attributes.bg, PALETTE_ANSI) ' ctermbg='..get(attributes.bg, PALETTE_ANSI)
..' ctermfg='..get(attributes.fg, PALETTE_ANSI) ..' ctermfg='..get(attributes.fg, PALETTE_ANSI)
blend(command, attributes)
end end
-- This function appends `selected_attributes` to the end of `highlight_cmd`. -- This function appends `selected_attributes` to the end of `highlight_cmd`.
local stylize = using_hex_or_256 and function(command, attributes) local stylize = using_hex_or_256 and function(command, style, color)
command[#command + 1] = ' cterm='..attributes..' gui='..attributes command[#command + 1] = ' cterm='..style..' gui='..style
end or function(command, attributes)
command[#command + 1] = ' cterm='..attributes if color then -- There is an undercurl color.
command[#command + 1] = ' guisp='..get(color, PALETTE_HEX)
end
end or function(command, style)
command[#command + 1] = ' cterm='..style
end end
-- Generate a `:highlight` command from a group and some attributes. -- Generate a `:highlight` command from a group and some attributes.
@ -68,18 +82,10 @@ local function highlight(highlight_group, attributes) -- {{{ †
else -- The `highlight_group` is uniquely defined. else -- The `highlight_group` is uniquely defined.
colorize(highlight_cmd, attributes) colorize(highlight_cmd, attributes)
if attributes.blend then -- There is a value for the `highlight-blend` field. local style = attributes.style
highlight_cmd[#highlight_cmd + 1] = ' blend='..attributes.blend
end
local style = attributes.style or NONE
if type(style) == 'table' then if type(style) == 'table' then
-- Concat all of the entries together with a comma between before styling. -- Concat all of the entries together with a comma between before styling.
stylize(highlight_cmd, table.concat(style, ',')) stylize(highlight_cmd, table.concat(style, ','), style.color)
if style.color then -- there won't is a color for undercurl.
highlight_cmd[#highlight_cmd + 1] = ' guisp='..get(style.color, PALETTE_HEX)
end
else -- just style the single entry. else -- just style the single entry.
stylize(highlight_cmd, style) stylize(highlight_cmd, style)
end end