diff --git a/vim/.vimrc b/vim/.vimrc index 7d80a1a..d0a983c 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -1,6 +1,9 @@ " Plugins call plug#begin('~/.vim/plugged') +" Sensible defaults +Plug 'tpope/vim-sensible' + " Startify Plug 'mhinz/vim-startify' @@ -29,11 +32,7 @@ Plug 'ap/vim-css-color' Plug 'aymericbeaumet/vim-symlink' " Code completion -Plug 'neoclide/coc.nvim', { 'branch': 'release' } -"Plug 'phpactor/phpactor', { 'for': 'php', 'branch': 'master', 'do': 'composer install --no-dev -o' } - -" ALE -Plug 'dense-analysis/ale' +Plug 'neovim/nvim-lspconfig' " Emmet Plug 'mattn/emmet-vim' @@ -205,132 +204,11 @@ autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isT let g:NERTreeChDirMode = 2 -map :NERDTreeToggle +nnoremap :NERDTreeToggle +nnoremap :NERDTreeToggleVCS nnoremap :NERDTreeFind " Code completion set hidden set shortmess+=c set signcolumn=yes - -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 - -if has('nvim') - inoremap coc#refresh() -else - inoremap coc#refresh() -endif - -inoremap pumvisible() ? coc#_select_confirm() - \: "\u\\=coc#on_enter()\" - -nmap [g (coc-diagnostic-prev) -nmap ]g (coc-diagnostic-next) - -nmap gd (coc-definition) -nmap gy (coc-type-definition) -nmap gi (coc-implementation) -nmap gr (coc-references) - -nnoremap K :call show_documentation() - -function! s:show_documentation() - if (index(['vim','help'], &filetype) >= 0) - execute 'h '.expand('') - elseif (coc#rpc#ready()) - call CocActionAsync('doHover') - else - execute '!' . &keywordprg . " " . expand('') - endif -endfunction - -autocmd CursorHold * silent call CocActionAsync('highlight') - -nmap rn (coc-rename) -xmap f (coc-format-selected) -nmap f (coc-format-selected) -xmap a (coc-codeaction-selected) -nmap a (coc-codeaction-selected) -nmap ac (coc-codeaction) -nmap qf (coc-fix-current) - -xmap if (coc-funcobj-i) -omap if (coc-funcobj-i) -xmap af (coc-funcobj-a) -omap af (coc-funcobj-a) -xmap ic (coc-classobj-i) -omap ic (coc-classobj-i) -xmap ac (coc-classobj-a) -omap ac (coc-classobj-a) - -if has('nvim-0.4.0') || has('patch-8.2.0750') - nnoremap coc#float#has_scroll() ? coc#float#scroll(1) : "\" - nnoremap coc#float#has_scroll() ? coc#float#scroll(0) : "\" - inoremap coc#float#has_scroll() ? "\=coc#float#scroll(1)\" : "\" - inoremap coc#float#has_scroll() ? "\=coc#float#scroll(0)\" : "\" - vnoremap coc#float#has_scroll() ? coc#float#scroll(1) : "\" - vnoremap coc#float#has_scroll() ? coc#float#scroll(0) : "\" -endif - -if has('nvim') - vnoremap coc#float#has_scroll() ? coc#float#nvim_scroll(1, 1) : "\" - vnoremap coc#float#has_scroll() ? coc#float#nvim_scroll(0, 1) : "\" -endif - -nmap (coc-range-select) -xmap (coc-range-select) - -command! -nargs=0 Format :call CocAction('format') -command! -nargs=? Fold :call CocAction('fold', ) -command! -nargs=0 OR :call CocAction('runCommand', 'editor.action.organizeImport') - -nnoremap a :CocList diagnostics -nnoremap e :CocList extensions -nnoremap c :CocList commands -nnoremap o :CocList outline -nnoremap s :CocList -I symbols -nnoremap j :CocNext -nnoremap k :CocPrev -nnoremap p :CocListResume - -set statusline^=%{coc#status()}%{get(b:,'coc_current_function','')} - -" Use for trigger snippet expand. -imap (coc-snippets-expand) - -" Use for select text for visual placeholder of snippet. -vmap (coc-snippets-select) - -" Use for jump to next placeholder, it's default of coc.nvim -let g:coc_snippet_next = '' - -" Use for jump to previous placeholder, it's default of coc.nvim -let g:coc_snippet_prev = '' - -" Use for both expand and jump (make expand higher priority.) -imap (coc-snippets-expand-jump) - -" Use x for convert visual selected code to snippet -xmap x (coc-convert-snippet) - -inoremap - \ pumvisible() ? coc#_select_confirm() : - \ coc#expandableOrJumpable() ? "\=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\" : - \ check_back_space() ? "\" : - \ coc#refresh() - -function! s:check_back_space() abort - let col = col('.') - 1 - return !col || getline('.')[col - 1] =~# '\s' -endfunction - -let g:coc_snippet_next = ''