Skip to content

Commit

Permalink
vim-plug and coc.vim for rust
Browse files Browse the repository at this point in the history
* Use vim-plug for all vim plugins
* Unified vim and neovim settings
* Lazy-loading of coc.vim for rust projects
  • Loading branch information
clvv committed Dec 30, 2021
1 parent bbc7caa commit 7d6c7fd
Show file tree
Hide file tree
Showing 33 changed files with 215 additions and 158 deletions.
158 changes: 158 additions & 0 deletions .config/nvim/coc.vim
@@ -0,0 +1,158 @@
" Having longer updatetime (default is 4000 ms = 4 s) leads to noticeable
" delays and poor user experience.
set updatetime=300

" Avoid showing extra messages when using completion
set shortmess+=c

" Always show the signcolumn, otherwise it would shift the text each time
" diagnostics appear/become resolved.
if has("nvim-0.5.0") || has("patch-8.1.1564")
" Recently vim can merge signcolumn and number column into one
set signcolumn=number
else
set signcolumn=yes
endif

" Use tab for trigger completion with characters ahead and navigate.
" NOTE: Use command ':verbose imap <tab>' to make sure tab is not mapped by
" other plugin before putting this into your config.
inoremap <silent><expr> <TAB>
\ pumvisible() ? "\<C-n>" :
\ <SID>check_back_space() ? "\<TAB>" :
\ coc#refresh()
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
function! s:check_back_space() abort
let col = col('.') - 1
return !col || getline('.')[col - 1] =~ '\s'
endfunction

" Use <c-space> to trigger completion.
if has('nvim')
inoremap <silent><expr> <c-space> coc#refresh()
else
inoremap <silent><expr> <c-@> coc#refresh()
endif

" Make <CR> auto-select the first completion item and notify coc.nvim to
" format on enter, <cr> could be remapped by other vim plugin
" Play well with endwise: https://github.com/tpope/vim-endwise/issues/125#issuecomment-743921576
"
inoremap <silent> <CR> <C-r>=<SID>coc_confirm()<CR>
function! s:coc_confirm() abort
if pumvisible() && complete_info()["selected"] >= 0
return coc#_select_confirm()
else
return "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
endif
endfunction

" Goto previous/next diagnostic warning/error
nmap <silent> [d <Plug>(coc-diagnostic-prev)
nmap <silent> ]d <Plug>(coc-diagnostic-next)
" Code navigation
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)
" Use K to show documentation in preview window.
nnoremap <silent> K :call <SID>show_documentation()<CR>
function! s:show_documentation()
if (index(['vim','help'], &filetype) >= 0)
execute 'h '.expand('<cword>')
else
call CocActionAsync('doHover')
endif
endfunction
" Highlight the symbol and its references when holding the cursor.
autocmd CursorHold * silent call CocActionAsync('highlight')

" Symbol renaming.
nmap <leader>rn <Plug>(coc-rename)
" Formatting selected code.
xmap <leader>f <Plug>(coc-format-selected)
nmap <leader>f <Plug>(coc-format-selected)
augroup mygroup
autocmd!
" Setup formatexpr specified filetype(s).
autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected')
" Update signature help on jump placeholder.
autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp')
augroup end

" Applying codeAction to the selected region.
" Example: `<leader>aap` for current paragraph
xmap <leader>a <Plug>(coc-codeaction-selected)
nmap <leader>a <Plug>(coc-codeaction-selected)
" Remap keys for applying codeAction to the current buffer.
nmap <leader>ac <Plug>(coc-codeaction)
" Apply AutoFix to problem on the current line.
nmap <leader>qf <Plug>(coc-fix-current)
" Run the Code Lens action on the current line.
nmap <leader>cl <Plug>(coc-codelens-action)
" Map function and class text objects
" NOTE: Requires 'textDocument.documentSymbol' support from the language server.
xmap if <Plug>(coc-funcobj-i)
omap if <Plug>(coc-funcobj-i)
xmap af <Plug>(coc-funcobj-a)
omap af <Plug>(coc-funcobj-a)
xmap ic <Plug>(coc-classobj-i)
omap ic <Plug>(coc-classobj-i)
xmap ac <Plug>(coc-classobj-a)
omap ac <Plug>(coc-classobj-a)
" Remap <C-f> and <C-b> for scroll float windows/popups.
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

" Use CTRL-S for selections ranges.
" Requires 'textDocument/selectionRange' support of language server.
nmap <silent> <C-s> <Plug>(coc-range-select)
xmap <silent> <C-s> <Plug>(coc-range-select)
" Add `:Format` command to format current buffer.
command! -nargs=0 Format :call CocAction('format')

" Add `:Fold` command to fold current buffer.
command! -nargs=? Fold :call CocAction('fold', <f-args>)

" Add `:OR` command for organize imports of the current buffer.
command! -nargs=0 OR :call CocActionAsync('runCommand', 'editor.action.organizeImport')

" Add (Neo)Vim's native statusline support.
" NOTE: Please see `:h coc-status` for integrations with external plugins that
" provide custom statusline: lightline.vim, vim-airline.
set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')}

" Mappings for CoCList
" Show all diagnostics.
nnoremap <silent><nowait> <space>a :<C-u>CocList diagnostics<cr>
" Manage extensions.
nnoremap <silent><nowait> <space>e :<C-u>CocList extensions<cr>
" Show commands.
nnoremap <silent><nowait> <space>c :<C-u>CocList commands<cr>
" Find symbol of current document.
nnoremap <silent><nowait> <space>o :<C-u>CocList outline<cr>
" Search workspace symbols.
nnoremap <silent><nowait> <space>s :<C-u>CocList -I symbols<cr>
" Do default action for next item.
nnoremap <silent><nowait> <space>j :<C-u>CocNext<CR>
" Do default action for previous item.
nnoremap <silent><nowait> <space>k :<C-u>CocPrev<CR>
" Resume latest coc list.
nnoremap <silent><nowait> <space>p :<C-u>CocListResume<CR>
81 changes: 3 additions & 78 deletions .gitmodules
Expand Up @@ -4,81 +4,6 @@
[submodule "lib/fasd"]
path = lib/fasd
url = https://github.com/clvv/fasd.git
[submodule ".vim/bundle/vim-pathogen"]
path = .vim/bundle/vim-pathogen
url = https://github.com/tpope/vim-pathogen.git
[submodule ".vim/bundle/Lucius"]
path = .vim/bundle/Lucius
url = https://github.com/clvv/Lucius.git
[submodule ".vim/bundle/vim-coffee-script"]
path = .vim/bundle/vim-coffee-script
url = https://github.com/kchmck/vim-coffee-script.git
[submodule ".vim/bundle/a.vim"]
path = .vim/bundle/a.vim
url = https://github.com/clvv/a.vim.git
[submodule ".vim/bundle/delimitMate"]
path = .vim/bundle/delimitMate
url = https://github.com/Raimondi/delimitMate.git
[submodule ".vim/bundle/file-line"]
path = .vim/bundle/file-line
url = https://github.com/bogado/file-line.git
[submodule ".vim/bundle/IndexedSearch"]
path = .vim/bundle/IndexedSearch
url = https://github.com/vim-scripts/IndexedSearch.git
[submodule ".vim/bundle/supertab"]
path = .vim/bundle/supertab
url = https://github.com/ervandew/supertab.git
[submodule ".vim/bundle/vim-endwise"]
path = .vim/bundle/vim-endwise
url = https://github.com/tpope/vim-endwise.git
[submodule ".vim/bundle/tabular"]
path = .vim/bundle/tabular
url = https://github.com/godlygeek/tabular.git
[submodule ".vim/bundle/vim-commentary"]
path = .vim/bundle/vim-commentary
url = https://github.com/tpope/vim-commentary.git
[submodule ".vim/bundle/vim-enunuch"]
path = .vim/bundle/vim-enunuch
url = https://github.com/tpope/vim-eunuch.git
[submodule ".vim/bundle/vim-fugitive"]
path = .vim/bundle/vim-fugitive
url = https://github.com/tpope/vim-fugitive.git
[submodule ".vim/bundle/vim-ragtag"]
path = .vim/bundle/vim-ragtag
url = https://github.com/tpope/vim-ragtag.git
[submodule ".vim/bundle/vim-repeat"]
path = .vim/bundle/vim-repeat
url = https://github.com/tpope/vim-repeat.git
[submodule ".vim/bundle/vim-surround"]
path = .vim/bundle/vim-surround
url = https://github.com/tpope/vim-surround.git
[submodule ".vim/bundle/vim-tmux"]
path = .vim/bundle/vim-tmux
url = https://github.com/tsaleh/vim-tmux.git
[submodule ".vim/bundle/ZoomWin"]
path = .vim/bundle/ZoomWin
url = https://github.com/vim-scripts/ZoomWin.git
[submodule ".vim/bundle/ctrlp.vim"]
path = .vim/bundle/ctrlp.vim
url = https://github.com/kien/ctrlp.vim.git
[submodule ".vim/bundle/ack.vim"]
path = .vim/bundle/ack.vim
url = https://github.com/mileszs/ack.vim.git
[submodule ".vim/bundle/tlib_vim"]
path = .vim/bundle/tlib_vim
url = https://github.com/tomtom/tlib_vim.git
[submodule ".vim/bundle/vim-addon-mw-utils"]
path = .vim/bundle/vim-addon-mw-utils
url = https://github.com/MarcWeber/vim-addon-mw-utils.git
[submodule ".vim/bundle/vim-snipmate"]
path = .vim/bundle/vim-snipmate
url = https://github.com/garbas/vim-snipmate.git
[submodule ".vim/bundle/nerdtree"]
path = .vim/bundle/nerdtree
url = https://github.com/scrooloose/nerdtree.git
[submodule ".vim/bundle/rust.vim"]
path = .vim/bundle/rust.vim
url = https://github.com/rust-lang/rust.vim.git
[submodule ".vim/bundle/tagbar"]
path = .vim/bundle/tagbar
url = https://github.com/preservim/tagbar.git
[submodule "lib/vim-plug"]
path = lib/vim-plug
url = https://github.com/junegunn/vim-plug.git
1 change: 1 addition & 0 deletions .vim/autoload/plug.vim
1 change: 0 additions & 1 deletion .vim/bundle/IndexedSearch
Submodule IndexedSearch deleted from 500a64
1 change: 0 additions & 1 deletion .vim/bundle/Lucius
Submodule Lucius deleted from 3f8e24
1 change: 0 additions & 1 deletion .vim/bundle/ZoomWin
Submodule ZoomWin deleted from cf21ce
1 change: 0 additions & 1 deletion .vim/bundle/a.vim
Submodule a.vim deleted from 907e32
1 change: 0 additions & 1 deletion .vim/bundle/ack.vim
Submodule ack.vim deleted from 36e40f
1 change: 0 additions & 1 deletion .vim/bundle/ctrlp.vim
Submodule ctrlp.vim deleted from 564176
1 change: 0 additions & 1 deletion .vim/bundle/delimitMate
Submodule delimitMate deleted from 537a1d
1 change: 0 additions & 1 deletion .vim/bundle/file-line
Submodule file-line deleted from 559088
1 change: 0 additions & 1 deletion .vim/bundle/nerdtree
Submodule nerdtree deleted from eed488
1 change: 0 additions & 1 deletion .vim/bundle/rust.vim
Submodule rust.vim deleted from 4aa69b
1 change: 0 additions & 1 deletion .vim/bundle/supertab
Submodule supertab deleted from f0093a
1 change: 0 additions & 1 deletion .vim/bundle/tabular
Submodule tabular deleted from 339091
1 change: 0 additions & 1 deletion .vim/bundle/tagbar
Submodule tagbar deleted from 0441c1
1 change: 0 additions & 1 deletion .vim/bundle/tlib_vim
Submodule tlib_vim deleted from 70c4e2
6 changes: 0 additions & 6 deletions .vim/bundle/tlib_vim_after/after/plugin/02tlib.vim

