feat: blink cmp specific winhighlights and highlights

Author: Saghen

lua/blink/cmp/config.lua

@@ -82,13 +82,14 @@
 --- @field order "top_down" | "bottom_up"
 --- @field direction_priority ("n" | "s")[]
 --- @field preselect boolean
---- @field winhighlight string | nil
+--- @field winhighlight string
+--- @field scrolloff number
 
 --- @class blink.cmp.DocumentationDirectionPriorityConfig
 --- @field autocomplete_north ("n" | "s" | "e" | "w")[]
 --- @field autocomplete_south ("n" | "s" | "e" | "w")[]
 ---
---- @alias blink.cmp.WindowBorder 'single' | 'double' | 'rounded' | 'solid' | 'shadow' | 'padded' | 'none'
+--- @alias blink.cmp.WindowBorder 'single' | 'double' | 'rounded' | 'solid' | 'shadow' | 'padded' | 'none' | string[]
 ---
 --- @class blink.cmp.DocumentationConfig
 --- @field min_width number
@@ -99,13 +100,14 @@
 --- @field auto_show boolean
 --- @field auto_show_delay_ms number Delay before showing the documentation window
 --- @field update_delay_ms number Delay before updating the documentation window
---- @field winhighlight string | nil
+--- @field winhighlight string
 
 --- @class blink.cmp.SignatureHelpConfig
 --- @field min_width number
 --- @field max_width number
 --- @field max_height number
 --- @field border blink.cmp.WindowBorder
+--- @field winhighlight string
 
 --- @class blink.cmp.Config
 --- @field keymap blink.cmp.KeymapConfig
@@ -210,6 +212,8 @@ local config = {
       max_width = 60,
       max_height = 10,
       border = 'none',
+      winhighlight = 'Normal:BlinkCmpMenu,FloatBorder:BlinkCmpMenuBorder,CursorLine:BlinkCmpMenuSelection,Search:None',
+      scrolloff = 2,
       -- todo: implement
       order = 'top_down',
       -- which directions to show the window,
@@ -223,6 +227,7 @@ local config = {
       max_width = 60,
       max_height = 20,
       border = 'padded',
+      winhighlight = 'Normal:BlinkCmpDoc,FloatBorder:BlinkCmpDocBorder,CursorLine:BlinkCmpDocCursorLine,Search:None',
       -- which directions to show the documentation window,
       -- for each of the possible autocomplete window directions,
       -- falling back to the next direction when there's not enough space
@@ -239,6 +244,7 @@ local config = {
       max_width = 100,
       max_height = 10,
       border = 'padded',
+      winhighlight = 'Normal:BlinkCmpSignatureHelp,FloatBorder:BlinkCmpSignatureHelpBorder',
     },
   },
 

lua/blink/cmp/init.lua

@@ -103,6 +103,18 @@ cmp.add_default_highlights = function()
   set_hl('BlinkCmpLabelMatch', { link = use_nvim_cmp and 'CmpItemAbbrMatch' or 'Pmenu' })
   set_hl('BlinkCmpKind', { link = use_nvim_cmp and 'CmpItemKind' or 'Special' })
   set_hl('BlinkCmpSignatureHelpActiveParameter', { link = 'LspSignatureActiveParameter' })
+
+  set_hl('BlinkCmpMenu', { link = 'Pmenu' })
+  set_hl('BlinkCmpMenuBorder', { link = 'Pmenu' })
+  set_hl('BlinkCmpMenuSelection', { link = 'PmenuSel' })
+
+  set_hl('BlinkCmpDoc', { link = 'NormalFloat' })
+  set_hl('BlinkCmpDocBorder', { link = 'FloatBorder' })
+  set_hl('BlinkCmpDocCursorLine', { link = 'Visual' })
+
+  set_hl('BlinkCmpSignatureHelp', { link = 'NormalFloat' })
+  set_hl('BlinkCmpSignatureHelpBorder', { link = 'FloatBorder' })
+
   for _, kind in pairs(vim.lsp.protocol.CompletionItemKind) do
     set_hl('BlinkCmpKind' .. kind, { link = use_nvim_cmp and 'CmpItemKind' .. kind or 'BlinkCmpItemKind' })
   end

lua/blink/cmp/windows/documentation.lua

@@ -10,7 +10,7 @@ function docs.setup()
     max_width = config.max_width,
     max_height = config.max_height,
     border = config.border,
-    winhighlight = config.winhighlight or 'Normal:Normal,FloatBorder:FloatBorder,CursorLine:Visual,Search:None',
+    winhighlight = config.winhighlight,
     wrap = true,
     filetype = 'markdown',
   })

lua/blink/cmp/windows/signature.lua

@@ -10,6 +10,7 @@ function signature.setup()
     max_width = config.max_width,
     max_height = config.max_height,
     border = config.border,
+    winhighlight = config.winhighlight,
     wrap = true,
     filetype = 'markdown',
   })