Switch to coc.vim

This commit is contained in:
Alex Yatskov 2021-05-23 14:53:40 -07:00
parent dfadc40ba3
commit 542e7a25d8
11 changed files with 46 additions and 30 deletions

6
.gitmodules vendored
View File

@ -76,12 +76,12 @@
[submodule ".vim/bundle/vim-angry"]
path = pack/plugins/start/vim-angry
url = https://github.com/b4winckler/vim-angry.git
[submodule ".vim/bundle/ale"]
path = pack/plugins/start/ale
url = https://github.com/dense-analysis/ale.git
[submodule ".vim/bundle/vim-solarized8"]
path = pack/plugins/start/vim-solarized8
url = https://github.com/lifepillar/vim-solarized8.git
[submodule ".vim/pack/plugins/start/vim-fugitive"]
path = pack/plugins/start/vim-fugitive
url = https://github.com/tpope/vim-fugitive.git
[submodule "pack/plugins/start/coc.nvim"]
path = pack/plugins/start/coc.nvim
url = https://github.com/neoclide/coc.nvim

17
coc-settings.json Normal file
View File

@ -0,0 +1,17 @@
{
"languageserver": {
"go": {
"command": "gopls",
"filetypes": ["go"],
"rootPatterns": ["go.mod"],
"trace.server": "verbose"
},
"python": {
"command": "pyls",
"filetypes": ["python"],
"rootPatterns": [],
"trace.server": "verbose"
}
},
"suggest.noselect": false
}

View File

@ -1,6 +1,2 @@
" ale
let b:ale_linters = ['ccls']
let b:ale_set_highlights = 0
" vim-fswitch
noremap gfs :FSHere<Cr>

View File

@ -1,6 +1,2 @@
" ale
let b:ale_linters = ['ccls']
let b:ale_set_highlights = 0
" vim-fswitch
noremap gfs :FSHere<Cr>

View File

@ -1,8 +1,5 @@
setlocal noexpandtab
" ale
let b:ale_linters = ['gopls']
" vim-argwrap
let b:argwrap_tail_comma = 1

View File

@ -1,2 +0,0 @@
" ale
let b:ale_linters = ['pyls']

View File

@ -41,14 +41,27 @@ nnoremap k gk
" util
nnoremap <leader>ig :Guid<cr>
" coc.vim
nmap <silent> [g <Plug>(coc-diagnostic-prev)
nmap <silent> ]g <Plug>(coc-diagnostic-next)
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)
if has('nvim-0.4.0') || has('patch-8.2.0750')
nnoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>"
nnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
inoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? "\<c-r>=coc#float#scroll(1)\<cr>" : "\<Right>"
inoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? "\<c-r>=coc#float#scroll(0)\<cr>" : "\<Left>"
vnoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>"
vnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
endif
inoremap <expr><tab> pumvisible() ? '<C-y>' : '<tab>'
inoremap <expr><cr> pumvisible() ? '<C-e><cr>' : '<cr>'
" ale
nnoremap gd :ALEGoToDefinition<cr>
nnoremap gD :ALEGoToTypeDefinition<cr>
nnoremap gr :ALEFindReferences<cr>
" fzf
nnoremap <silent><leader>fg :GFiles<cr>
nnoremap <silent><leader>ff :Files ~<cr>

View File

@ -52,9 +52,16 @@ set tabstop=4
set ttimeout
set ttimeoutlen=50
set ttyfast
set updatetime=300
set wildignore+=*/tmp/*
set wildmenu
if has("nvim-0.5.0") || has("patch-8.1.1564")
set signcolumn=number
else
set signcolumn=yes
endif
if &shell =~ 'bin/fish'
set shell=/bin/sh
endif

@ -1 +0,0 @@
Subproject commit bee8eccb421968d1f2628c15e9f2bfcc3d0418aa

@ -0,0 +1 @@
Subproject commit 17494990ab110b70aec3d7c97707448c6d3e72c9

View File

@ -1,11 +1,3 @@
" ale
let g:ale_completion_enabled = 1
let g:ale_linters_explicit = 1
let g:ale_cpp_ccls_init_options = {
\ 'cacheDirectory': '/tmp/ccls',
\ 'cacheFormat': 'binary',
\ }
" fzf
let $FZF_DEFAULT_COMMAND='ag --hidden --ignore .git -f -g "" 2> /dev/null'
if has('windows')