feat(extras.ai): blink.cmp integration and kind overrides for menu drawing (#4942)

## Description

blink.cmp integration for codeium and copilot, and correct menu drawing
for codeium, copilot, and supermaven.

I've simplified the blink.cmp config a bit for these extras (especially
for copilot, which was extremely nested) by only including the blink.cmp
spec if vim.g.ai_cmp is true.

Multiple AI extras can now be enabled at the same time with blink.cmp.

blink.cmp ghost text is now always enabled. Although some ai plugins
always display virtual text, at worst it overlaps with blink's ghost
text and is not noticable.

Lastly, I can't test copilot because I don't have a subscription, nor do
I want to sign up for one, but it should work just as well as the
others.

## Screenshots

With Codeium:

![image](https://github.com/user-attachments/assets/1485ee3f-1cba-440f-8a82-ec69b4a3f473)

Multiple extras enabled at the same time:

![image](https://github.com/user-attachments/assets/4364ee45-d79b-4f97-a4c0-cf2a2b6433c6)

## Checklist

- [X] I've read the
[CONTRIBUTING](https://github.com/LazyVim/LazyVim/blob/main/CONTRIBUTING.md)
guidelines.

---------

Co-authored-by: Folke Lemaitre <folke.lemaitre@gmail.com>

lua/lazyvim/plugins/extras/ai/codeium.lua

@@ -55,17 +55,15 @@ return {
     end,
   },
 
-  {
+  vim.g.ai_cmp and {
     "saghen/blink.cmp",
     optional = true,
+    dependencies = { "codeium.nvim", "saghen/blink.compat" },
     opts = {
       sources = {
-        compat = vim.g.ai_cmp and { "codeium" } or nil,
-      },
-    },
-    dependencies = {
-      "codeium.nvim",
-      vim.g.ai_cmp and "saghen/blink.compat" or nil,
+        compat = { "codeium" },
+        providers = { codeium = { kind = "Codeium" } },
       },
     },
+  } or nil,
 }

lua/lazyvim/plugins/extras/ai/copilot.lua

@@ -94,31 +94,23 @@ return {
     },
   },
 
-  -- blink.cmp
-  {
+  vim.g.ai_cmp and {
     "saghen/blink.cmp",
     optional = true,
-    dependencies = {
-      {
-        "giuxtaposition/blink-cmp-copilot",
-        enabled = vim.g.ai_cmp, -- only enable if needed
-        specs = {
-          {
-            "blink.cmp",
-            optional = true,
+    dependencies = { "giuxtaposition/blink-cmp-copilot" },
     opts = {
       sources = {
-                providers = {
-                  copilot = { name = "copilot", module = "blink-cmp-copilot" },
-                },
         completion = {
           enabled_providers = { "copilot" },
         },
+        providers = {
+          copilot = {
+            name = "copilot",
+            module = "blink-cmp-copilot",
+            kind = "Copilot",
           },
         },
       },
     },
-      },
-    },
-  },
+  } or nil,
 }

lua/lazyvim/plugins/extras/ai/supermaven.lua

@@ -43,22 +43,17 @@ return {
     end,
   },
 
-  -- blink.cmp integration
-  {
+  vim.g.ai_cmp and {
     "saghen/blink.cmp",
     optional = true,
-    ---@module 'blink.cmp'
-    ---@type blink.cmp.Config
+    dependencies = { "supermaven-nvim", "saghen/blink.compat" },
     opts = {
       sources = {
-        compat = vim.g.ai_cmp and { "supermaven" } or nil,
-      },
-    },
-    dependencies = {
-      "supermaven-nvim",
-      vim.g.ai_cmp and "saghen/blink.compat" or nil,
+        compat = { "supermaven" },
+        providers = { supermaven = { kind = "Supermaven" } },
       },
     },
+  } or nil,
 
   {
     "nvim-lualine/lualine.nvim",

lua/lazyvim/plugins/extras/ai/tabnine.lua

@@ -1,15 +1,8 @@
 return {
   -- Tabnine cmp source
-  {
-    "nvim-cmp",
-    optional = true,
-    dependencies = {
   {
     "tzachar/cmp-tabnine",
-        build = {
-          LazyVim.is_win() and "pwsh -noni .\\install.ps1" or "./install.sh",
-        },
-        dependencies = "hrsh7th/nvim-cmp",
+    build = LazyVim.is_win() and "pwsh -noni .\\install.ps1" or "./install.sh",
     opts = {
       max_lines = 1000,
       max_num_results = 3,
@@ -19,7 +12,11 @@ return {
       require("cmp_tabnine.config"):setup(opts)
     end,
   },
-    },
+
+  {
+    "nvim-cmp",
+    optional = true,
+    dependencies = { "tzachar/cmp-tabnine" },
     ---@param opts cmp.ConfigSchema
     opts = function(_, opts)
       table.insert(opts.sources, 1, {
@@ -36,6 +33,19 @@ return {
       end)
     end,
   },
+
+  {
+    "saghen/blink.cmp",
+    optional = true,
+    dependencies = { "tzachar/cmp-tabnine", "saghen/blink.compat" },
+    opts = {
+      sources = {
+        compat = { "cmp_tabnine" },
+        providers = { cmp_tabnine = { kind = "TabNine" } },
+      },
+    },
+  },
+
   -- Show TabNine status in lualine
   {
     "nvim-lualine/lualine.nvim",

lua/lazyvim/plugins/extras/coding/blink.lua

@@ -44,8 +44,9 @@ return {
       nerd_font_variant = "mono",
       completion = {
         menu = {
-          winblend = vim.o.pumblend,
-          draw = { treesitter = true },
+          draw = {
+            treesitter = true,
+          },
         },
         documentation = {
           auto_show = true,
@@ -93,6 +94,26 @@ return {
           table.insert(enabled, source)
         end
       end
+
+      -- check if we need to override symbol kinds
+      for _, provider in pairs(opts.sources.providers or {}) do
+        ---@cast provider blink.cmp.SourceProviderConfig|{kind?:string}
+        if provider.kind then
+          require("blink.cmp.types").CompletionItemKind[provider.kind] = provider.kind
+          ---@type fun(ctx: blink.cmp.Context, items: blink.cmp.CompletionItem[]): blink.cmp.CompletionItem[]
+          local transform_items = provider.transform_items
+          ---@param ctx blink.cmp.Context
+          ---@param items blink.cmp.CompletionItem[]
+          provider.transform_items = function(ctx, items)
+            items = transform_items and transform_items(ctx, items) or items
+            for _, item in ipairs(items) do
+              item.kind = provider.kind or item.kind
+            end
+            return items
+          end
+        end
+      end
+
       require("blink.cmp").setup(opts)
     end,
   },