fernando/dotfiles
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

vim: improve completion, add cmdline completion on demand

Browse source
This commit is contained in:
Fernando Schauenburg 2023-07-12 00:25:54 +02:00
parent 51cb1426ac
commit 353827431f
1 changed files with 82 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

133
config/nvim/lua/user/plugins/completion.lua
View file

@ -1,77 +1,107 @@
local config = function()
local cmp = require('cmp')
local mapping = {
['<c-n>'] = {
i = function()
if cmp.visible() then
cmp.select_next_item { behavior = cmp.SelectBehavior.Select }
else
cmp.complete()
end
end,
},
local map = setmetatable({
complete_or_select_next = function()
if cmp.visible() then
cmp.select_next_item { behavior = cmp.SelectBehavior.Select }
else
cmp.complete()
end
end,
['<c-p>'] = {
i = function()
if cmp.visible() then
cmp.select_prev_item { behavior = cmp.SelectBehavior.Select }
else
cmp.complete()
end
end,
},
complete_or_select_previous = function()
if cmp.visible() then
cmp.select_prev_item { behavior = cmp.SelectBehavior.Select }
else
cmp.complete()
end
end,
['<Down>'] = { i = cmp.mapping.select_next_item { behavior = cmp.SelectBehavior.Select } },
['<Up>'] = { i = cmp.mapping.select_prev_item { behavior = cmp.SelectBehavior.Select } },
tab_completion = function(fallback)
if cmp.visible() then
cmp.complete_common_string()
elseif vim.fn.mode() == 'c' then
cmp.complete()
else
fallback()
end
end,
}, {
-- Make `func` available in [i]nsert and [c]mdline modes.
__call = function(_, func) return { i = func, c = func } end
})
['<c-f>'] = { i = cmp.mapping.scroll_docs(4) },
['<c-b>'] = { i = cmp.mapping.scroll_docs(-4) },
local keymap = {
['<c-n>'] = map(map.complete_or_select_next),
['<c-p>'] = map(map.complete_or_select_previous),
['<c-e>'] = { i = cmp.mapping.abort() },
['<c-y>'] = { i = cmp.mapping.confirm { select = true } },
['<Tab>'] = {
i = function(fallback)
if cmp.visible() then
cmp.confirm { select = true }
else
fallback()
end
end,
},
['<down>'] = map(cmp.mapping.select_next_item { behavior = cmp.SelectBehavior.Select }),
['<up>'] = map(cmp.mapping.select_prev_item { behavior = cmp.SelectBehavior.Select }),
['<c-f>'] = map(cmp.mapping.scroll_docs(4)),
['<s-down>'] = map(cmp.mapping.scroll_docs(4)),
['<c-b>'] = map(cmp.mapping.scroll_docs(-4)),
['<s-up>'] = map(cmp.mapping.scroll_docs(-4)),
['<c-e>'] = map(cmp.mapping.abort()),
['<c-y>'] = map(cmp.mapping.confirm { select = true }),
['<tab>'] = map(map.tab_completion),
}
cmp.setup {
mapping = mapping,
mapping = keymap,
snippet = {
expand = function(_ --[[args]])
-- require('luasnip').lsp_expand(args.body) TODO enable
end,
},
formatting = {
format = require('lspkind').cmp_format {
mode = 'symbol_text',
menu = {
buffer = "[buf]",
nvim_lsp = "[LSP]",
nvim_lua = "[lua]",
path = "[path]",
},
},
},
sources = cmp.config.sources({
{ name = 'nvim_lsp' },
{ name = 'nvim_lua' },
{ name = 'nvim_lsp' },
-- { name = "luasnip" }, TODO enable
}, {
{ name = 'path' },
{ name = 'buffer', keyword_length = 5 },
}),
formatting = (function()
local ok, lspkind = pcall(require, 'lspkind')
if not ok then return {} end
return {
format = lspkind.cmp_format {
mode = 'symbol_text',
menu = {
buffer = "[buf]",
nvim_lsp = "[LSP]",
nvim_lua = "[lua]",
path = "[path]",
},
},
}
end)(),
window = {
completion = cmp.config.window.bordered(),
documentation = cmp.config.window.bordered(),
},
experimental = {
ghost_text = true,
},
}
cmp.setup.cmdline(':', {
mapping = keymap,
completion = {
autocomplete = false,
},
sources = cmp.config.sources({
{ name = 'path' }
}, {
{ name = 'cmdline' }
}),
})
end
return {
@ -83,6 +113,7 @@ return {
'hrsh7th/cmp-nvim-lua',
'hrsh7th/cmp-path',
'hrsh7th/cmp-buffer',
'hrsh7th/cmp-cmdline',
'onsails/lspkind-nvim',
},
}