Switch from deprecated compe to successor cmp

This commit is contained in:
Alexander Gehrke 2021-09-21 16:42:46 +02:00
parent ec4757da9b
commit d0a301d557
4 changed files with 51 additions and 7 deletions

View file

@ -55,8 +55,6 @@ set hidden
" set completeopt=menu,noinsert,preview " set completeopt=menu,noinsert,preview
set completeopt=menuone,noinsert,noselect set completeopt=menuone,noinsert,noselect
set shortmess+=c set shortmess+=c
imap <tab> <Plug>(completion_smart_tab)
imap <s-tab> <Plug>(completion_smart_s_tab)
inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>" inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
set mouse= set mouse=
@ -180,5 +178,6 @@ let g:localvimrc_sandbox=0
lua require("my-lsp") lua require("my-lsp")
lua require("lsputils") lua require("lsputils")
"lua require("conf.compe") "lua require("conf.compe")
lua require("conf.cmp")
lua require("conf.trouble") lua require("conf.trouble")
" vi:foldmethod=marker sw=2 " vi:foldmethod=marker sw=2

View file

@ -31,3 +31,42 @@ require'compe'.setup {
luasnip = true; luasnip = true;
}; };
} }
local t = function(str)
return vim.api.nvim_replace_termcodes(str, true, true, true)
end
local check_back_space = function()
local col = vim.fn.col('.') - 1
return col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') ~= nil
end
-- Use (s-)tab to:
--- move to prev/next item in completion menuone
--- jump to prev/next snippet's placeholder
_G.tab_complete = function()
if vim.fn.pumvisible() == 1 then
return t "<C-n>"
elseif vim.fn['vsnip#available'](1) == 1 then
return t "<Plug>(vsnip-expand-or-jump)"
elseif check_back_space() then
return t "<Tab>"
else
return vim.fn['compe#complete']()
end
end
_G.s_tab_complete = function()
if vim.fn.pumvisible() == 1 then
return t "<C-p>"
elseif vim.fn['vsnip#jumpable'](-1) == 1 then
return t "<Plug>(vsnip-jump-prev)"
else
-- If <S-Tab> is not working in your terminal, change it to <C-h>
return t "<S-Tab>"
end
end
vim.api.nvim_set_keymap("i", "<Tab>", "v:lua.tab_complete()", {expr = true})
vim.api.nvim_set_keymap("s", "<Tab>", "v:lua.tab_complete()", {expr = true})
vim.api.nvim_set_keymap("i", "<S-Tab>", "v:lua.s_tab_complete()", {expr = true})
vim.api.nvim_set_keymap("s", "<S-Tab>", "v:lua.s_tab_complete()", {expr = true})

View file

@ -39,7 +39,7 @@ local on_attach = function(client, bufnr)
buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts) buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
buf_set_keymap('n', '<M-q>', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts) buf_set_keymap('n', '<M-q>', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
buf_set_keymap("n", "<Leader>f", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts) buf_set_keymap("n", "<Leader>f", "<cmd>lua vim.lsp.buf.formatting()<CR>", opts)
require'completion'.on_attach(client, bufnr) --require'completion'.on_attach(client, bufnr)
end end

View file

@ -4,8 +4,8 @@ call plug#begin(expand('<sfile>:p:h') . '/plugged')
Plug 'pbrisbin/vim-mkdir' Plug 'pbrisbin/vim-mkdir'
Plug 'embear/vim-localvimrc' Plug 'embear/vim-localvimrc'
"Plug 'crater2150/vim-theme-chroma' Plug 'crater2150/vim-theme-chroma'
Plug '~/sources/chroma-colors/vim' "Plug '~/sources/chroma-colors/vim'
Plug 'fladson/vim-kitty' Plug 'fladson/vim-kitty'
" tim pope stuff " tim pope stuff
@ -31,8 +31,14 @@ Plug 'mhinz/vim-signify'
Plug 'neovim/nvim-lspconfig' Plug 'neovim/nvim-lspconfig'
Plug 'kabouzeid/nvim-lspinstall' Plug 'kabouzeid/nvim-lspinstall'
Plug 'scalameta/nvim-metals' Plug 'scalameta/nvim-metals'
" Plug 'hrsh7th/nvim-compe' "Plug 'hrsh7th/nvim-compe'
Plug 'nvim-lua/completion-nvim' Plug 'hrsh7th/nvim-cmp'
Plug 'hrsh7th/cmp-buffer'
Plug 'hrsh7th/cmp-path'
Plug 'hrsh7th/cmp-nvim-lsp'
Plug 'hrsh7th/vim-vsnip'
Plug 'hrsh7th/vim-vsnip-integ'
"Plug 'nvim-lua/completion-nvim'
Plug 'nvim-treesitter/nvim-treesitter', {'branch': '0.5-compat', 'do': ':TSUpdate'} Plug 'nvim-treesitter/nvim-treesitter', {'branch': '0.5-compat', 'do': ':TSUpdate'}
Plug 'nvim-lua/lsp-status.nvim' Plug 'nvim-lua/lsp-status.nvim'
Plug 'RishabhRD/popfix' Plug 'RishabhRD/popfix'