From a02c31afca1936312a63412c07350baf9f88b1cd Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 1 Apr 2020 17:15:46 -0400 Subject: big updates --- modules/coc.vim | 144 ++++++++++++++++++++++++++++++++++++++++++++++ modules/nodepath.vim | 2 + modules/plugins.vim | 8 ++- modules/vim-which-key.vim | 1 + 4 files changed, 152 insertions(+), 3 deletions(-) create mode 100644 modules/coc.vim create mode 100644 modules/nodepath.vim (limited to 'modules') diff --git a/modules/coc.vim b/modules/coc.vim new file mode 100644 index 00000000..855127a0 --- /dev/null +++ b/modules/coc.vim @@ -0,0 +1,144 @@ +" TextEdit might fail if hidden is not set. +set hidden + +" Some servers have issues with backup files, see #649. +set nobackup +set nowritebackup + +" Give more space for displaying messages. +set cmdheight=2 + +" Having longer updatetime (default is 4000 ms = 4 s) leads to noticeable +" delays and poor user experience. +set updatetime=300 + +" Don't pass messages to |ins-completion-menu|. +set shortmess+=c + +" Always show the signcolumn, otherwise it would shift the text each time +" diagnostics appear/become resolved. +set signcolumn=yes + +"better nav for omnicomplete +inoremap ("\") +inoremap ("\") + +" Use tab for trigger completion with characters ahead and navigate. +" NOTE: Use command ':verbose imap ' to make sure tab is not mapped by +" other plugin before putting this into your config. +inoremap + \ pumvisible() ? "\" : + \ check_back_space() ? "\" : + \ coc#refresh() +inoremap pumvisible() ? "\" : "\" + +function! s:check_back_space() abort + let col = col('.') - 1 + return !col || getline('.')[col - 1] =~# '\s' +endfunction + +" Use to trigger completion. +inoremap coc#refresh() + +" Use to confirm completion, `u` means break undo chain at current +" position. Coc only does snippet and additional edit on confirm. +if has('patch8.1.1068') + " Use `complete_info` if your (Neo)Vim version supports it. + inoremap complete_info()["selected"] != "-1" ? "\" : "\u\" +else + imap pumvisible() ? "\" : "\u\" +endif + +" Use `[g` and `]g` to navigate diagnostics +nmap [g (coc-diagnostic-prev) +nmap ]g (coc-diagnostic-next) + +" GoTo code navigation. +nmap gd (coc-definition) +nmap gy (coc-type-definition) +nmap gi (coc-implementation) +nmap gr (coc-references) + +" Use K to show documentation in preview window. +nnoremap K :call show_documentation() + +function! s:show_documentation() + if (index(['vim','help'], &filetype) >= 0) + execute 'h '.expand('') + else + call CocAction('doHover') + endif +endfunction + +" Highlight the symbol and its references when holding the cursor. +autocmd CursorHold * silent call CocActionAsync('highlight') + +" Symbol renaming. +nmap rn (coc-rename) + +" Formatting selected code. +xmap f (coc-format-selected) +nmap f (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: `aap` for current paragraph +xmap a (coc-codeaction-selected) +nmap a (coc-codeaction-selected) + +" Remap keys for applying codeAction to the current line. +nmap ac (coc-codeaction) +" Apply AutoFix to problem on the current line. +nmap qf (coc-fix-current) + +" Introduce function text object +" NOTE: Requires 'textDocument.documentSymbol' support from the language server. +xmap if (coc-funcobj-i) +xmap af (coc-funcobj-a) +omap if (coc-funcobj-i) +omap af (coc-funcobj-a) + +" Use for selections ranges. +" NOTE: Requires 'textDocument/selectionRange' support from the language server. +" coc-tsserver, coc-python are the examples of servers that support it. +nmap (coc-range-select) +xmap (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', ) + +" Add `:OR` command for organize imports of the current buffer. +command! -nargs=0 OR :call CocAction('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 using CoCList: +" Show all diagnostics. +nnoremap a :CocList diagnostics +" Manage extensions. +nnoremap e :CocList extensions +" Show commands. +nnoremap c :CocList commands +" Find symbol of current document. +nnoremap o :CocList outline +" Search workspace symbols. +nnoremap s :CocList -I symbols +" Do default action for next item. +nnoremap j :CocNext +" Do default action for previous item. +nnoremap k :CocPrev +" Resume latest coc list. +nnoremap p :CocListResume diff --git a/modules/nodepath.vim b/modules/nodepath.vim new file mode 100644 index 00000000..20d6c33d --- /dev/null +++ b/modules/nodepath.vim @@ -0,0 +1,2 @@ +" You can comment this and recomment it after installing coc executable('~/.nvm/versions/node/v12.16.1/bin/node') +let g:coc_node_path = expand("~/.nvm/versions/node/v12.16.1/bin/node") diff --git a/modules/plugins.vim b/modules/plugins.vim index 47117172..2538b601 100644 --- a/modules/plugins.vim +++ b/modules/plugins.vim @@ -12,6 +12,8 @@ if dein#load_state('~/.config/nvim/dein') "call dein#add('kevinhwang91/rnvimr', {'do': 'make sync'}) call dein#add('francoiscabrol/ranger.vim') call dein#add('rbgrouleff/bclose.vim') + " Language support + call dein#add('neoclide/coc.nvim', {'merged':0, 'rev': 'release'}) " All the Themes call dein#add('joshdick/onedark.vim') " key menu popup " @@ -48,7 +50,7 @@ if dein#load_state('~/.config/nvim/dein') " Buffergator use \b "" call dein#add('jeetsukumaran/vim-buffergator') " Ctrlp - call dein#add('ctrlpvim/ctrlp.vim') + "call dein#add('ctrlpvim/ctrlp.vim') "Linting call dein#add('w0rp/ale') call dein#add('autozimu/LanguageClient-neovim', { @@ -56,8 +58,8 @@ if dein#load_state('~/.config/nvim/dein') \ 'build': 'bash install.sh', \ }) " Fuzzy finder - call dein#add('junegunn/fzf.vim', { 'dir': '~/.fzf', 'do': './install --all' }) - call dein#add('junegunn/fzf') + "call dein#add('junegunn/fzf.vim', { 'dir': '~/.fzf', 'do': './install --all' }) + "call dein#add('junegunn/fzf') " Sneak mode " call dein#add('justinmk/vim-sneak') ""Git diff --git a/modules/vim-which-key.vim b/modules/vim-which-key.vim index 1931a42e..2e791a06 100644 --- a/modules/vim-which-key.vim +++ b/modules/vim-which-key.vim @@ -32,6 +32,7 @@ nnoremap code :call OpenConfigFile('~/Library/Application Suppo let g:which_key_map['/'] = [ 'NERDCommenterToggle','commenter' ] let g:which_key_map['p'] = [ 'pclose','close-preview' ] let g:which_key_map['q'] = [ 'q','quit' ] +let g:which_key_map['d'] = [ 'bd','delete-buffer' ] let g:which_key_map['s'] = [ 'w','save' ] "let g:which_key_map['f'] = [ 'Denite file','files' ] let g:which_key_map['f'] = [ 'Ranger','Ranger' ] -- cgit v1.2.3