diff options
| -rw-r--r-- | lua/no-clown-fiesta/highlight-group/treesitter.lua | 14 | ||||
| -rw-r--r-- | lua/no-clown-fiesta/highlights.lua | 12 |
2 files changed, 14 insertions, 12 deletions
diff --git a/lua/no-clown-fiesta/highlight-group/treesitter.lua b/lua/no-clown-fiesta/highlight-group/treesitter.lua index 4ca2816..05ba713 100644 --- a/lua/no-clown-fiesta/highlight-group/treesitter.lua +++ b/lua/no-clown-fiesta/highlight-group/treesitter.lua @@ -1,18 +1,20 @@ local M = {} +local unpack = table.unpack + function M.highlight(palette, options) return { - ["@comment"] = { fg = palette.medium_gray, style = options.style.comments }, + ["@comment"] = { fg = palette.medium_gray, unpack(options.style.comments) }, ["@annotation"] = { fg = palette.white }, ["@attribute"] = { fg = palette.white }, ["@constructor"] = { fg = palette.cyan }, - ["@type"] = { fg = palette.white, style = options.style.type }, + ["@type"] = { fg = palette.white, unpack(options.style.type) }, ["@type.builtin"] = { fg = palette.white }, ["@conditional"] = { fg = palette.gray_blue }, ["@exception"] = { fg = palette.red }, ["@include"] = { fg = palette.red }, - ["@keyword"] = { fg = palette.gray_blue, style = options.style.keywords }, - ["@keyword.function"] = { fg = palette.gray_blue, style = options.style.keywords }, + ["@keyword"] = { fg = palette.gray_blue, unpack(options.style.keywords) }, + ["@keyword.function"] = { fg = palette.gray_blue, unpack(options.style.keywords) }, ["@label"] = { fg = palette.white }, ["@namespace"] = { fg = palette.white }, ["@repeat"] = { fg = palette.gray_blue }, @@ -23,12 +25,12 @@ function M.highlight(palette, options) ["@boolean"] = { fg = palette.red }, ["@character"] = { fg = palette.light_green }, ["@error"] = { fg = palette.error_red }, - ["@function"] = { fg = palette.cyan, style = options.style.functions }, + ["@function"] = { fg = palette.cyan, unpack(options.style.functions) }, ["@function.builtin"] = { fg = palette.cyan }, ["@method"] = { fg = palette.cyan }, ["@const.macro"] = { fg = palette.cyan }, ["@function.macro"] = { fg = palette.cyan }, - ["@variable"] = { fg = palette.white, style = options.style.variables }, + ["@variable"] = { fg = palette.white, unpack(options.style.variables) }, ["@variable.builtin"] = { fg = palette.white }, ["@property"] = { fg = palette.white }, ["@operator"] = { fg = palette.white }, diff --git a/lua/no-clown-fiesta/highlights.lua b/lua/no-clown-fiesta/highlights.lua index 131077b..5efc1a9 100644 --- a/lua/no-clown-fiesta/highlights.lua +++ b/lua/no-clown-fiesta/highlights.lua @@ -19,7 +19,7 @@ function M.highlight(palette, options) PmenuSel = { fg = palette.blue, bg = palette.alt_bg }, WildMenu = { fg = palette.blue, bg = palette.alt_bg }, CursorLineNr = { fg = palette.light_gray, style = "bold" }, - Comment = { fg = palette.medium_gray, style = options.style.comments }, + Comment = { fg = palette.medium_gray, unpack(options.style.comments) }, Folded = { fg = palette.light_gray, bg = palette.alt_bg }, FoldColumn = { fg = palette.light_gray, bg = palette.alt_bg }, LineNr = { fg = palette.gray }, @@ -63,7 +63,7 @@ function M.highlight(palette, options) Question = { fg = palette.cyan }, EndOfBuffer = { fg = palette.bg }, NonText = { fg = palette.bg }, - Variable = { fg = palette.white, style = options.style.variables }, + Variable = { fg = palette.white, unpack(options.style.variables) }, String = { fg = palette.medium_gray_blue }, Character = { fg = palette.light_green }, Constant = { fg = palette.white }, @@ -71,13 +71,13 @@ function M.highlight(palette, options) Boolean = { fg = palette.red }, Float = { fg = palette.red }, Identifier = { fg = palette.white }, - Function = { fg = palette.cyan, style = options.style.functions }, + Function = { fg = palette.cyan, unpack(options.style.functions) }, Operator = { fg = palette.white }, - Type = { fg = palette.white, style = options.style.type }, + Type = { fg = palette.white, unpack(options.style.type) }, StorageClass = { fg = palette.gray_blue }, Structure = { fg = palette.gray_blue }, Typedef = { fg = palette.white }, - Keyword = { fg = palette.gray_blue, style = options.style.keywords }, + Keyword = { fg = palette.gray_blue, unpack(options.style.keywords) }, Statement = { fg = palette.gray_blue }, Conditional = { fg = palette.gray_blue }, Repeat = { fg = palette.gray_blue }, @@ -93,7 +93,7 @@ function M.highlight(palette, options) Tag = { fg = palette.pale_purple }, Debug = { fg = palette.red }, Delimiter = { fg = palette.white }, - SpecialComment = { fg = palette.medium_gray, style = options.style.comments }, + SpecialComment = { fg = palette.medium_gray, unpack(options.style.comments) }, Underlined = { style = "underline" }, Bold = { style = "bold" }, Italic = { style = "italic" }, |