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

fix(highlite): `t_Co` invalid option 

A recent change to `vim.o` caused `t_Co` to be not recognized when
indexing through this option table. Using `vim.go` works as intended.
This commit is contained in:
Iron-E 2021-05-29 18:38:30 -04:00
parent ff28f2dde4
commit 9c15a789df
No known key found for this signature in database
GPG Key ID: 19B71B7B7B021D22
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lua/highlite.lua
View File

@ -10,6 +10,7 @@ local vim = vim
local api = vim.api local api = vim.api
local exe = api.nvim_command local exe = api.nvim_command
local fn = vim.fn local fn = vim.fn
local go = vim.go
--[[ --[[
/* /*
@ -26,8 +27,8 @@ local _TYPE_STRING = 'string'
local _TYPE_TABLE = 'table' local _TYPE_TABLE = 'table'
-- Determine which set of colors to use. -- Determine which set of colors to use.
local _USE_HEX = vim.o.termguicolors local _USE_HEX = go.termguicolors
local _USE_256 = tonumber(vim.o.t_Co) > 255 local _USE_256 = tonumber(go.t_Co) > 255
or string.find(vim.env.TERM, '256') or string.find(vim.env.TERM, '256')
--[[ --[[
@ -88,7 +89,7 @@ local function tohex(rgb) return string.format('#%06x', rgb) end
-- Load specific &bg instructions -- Load specific &bg instructions
local function use_background_with(attributes) local function use_background_with(attributes)
return setmetatable( return setmetatable(
attributes[vim.o.background], attributes[go.background],
{['__index'] = attributes} {['__index'] = attributes}
) )
end end
@ -102,7 +103,7 @@ end
local highlite = {} local highlite = {}
function highlite.group(group_name) function highlite.group(group_name)
local no_errors, group_definition = pcall(api.nvim_get_hl_by_name, group_name, vim.o.termguicolors) local no_errors, group_definition = pcall(api.nvim_get_hl_by_name, group_name, go.termguicolors)
if not no_errors then group_definition = {} end if not no_errors then group_definition = {} end
@ -132,7 +133,7 @@ function highlite.highlight(highlight_group, attributes) -- {{{ †
highlight_cmd[5] = attributes highlight_cmd[5] = attributes
else -- The `highlight_group` is uniquely defined. else -- The `highlight_group` is uniquely defined.
-- Take care of special instructions for certain background colors. -- Take care of special instructions for certain background colors.
if attributes[vim.o.background] then if attributes[go.background] then
attributes = use_background_with(attributes) attributes = use_background_with(attributes)
end end
@ -154,7 +155,7 @@ end --}}} ‡
function highlite:highlight_terminal(terminal_ansi_colors) function highlite:highlight_terminal(terminal_ansi_colors)
for index, color in ipairs(terminal_ansi_colors) do vim.g['terminal_color_'..(index-1)] = for index, color in ipairs(terminal_ansi_colors) do vim.g['terminal_color_'..(index-1)] =
vim.o.termguicolors and color[_PALETTE_HEX] or color[_PALETTE_256] or get(color, _PALETTE_ANSI) go.termguicolors and color[_PALETTE_HEX] or color[_PALETTE_256] or get(color, _PALETTE_ANSI)
end end
end end
@ -186,7 +187,7 @@ return setmetatable(highlite, {['__call'] = function(self, normal, highlights, t
color_name = nil color_name = nil
-- If we aren't using hex nor 256 colorsets. -- If we aren't using hex nor 256 colorsets.
if not (_USE_HEX or _USE_256) then vim.o.t_Co = '16' end if not (_USE_HEX or _USE_256) then go.t_Co = '16' end
-- Highlight the baseline. -- Highlight the baseline.
self.highlight('Normal', normal) self.highlight('Normal', normal)