felschr/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(neovim): replace nvim-compe with nvim-cmp

Browse source
This commit is contained in:
Felix Schröter 2022-03-30 11:30:29 +02:00
parent ca3036fc60
commit ec464af8e5
Signed by: felschr
GPG key ID: 671E39E6744C807D
4 changed files with 69 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

44
home/editors/neovim/lsp/lsp.lua
View file

@ -1,19 +1,3 @@
-- autocomplete config
vim.opt.completeopt="menuone,noinsert"
vim.opt.shortmess:append("c")
require'compe'.setup {
enabled = true,
preselect = "always",
allow_prefix_unmatch = true,
source = {
path = true,
calc = true,
nvim_lsp = true,
vsnip = true,
},
}
local pid = vim.fn.getpid()
-- lightbulb
@ -34,10 +18,9 @@ end
require('lspfuzzy').setup {}
-- enable lsp snippets for nvim-compe
local config = require'lspconfig'
local capabilities = vim.lsp.protocol.make_client_capabilities()
local capabilities_ = vim.lsp.protocol.make_client_capabilities()
local capabilities = require("cmp_nvim_lsp").update_capabilities(capabilities_)
capabilities.textDocument.completion.completionItem.snippetSupport = true
local servers = {
"bashls",
@ -238,27 +221,6 @@ config.diagnosticls.setup {
},
}
-- nvim-autoclose & nvim-compe compatibility
local map = vim.api.nvim_set_keymap
local npairs = require('nvim-autopairs')
npairs.setup({
require("nvim-autopairs").setup({
check_ts = true,
})
_G.MUtils= {}
vim.g.completion_confirm_key = ""
MUtils.completion_confirm=function()
if vim.fn.pumvisible() ~= 0 then
if vim.fn.complete_info()["selected"] ~= -1 then
return vim.fn["compe#confirm"](npairs.esc("<cr>"))
else
return npairs.esc("<cr>")
end
else
return npairs.autopairs_cr()
end
end
map('i' , '<CR>','v:lua.MUtils.completion_confirm()', {expr = true , noremap = true})

10
home/editors/neovim/lsp/mappings.lua
View file

@ -1,15 +1,5 @@
local map = vim.api.nvim_set_keymap
map("i", "<C-Space>", "compe#complete()", { noremap = true, expr = true, silent = true })
map("i", "<CR>", "compe#confirm('<CR>')", { noremap = true, expr = true, silent = true })
map("i", "<C-e>", "compe#close('<C-e>')", { noremap = true, expr = true, silent = true })
map("i", "<C-f>", "compe#scroll({ 'delta': +4 })", { noremap = true, expr = true, silent = true })
map("i", "<C-d>", "compe#scroll({ 'delta': -4 })", { noremap = true, expr = true, silent = true })
-- Use <Tab> and <S-Tab> to navigate through popup menu
map("i", "<Tab>", "pumvisible() ? '<C-n>' : '<Tab>'", { noremap = true, expr = true })
map("i", "<S-Tab>", "pumvisible() ? '<C-p>' : '<S-Tab>'", { noremap = true, expr = true })
-- maps
map("n", "gd", "<cmd>lua vim.lsp.buf.definition()<CR>", { noremap = true, silent = true })
map("n", "gp", "<cmd>lua peek_definition()<CR>", { noremap = true, silent = true })