Switched from deoplete/language-client-neovim to coc.nvim

This commit is contained in:
mandlm 2020-10-26 08:08:44 +01:00
parent 0067fb860c
commit 88b23fa9db
Signed by: mandlm
GPG Key ID: 4AA25D647AA54CC7
3 changed files with 26 additions and 36 deletions

3
nvim/coc-settings.json Normal file
View File

@ -0,0 +1,3 @@
{
"coc.preferences.formatOnSaveFiletypes": ["cpp", "markdown", "python", "rust"]
}

View File

@ -20,13 +20,6 @@ Plug 'christoomey/vim-tmux-navigator'
Plug 'mandlm/vim-split-open' Plug 'mandlm/vim-split-open'
Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
Plug 'autozimu/LanguageClient-neovim', {
\ 'branch': 'next',
\ 'do': 'bash install.sh',
\ }
Plug 'tpope/vim-dispatch' Plug 'tpope/vim-dispatch'
Plug 'RRethy/vim-illuminate' Plug 'RRethy/vim-illuminate'
@ -44,6 +37,8 @@ Plug 'cespare/vim-toml'
Plug 'vimwiki/vimwiki' Plug 'vimwiki/vimwiki'
Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'git@gitlab.softwareparadies.de:IDE/swp-vim.git' Plug 'git@gitlab.softwareparadies.de:IDE/swp-vim.git'
call plug#end() call plug#end()
@ -125,37 +120,13 @@ let g:fzf_action = {
\ 'ctrl-y': 'vsplit', \ 'ctrl-y': 'vsplit',
\ } \ }
" deoplete
let g:deoplete#enable_at_startup = 1
silent! call deoplete#custom#source('_', 'matchers', ['matcher_full_fuzzy'])
silent! call deoplete#custom#option({
\ 'smart_case': v:true,
\ 'ignore_sources': {'_': ['around', 'buffer']},
\ })
augroup close_preview augroup close_preview
autocmd InsertLeave * silent! pclose! autocmd InsertLeave * silent! pclose!
augroup end augroup end
set completefunc=LanguageClient#complete
inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>" inoremap <expr> <Tab> pumvisible() ? "\<C-n>" : "\<Tab>"
inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>" inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
" LanguageClient-neovim
set hidden
nmap <F5> <Plug>(lcn-menu)
nmap K <Plug>(lcn-hover)
nmap gd <Plug>(lcn-definition)
let g:LanguageClient_serverCommands = {
\ 'python': ['pyls'],
\ 'cpp': ['clangd'],
\ 'rust': ['rustup', 'run', 'stable', 'rls'],
\ }
let g:LanguageClient_selectionUI = 'fzf'
" autoread/checktime timer {{{ " autoread/checktime timer {{{
set autoread set autoread
function! CheckTime(timer) function! CheckTime(timer)
@ -174,14 +145,29 @@ augroup color_column
autocmd Filetype cpp,python set colorcolumn=101 autocmd Filetype cpp,python set colorcolumn=101
augroup end augroup end
" format on save
augroup auto_format
autocmd BufWritePre *.py,*.rs :call LanguageClient#textDocument_formatting_sync()
augroup end
" vimwiki " vimwiki
let g:vimwiki_list = [ let g:vimwiki_list = [
\ {'name': 'personal', 'path': '~/vimwiki/personal'}, \ {'name': 'personal', 'path': '~/vimwiki/personal'},
\ {'name': 'swp', 'path': '~/vimwiki/swp'} \ {'name': 'swp', 'path': '~/vimwiki/swp'}
\ ] \ ]
" coc
set updatetime=300
let g:coc_global_extensions = [
\ 'coc-clangd',
\ 'coc-cmake',
\ 'coc-json',
\ 'coc-python',
\ 'coc-rust-analyzer',
\ 'coc-sh',
\ 'coc-vimlsp',
\ 'coc-yaml',
\ ]
nnoremap <silent> K :call CocAction('doHover')<CR>
nmap <silent> gd <Plug>(coc-definition)
nmap <silent> gy <Plug>(coc-type-definition)
nmap <silent> gi <Plug>(coc-implementation)
nmap <silent> gr <Plug>(coc-references)

View File

@ -2,4 +2,5 @@
mkdir --parents ~/.config/nvim mkdir --parents ~/.config/nvim
ln -svrf init.vim ~/.config/nvim/init.vim ln -svrf init.vim ~/.config/nvim/init.vim
ln -svrf coc-settings.json ~/.config/nvim/coc-settings.json