fix(blink): config breaking changes. Fixes #4990
This commit is contained in:
@ -100,9 +100,7 @@ return {
|
|||||||
dependencies = { "giuxtaposition/blink-cmp-copilot" },
|
dependencies = { "giuxtaposition/blink-cmp-copilot" },
|
||||||
opts = {
|
opts = {
|
||||||
sources = {
|
sources = {
|
||||||
completion = {
|
default = { "copilot" },
|
||||||
enabled_providers = { "copilot" },
|
|
||||||
},
|
|
||||||
providers = {
|
providers = {
|
||||||
copilot = {
|
copilot = {
|
||||||
name = "copilot",
|
name = "copilot",
|
||||||
|
@ -17,6 +17,7 @@ return {
|
|||||||
opts_extend = {
|
opts_extend = {
|
||||||
"sources.completion.enabled_providers",
|
"sources.completion.enabled_providers",
|
||||||
"sources.compat",
|
"sources.compat",
|
||||||
|
"sources.default",
|
||||||
},
|
},
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"rafamadriz/friendly-snippets",
|
"rafamadriz/friendly-snippets",
|
||||||
@ -70,10 +71,7 @@ return {
|
|||||||
-- adding any nvim-cmp sources here will enable them
|
-- adding any nvim-cmp sources here will enable them
|
||||||
-- with blink.compat
|
-- with blink.compat
|
||||||
compat = {},
|
compat = {},
|
||||||
completion = {
|
default = { "lsp", "path", "snippets", "buffer" },
|
||||||
-- remember to enable your providers here
|
|
||||||
enabled_providers = { "lsp", "path", "snippets", "buffer" },
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
|
|
||||||
keymap = {
|
keymap = {
|
||||||
@ -87,7 +85,7 @@ return {
|
|||||||
---@param opts blink.cmp.Config | { sources: { compat: string[] } }
|
---@param opts blink.cmp.Config | { sources: { compat: string[] } }
|
||||||
config = function(_, opts)
|
config = function(_, opts)
|
||||||
-- setup compat sources
|
-- setup compat sources
|
||||||
local enabled = opts.sources.completion.enabled_providers
|
local enabled = opts.sources.default
|
||||||
for _, source in ipairs(opts.sources.compat or {}) do
|
for _, source in ipairs(opts.sources.compat or {}) do
|
||||||
opts.sources.providers[source] = vim.tbl_deep_extend(
|
opts.sources.providers[source] = vim.tbl_deep_extend(
|
||||||
"force",
|
"force",
|
||||||
@ -99,6 +97,12 @@ return {
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- TODO: remove when blink made a new release > 0.7.6
|
||||||
|
if not vim.g.lazyvim_blink_main then
|
||||||
|
opts.sources.completion = opts.sources.completion or {}
|
||||||
|
opts.sources.completion.enabled_providers = enabled
|
||||||
|
end
|
||||||
|
|
||||||
-- check if we need to override symbol kinds
|
-- check if we need to override symbol kinds
|
||||||
for _, provider in pairs(opts.sources.providers or {}) do
|
for _, provider in pairs(opts.sources.providers or {}) do
|
||||||
---@cast provider blink.cmp.SourceProviderConfig|{kind?:string}
|
---@cast provider blink.cmp.SourceProviderConfig|{kind?:string}
|
||||||
@ -136,15 +140,9 @@ return {
|
|||||||
"saghen/blink.cmp",
|
"saghen/blink.cmp",
|
||||||
opts = {
|
opts = {
|
||||||
sources = {
|
sources = {
|
||||||
completion = {
|
-- add lazydev to your completion providers
|
||||||
-- add lazydev to your completion providers
|
default = { "lazydev" },
|
||||||
enabled_providers = { "lazydev" },
|
|
||||||
},
|
|
||||||
providers = {
|
providers = {
|
||||||
lsp = {
|
|
||||||
-- dont show LuaLS require statements when lazydev has items
|
|
||||||
fallback_for = { "lazydev" },
|
|
||||||
},
|
|
||||||
lazydev = {
|
lazydev = {
|
||||||
name = "LazyDev",
|
name = "LazyDev",
|
||||||
module = "lazydev.integrations.blink",
|
module = "lazydev.integrations.blink",
|
||||||
|
@ -130,9 +130,7 @@ return {
|
|||||||
optional = true,
|
optional = true,
|
||||||
opts = {
|
opts = {
|
||||||
sources = {
|
sources = {
|
||||||
completion = {
|
default = { "dadbod" },
|
||||||
enabled_providers = { "dadbod" },
|
|
||||||
},
|
|
||||||
providers = {
|
providers = {
|
||||||
dadbod = { name = "Dadbod", module = "vim_dadbod_completion.blink" },
|
dadbod = { name = "Dadbod", module = "vim_dadbod_completion.blink" },
|
||||||
},
|
},
|
||||||
|
Reference in New Issue
Block a user