feat(completion): use blink.cmp in favor of nvim-cmp

This commit is contained in:
2024-12-18 16:36:14 +01:00
parent 995f55cb80
commit 4800accc7a
5 changed files with 164 additions and 22 deletions

View File

@@ -1,10 +1,151 @@
return {
--[[ {
"windwp/nvim-autopairs",
event = "InsertEnter",
config = true,
}, ]]
{
"saghen/blink.cmp",
lazy = false,
version = "v0.*",
opts = {
keymap = {
["<C-y>"] = { "select_and_accept" },
["<C-g>"] = { "show", "hide" },
["<C-n>"] = { "show", "select_next", "fallback" },
["<C-p>"] = { "show", "select_prev", "fallback" },
["<C-k>"] = { "scroll_documentation_up", "fallback" },
["<C-j>"] = { "scroll_documentation_down", "fallback" },
},
appearance = {
nerd_font_variant = "mono",
kind_icons = {
Text = "󰉿",
Method = "󰆧",
Function = "󰊕",
Constructor = "",
Field = "󰜢",
Variable = "󰀫",
Property = "󰜢",
Class = "󰠱",
Interface = "",
Struct = "󰙅",
Module = "",
Unit = "󰑭",
Value = "󰎠",
Enum = "",
EnumMember = "",
Keyword = "󰌋",
Constant = "󰏿",
Snippet = "",
Color = "󰏘",
File = "󰈙",
Reference = "󰈇",
Folder = "󰉋",
Event = "",
Operator = "󰆕",
TypeParameter = "󰬛",
},
},
sources = {
default = { "lsp", "path", "buffer" },
-- optionally disable cmdline completions
-- cmdline = {},
},
completion = {
menu = {
enabled = true,
max_width = 100,
border = "single",
draw = {
padding = 2,
columns = { { "kind_icon" }, { "label" }, { "kind" } },
components = {
kind = {
text = function(ctx)
return "(" .. ctx.kind .. ")"
end,
},
label = {
text = function(ctx)
return ctx.label
end,
},
},
},
},
documentation = {
auto_show = true,
window = {
border = "single",
max_width = 100,
},
},
list = {
selection = "manual",
},
ghost_text = {
enabled = false,
},
},
signature = {
enabled = false,
trigger = {
show_on_insert_on_trigger_character = true,
},
window = {
border = "single",
},
},
},
opts_extend = { "sources.default" },
config = function(_, opts)
require("blink.cmp").setup(opts)
vim.api.nvim_set_hl(0, "BlinkCmpMenu", { fg = "#abb2bf", bg = "none" })
vim.api.nvim_set_hl(0, "BlinkCmpMenuBorder", { link = "FloatBorder" })
vim.api.nvim_set_hl(0, "BlinkCmpDocBorder", { link = "FloatBorder" })
vim.api.nvim_set_hl(0, "BlinkCmpSignatureHelpBorder", { link = "FloatBorder" })
vim.api.nvim_set_hl(0, "BlinkCmpLabelMatch", { fg = "#50fa7b", bg = "none" })
vim.api.nvim_set_hl(0, "BlinkCmpLabel", { bg = "none" })
vim.api.nvim_set_hl(0, "BlinkCmpMenuSelection", { bg = "none" })
vim.api.nvim_set_hl(0, "BlinkCmpKind", { link = "BlinkCmpLabel" })
vim.api.nvim_set_hl(0, "BlinkCmpGhostText", { fg = "#abb2bf" })
vim.api.nvim_set_hl(0, "BlinkCmpKindTypeParameter", { link = "@variable.parameter" })
vim.api.nvim_set_hl(0, "BlinkCmpKindConstructor", { link = "@type" })
vim.api.nvim_set_hl(0, "BlinkCmpKindEnumMember", { link = "@variable.member" })
vim.api.nvim_set_hl(0, "BlinkCmpKindReference", { link = "@variable.parameter.reference" })
vim.api.nvim_set_hl(0, "BlinkCmpKindInterface", { link = "@type" })
vim.api.nvim_set_hl(0, "BlinkCmpKindVariable", { link = "@variable" })
vim.api.nvim_set_hl(0, "BlinkCmpKindProperty", { link = "@property" })
vim.api.nvim_set_hl(0, "BlinkCmpKindOperator", { link = "@operator" })
vim.api.nvim_set_hl(0, "BlinkCmpKindFunction", { link = "@function" })
vim.api.nvim_set_hl(0, "BlinkCmpKindConstant", { link = "@constant" })
vim.api.nvim_set_hl(0, "BlinkCmpKindSnippet", { link = "@markup" })
vim.api.nvim_set_hl(0, "BlinkCmpKindKeyword", { link = "@keyword" })
vim.api.nvim_set_hl(0, "BlinkCmpKindStruct", { link = "@structure" })
vim.api.nvim_set_hl(0, "BlinkCmpKindModule", { link = "@module" })
vim.api.nvim_set_hl(0, "BlinkCmpKindMethod", { link = "@function.method" })
vim.api.nvim_set_hl(0, "BlinkCmpKindFolder", { link = "TSURI" })
vim.api.nvim_set_hl(0, "BlinkCmpKindValue", { link = "@variable.member" })
vim.api.nvim_set_hl(0, "BlinkCmpKindField", { link = "@variable.member" })
vim.api.nvim_set_hl(0, "BlinkCmpKindEvent", { link = "@constant" })
vim.api.nvim_set_hl(0, "BlinkCmpKindColor", { link = "DevIconCss" })
vim.api.nvim_set_hl(0, "BlinkCmpKindClass", { link = "@type" })
vim.api.nvim_set_hl(0, "BlinkCmpKindUnit", { link = "@variable.member" })
vim.api.nvim_set_hl(0, "BlinkCmpKindText", { link = "@markup" })
vim.api.nvim_set_hl(0, "BlinkCmpKindFile", { link = "TSURI" })
vim.api.nvim_set_hl(0, "BlinkCmpKindEnum", { link = "@variable.member" })
end,
},
--[[ {
"hrsh7th/nvim-cmp",
dependencies = {
"onsails/lspkind.nvim",
@@ -112,5 +253,5 @@ return {
},
}
end,
},
}, ]]
}

