mirror of
https://github.com/rose-pine/neovim.git
synced 2025-10-15 12:38:53 +02:00
Merge canary (#114)
* feat!: use new highlight api
* feat: support custom highlight blending
Example:
```
{
highlight_groups = {
StatusLine = { bg = 'love', blend = 10 }
}
}
```
* refactor: move config into separate file
* wip: update semantic tokens
* ci: add issue templates
Thanks to https://github.com/folke/lazy.nvim for the inspiration!
* ci: fix template formatting
* chore: update editorconfig
* fix: decouple more backgrounds from floats
* change `@tag.attribute` to iris
* add cursor highlights
Closes #121
* match link underline colour
* improve `dim_nc_background` behaviour
ref #123
* feat: expose each variant as individual theme
ref #98
* feat: update tokens
ref #107
* feat: distinguish between `CmpItemKind`'s
This commit is contained in:
parent
845a6ad544
commit
4eac261d57
10 changed files with 634 additions and 616 deletions
|
|
@ -33,11 +33,11 @@ end
|
|||
---@param bg string background color
|
||||
---@param alpha number number between 0 (background) and 1 (foreground)
|
||||
util.blend = function(fg, bg, alpha)
|
||||
fg = rgb(parse_color(fg))
|
||||
bg = rgb(parse_color(bg))
|
||||
local fg_rgb = rgb(parse_color(fg))
|
||||
local bg_rgb = rgb(parse_color(bg))
|
||||
|
||||
local function blend_channel(i)
|
||||
local ret = (alpha * fg[i] + ((1 - alpha) * bg[i]))
|
||||
local ret = (alpha * fg_rgb[i] + ((1 - alpha) * bg_rgb[i]))
|
||||
return math.floor(math.min(math.max(0, ret), 255) + 0.5)
|
||||
end
|
||||
|
||||
|
|
@ -50,18 +50,22 @@ util.blend = function(fg, bg, alpha)
|
|||
end
|
||||
|
||||
---@param group string
|
||||
---@param color table<string, string>
|
||||
---@param color table<string, any>
|
||||
util.highlight = function(group, color)
|
||||
local style = color.style and 'gui=' .. color.style or 'gui=NONE'
|
||||
local fg = color.fg and 'guifg=' .. parse_color(color.fg) or 'guifg=NONE'
|
||||
local bg = color.bg and 'guibg=' .. parse_color(color.bg) or 'guibg=NONE'
|
||||
local sp = color.sp and 'guisp=' .. parse_color(color.sp) or ''
|
||||
local fg = color.fg and parse_color(color.fg) or 'none'
|
||||
local bg = color.bg and parse_color(color.bg) or 'none'
|
||||
local sp = color.sp and parse_color(color.sp) or ''
|
||||
|
||||
vim.cmd(string.format('highlight %s %s %s %s %s', group, style, fg, bg, sp))
|
||||
|
||||
if color.link then
|
||||
vim.cmd(string.format('highlight! link %s %s', group, color.link))
|
||||
if
|
||||
color.blend ~= nil
|
||||
and (color.blend >= 0 or color.blend <= 100)
|
||||
and bg ~= nil
|
||||
then
|
||||
bg = util.blend(bg, parse_color('base') or '', color.blend / 100)
|
||||
end
|
||||
|
||||
color = vim.tbl_extend('force', color, { fg = fg, bg = bg, sp = sp })
|
||||
vim.api.nvim_set_hl(0, group, color)
|
||||
end
|
||||
|
||||
return util
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue