From ce556fb8d13f0ed80795ee267d587d6b241cd177 Mon Sep 17 00:00:00 2001
From: Iordanis Petkakis <12776461+dpetka2001@users.noreply.github.com>
Date: Thu, 12 Dec 2024 22:39:07 +0200
Subject: [PATCH] fix(blink): correct properties for config validation

`blink.cmp` had an [update](https://github.com/Saghen/blink.cmp/commit/834163eebdfdb1ca2a4a54b1e8d4c8d2c8184c12)
that forces strict config validation. This PR adapts to these changes.

Closes #5016.
---
 lua/lazyvim/plugins/extras/ai/codeium.lua     | 10 ++++++++--
 lua/lazyvim/plugins/extras/ai/supermaven.lua  | 10 ++++++++--
 lua/lazyvim/plugins/extras/ai/tabnine.lua     | 10 ++++++++--
 lua/lazyvim/plugins/extras/coding/blink.lua   | 15 ---------------
 lua/lazyvim/plugins/extras/coding/luasnip.lua | 10 +++++++++-
 lua/lazyvim/plugins/extras/lang/sql.lua       |  5 ++++-
 6 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/lua/lazyvim/plugins/extras/ai/codeium.lua b/lua/lazyvim/plugins/extras/ai/codeium.lua
index c347c6c3..41f2e508 100644
--- a/lua/lazyvim/plugins/extras/ai/codeium.lua
+++ b/lua/lazyvim/plugins/extras/ai/codeium.lua
@@ -61,8 +61,14 @@ return {
     dependencies = { "codeium.nvim", "saghen/blink.compat" },
     opts = {
       sources = {
-        compat = { "codeium" },
-        providers = { codeium = { kind = "Codeium" } },
+        default = { "codeium" },
+        providers = {
+          codeium = {
+            name = "codeium",
+            module = "blink.compat.source",
+            kind = "Codeium",
+          },
+        },
       },
     },
   } or nil,
diff --git a/lua/lazyvim/plugins/extras/ai/supermaven.lua b/lua/lazyvim/plugins/extras/ai/supermaven.lua
index 35a955ca..938b1436 100644
--- a/lua/lazyvim/plugins/extras/ai/supermaven.lua
+++ b/lua/lazyvim/plugins/extras/ai/supermaven.lua
@@ -49,8 +49,14 @@ return {
     dependencies = { "supermaven-nvim", "saghen/blink.compat" },
     opts = {
       sources = {
-        compat = { "supermaven" },
-        providers = { supermaven = { kind = "Supermaven" } },
+        default = { "supermaven" },
+        providers = {
+          supermaven = {
+            name = "supermaven",
+            module = "blink.compat.source",
+            kind = "Supermaven",
+          },
+        },
       },
     },
   } or nil,
diff --git a/lua/lazyvim/plugins/extras/ai/tabnine.lua b/lua/lazyvim/plugins/extras/ai/tabnine.lua
index cc974d0a..bf954024 100644
--- a/lua/lazyvim/plugins/extras/ai/tabnine.lua
+++ b/lua/lazyvim/plugins/extras/ai/tabnine.lua
@@ -40,8 +40,14 @@ return {
     dependencies = { "tzachar/cmp-tabnine", "saghen/blink.compat" },
     opts = {
       sources = {
-        compat = { "cmp_tabnine" },
-        providers = { cmp_tabnine = { kind = "TabNine" } },
+        default = { "cmp_tabnine" },
+        providers = {
+          cmp_tabnine = {
+            name = "cmp_tabnine",
+            module = "blink.compat.source",
+            kind = "TabNine",
+          },
+        },
       },
     },
   },
diff --git a/lua/lazyvim/plugins/extras/coding/blink.lua b/lua/lazyvim/plugins/extras/coding/blink.lua
index fb71597b..0339c6b1 100644
--- a/lua/lazyvim/plugins/extras/coding/blink.lua
+++ b/lua/lazyvim/plugins/extras/coding/blink.lua
@@ -12,7 +12,6 @@ return {
     build = vim.g.lazyvim_blink_main and "cargo build --release",
     opts_extend = {
       "sources.completion.enabled_providers",
-      "sources.compat",
       "sources.default",
     },
     dependencies = {
@@ -64,9 +63,6 @@ return {
       -- signature = { enabled = true },
 
       sources = {
-        -- adding any nvim-cmp sources here will enable them
-        -- with blink.compat
-        compat = {},
         default = { "lsp", "path", "snippets", "buffer" },
       },
 
@@ -80,18 +76,7 @@ return {
     },
     ---@param opts blink.cmp.Config | { sources: { compat: string[] } }
     config = function(_, opts)
-      -- setup compat sources
       local enabled = opts.sources.default
-      for _, source in ipairs(opts.sources.compat or {}) do
-        opts.sources.providers[source] = vim.tbl_deep_extend(
-          "force",
-          { name = source, module = "blink.compat.source" },
-          opts.sources.providers[source] or {}
-        )
-        if type(enabled) == "table" and not vim.tbl_contains(enabled, source) then
-          table.insert(enabled, source)
-        end
-      end
 
       -- TODO: remove when blink made a new release > 0.7.6
       if not vim.g.lazyvim_blink_main then
diff --git a/lua/lazyvim/plugins/extras/coding/luasnip.lua b/lua/lazyvim/plugins/extras/coding/luasnip.lua
index f0f815b4..fbdabab2 100644
--- a/lua/lazyvim/plugins/extras/coding/luasnip.lua
+++ b/lua/lazyvim/plugins/extras/coding/luasnip.lua
@@ -66,7 +66,15 @@ return {
       { "saadparwaiz1/cmp_luasnip" },
     },
     opts = {
-      sources = { compat = { "luasnip" } },
+      sources = {
+        default = { "luasnip" },
+        providers = {
+          luasnip = {
+            name = "luasnip",
+            module = "blink.compat.source",
+          },
+        },
+      },
       snippets = {
         expand = function(snippet)
           require("luasnip").lsp_expand(snippet)
diff --git a/lua/lazyvim/plugins/extras/lang/sql.lua b/lua/lazyvim/plugins/extras/lang/sql.lua
index 075182d6..8af5c0a9 100644
--- a/lua/lazyvim/plugins/extras/lang/sql.lua
+++ b/lua/lazyvim/plugins/extras/lang/sql.lua
@@ -132,7 +132,10 @@ return {
       sources = {
         default = { "dadbod" },
         providers = {
-          dadbod = { name = "Dadbod", module = "vim_dadbod_completion.blink" },
+          dadbod = {
+            name = "Dadbod",
+            module = "vim_dadbod_completion.blink",
+          },
         },
       },
     },