This file was deleted.

1 change: 0 additions & 1 deletion .vim/bundle/vim-addon-mw-utils
Submodule vim-addon-mw-utils deleted from 6aaf4f
1 change: 0 additions & 1 deletion .vim/bundle/vim-coffee-script
Submodule vim-coffee-script deleted from 284212
1 change: 0 additions & 1 deletion .vim/bundle/vim-commentary
Submodule vim-commentary deleted from 627308
1 change: 0 additions & 1 deletion .vim/bundle/vim-endwise
Submodule vim-endwise deleted from 428988
1 change: 0 additions & 1 deletion .vim/bundle/vim-enunuch
Submodule vim-enunuch deleted from 7a48f9
1 change: 0 additions & 1 deletion .vim/bundle/vim-fugitive
Submodule vim-fugitive deleted from da3081
1 change: 0 additions & 1 deletion .vim/bundle/vim-pathogen
Submodule vim-pathogen deleted from e0a3ef
1 change: 0 additions & 1 deletion .vim/bundle/vim-ragtag
Submodule vim-ragtag deleted from b8966c
1 change: 0 additions & 1 deletion .vim/bundle/vim-repeat
Submodule vim-repeat deleted from 24afe9
1 change: 0 additions & 1 deletion .vim/bundle/vim-snipmate
Submodule vim-snipmate deleted from ed3c54
1 change: 0 additions & 1 deletion .vim/bundle/vim-surround
Submodule vim-surround deleted from aeb933
1 change: 0 additions & 1 deletion .vim/bundle/vim-tmux
Submodule vim-tmux deleted from 1a0900
5 changes: 3 additions & 2 deletions .vimpagerrc
@@ -1,8 +1,9 @@
if &t_Co == 256
set mouse=a
if filereadable(expand('~/.vim/bundle/Lucius/colors/lucius.vim'))
let &runtimepath .= ',' . expand('~/.vim/bundle/Lucius')
if filereadable(expand('~/.vim/plugged/vim-lucius/colors/lucius.vim'))
let &runtimepath .= ',' . expand('~/.vim/plugged/vim-lucius')
colorscheme lucius
LuciusDark
endif
endif

Expand Down

0 comments on commit 7d6c7fd

Please sign in to comment.