From d65968c58c8ec3f79f8d97c224f21b7352b21b43 Mon Sep 17 00:00:00 2001 From: Daniel Hill <9439488+blazkowolf@users.noreply.github.com> Date: Sat, 25 Mar 2023 21:58:47 -0400 Subject: [PATCH] fix: fix `Pmenu` highlight error --- lua/gruber-darker.lua | 36 +++++++++++++++------------- lua/gruber-darker/highlights/vim.lua | 2 +- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/lua/gruber-darker.lua b/lua/gruber-darker.lua index a4440a6..e61ba8a 100644 --- a/lua/gruber-darker.lua +++ b/lua/gruber-darker.lua @@ -11,6 +11,25 @@ function M.on_colorscheme() vim.cmd([[augroup! GruberDarker]]) end +local function create_autocmds() + local gruber_darker_group = vim.api.nvim_create_augroup("GruberDarker", { clear = true }) + vim.api.nvim_create_autocmd("ColorSchemePre", { + group = gruber_darker_group, + pattern = "*", + callback = function() + require("gruber-darker").on_colorscheme() + end, + }) + + vim.api.nvim_create_autocmd("FileType", { + group = gruber_darker_group, + pattern = "qf,help", + callback = function() + vim.cmd.setlocal("winhighlight=Normal:NormalSB,SignColumn:SignColumnSB") + end, + }) +end + ---Clear current highlights and set Neovim global `colors_name` function M.load() if vim.g.colors_name then @@ -22,22 +41,7 @@ function M.load() highlights.setup() - local gruber_darker_group = vim.api.nvim_create_augroup("GruberDarker", { clear = true }) - vim.api.nvim_create_autocmd("ColorSchemePre", { - group = gruber_darker_group, - pattern = "*", - callback = function() - require("gruber-darker").on_colorscheme() - end, - }) - - -- vim.api.nvim_create_autocmd("FileType", { - -- group = gruber_darker_group, - -- pattern = "qf,help", - -- callback = function() - -- vim.cmd.setlocal("winhighlight=Normal:NormalSB,SignColumn:SignColumnSB") - -- end, - -- }) + create_autocmds() end ---Change colorscheme to GruberDarker diff --git a/lua/gruber-darker/highlights/vim.lua b/lua/gruber-darker/highlights/vim.lua index cbb899e..6ce92ef 100644 --- a/lua/gruber-darker/highlights/vim.lua +++ b/lua/gruber-darker/highlights/vim.lua @@ -87,7 +87,7 @@ M.highlights.float_border = Highlight.new("FloatBorder", { fg = c.default["bg+2" ---Popup menu: normal item. M.highlights.popup_menu = Highlight.new("Pmenu", { fg = c.default.fg, bg = c.default["bg+1"] }) ---Popup menu: selected item. -M.highlights.popup_menu = Highlight.new("PmenuSel", { fg = c.default.fg, bg = c.default["bg+2"] }) +M.highlights.popup_menu_sel = Highlight.new("PmenuSel", { fg = c.default.fg, bg = c.default["bg+2"] }) ---Popup menu: scrollbar. M.highlights.popup_menu_sidebar = Highlight.new("PmenuSbar", { bg = c.default.bg }) ---Popup menu: Thumb of the scrollbar.