View File

@@ -75,6 +75,7 @@ return {
dependencies = {
"williamboman/mason.nvim",
"williamboman/mason-lspconfig.nvim",
"saghen/blink.cmp",
},
opts = {
diagnostics = {
@@ -162,6 +163,7 @@ return {
},
},
config = function(_, opts)
local lspconfig = require("lspconfig")
local lsp = require("lsp-zero")
vim.api.nvim_create_autocmd("LspAttach", {
@@ -207,8 +209,6 @@ return {
border = "single",
}
local lspconfig = require("lspconfig")
require("mason-lspconfig").setup({
ensure_installed = {
"vtsls",
@@ -226,11 +226,17 @@ return {
handlers = {
function(server_name)
if lspconfig[server_name] ~= nil then
lspconfig[server_name].setup(opts.servers[server_name] or {})
local config = opts.servers[server_name] or {}
config.capabilities = require("blink.cmp").get_lsp_capabilities(config.capabilities)
lspconfig[server_name].setup(config)
end
end,
lua_ls = function()
require("lspconfig").lua_ls.setup(lsp.nvim_lua_ls())
local config = lsp.nvim_lua_ls()
config.capabilities = require("blink.cmp").get_lsp_capabilities(config.capabilities)
require("lspconfig").lua_ls.setup(config)
end,
},
})

View File

@@ -13,6 +13,11 @@ return {
hover = {
silent = true,
},
signature = {
auto_open = {
enabled = false
},
},
},
presets = {
bottom_search = false,

View File

@@ -22,8 +22,6 @@ return {
vim.api.nvim_set_hl(0, "TabLineSel", { fg = "#282a36", bg = "#50fa7b", bold = true })
vim.api.nvim_set_hl(0, "DashboardHeader", { fg = "#50fa7b" })
vim.api.nvim_set_hl(0, "DashboardShortCut", { fg = "#bd93f9" })
vim.api.nvim_set_hl(0, "CmpItemAbbr", { bg = "none" })
vim.api.nvim_set_hl(0, "CmpItemAbbrMatch", { fg = "#50fa7b", bg = "none" })
end,
},
}