diff --git a/nvim/coc b/nvim/coc index ace225c..8a84a72 100644 --- a/nvim/coc +++ b/nvim/coc @@ -1,12 +1,140 @@ -inoremap pumvisible() ? coc#_select_confirm() : "\u\\=coc#on_enter()\" - -" use for trigger completion and navigate to the next complete item +" 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. function! s:check_back_space() abort let col = col('.') - 1 - return !col || getline('.')[col - 1] =~ '\s' + return !col || getline('.')[col - 1] =~# '\s' endfunction -inoremap - \ pumvisible() ? "\" : - \ check_back_space() ? "\" : - \ coc#refresh() +inoremap + \ pumvisible() ? "\" : + \ coc#expandableOrJumpable() ? + \ "\=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\" : + \ check_back_space() ? "\" : + \ coc#refresh() +inoremap pumvisible() ? "\" : "\" + +" Use to trigger completion. +if has('nvim') + inoremap coc#refresh() +else + inoremap coc#refresh() +endif + +let g:coc_snippet_next = '' +let g:coc_snippet_prev= '' + +" Make auto-select the first completion item and notify coc.nvim to +" format on enter, could be remapped by other vim plugin +inoremap pumvisible() ? coc#_select_confirm() + \: "\u\\=coc#on_enter()\" + +" Use `[g` and `]g` to navigate diagnostics +" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list. +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('') + elseif (coc#rpc#ready()) + call CocActionAsync('doHover') + else + execute '!' . &keywordprg . " " . expand('') + 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 buffer. +nmap ac (coc-codeaction) +" Apply AutoFix to problem on the current line. +nmap qf (coc-fix-current) + +" Map function and class text objects +" NOTE: Requires 'textDocument.documentSymbol' support from the language server. +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) + +" Remap and for scroll float windows/popups. +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 + +" Use CTRL-S for selections ranges. +" Requires 'textDocument/selectionRange' support of language server. +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 for 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/nvim/coc-settings.json b/nvim/coc-settings.json index c565b68..c928611 100644 --- a/nvim/coc-settings.json +++ b/nvim/coc-settings.json @@ -10,26 +10,37 @@ "diagnostic.infoSign": "🛈", "diagnostic.checkCurrentLine": true, "coc.preferences.formatOnSaveFiletypes": [ - "javascript", - "html", - "json", "css", - "scss", - "go" + "go", + "html", + "javascript", + "json", + "rust", + "scss" ], - "coc.preferences.hoverTarget": "float", + "hover.target": "float", "languageserver": { "golang": { "command": "gopls", "rootPatterns": [ - "go.mod" + "go.mod", + ".vim/", + ".git/", + ".hg/" ], "filetypes": [ "go" - ] + ], + "initializationOptions": { + "usePlaceholders": true + } } }, "go.goplsOptions": { "staticcheck": true - } + }, + "snippets.textmateSnippetsRoots": [ + "~/.config/coc/snippets" + ], + "rust-analyzer.checkOnSave.command": "clippy" } diff --git a/nvim/colors b/nvim/colors index d5452a7..60f6d33 100644 --- a/nvim/colors +++ b/nvim/colors @@ -18,20 +18,21 @@ function! s:sonokai_custom() abort " the fourth parameter is for UI highlighting which is optional, " and the last parameter is for `guisp` which is also optional. " See `autoload/sonokai.vim` for the format of `l:palette`. - call sonokai#highlight('BlueSign', l:palette.blue, l:palette.bg1) + call sonokai#highlight('GitCommitTemplateTag', l:palette.orange, l:palette.none) + call sonokai#highlight('LineNr', l:palette.grey, l:palette.bg1) + call sonokai#highlight('SignColumn', l:palette.fg, l:palette.bg1) + call sonokai#highlight('Terminal', l:palette.fg, l:palette.bg1) + call sonokai#highlight('VertSplit', l:palette.bg1, l:palette.none) call sonokai#highlight('CocGitAddedSign', l:palette.green, l:palette.bg1) call sonokai#highlight('CocGitChangeRemovedSign', l:palette.purple, l:palette.bg1) call sonokai#highlight('CocGitChangedSign', l:palette.blue, l:palette.bg1) call sonokai#highlight('CocGitRemovedSign', l:palette.red, l:palette.bg1) call sonokai#highlight('CocGitTopRemovedSign', l:palette.red, l:palette.bg1) - call sonokai#highlight('GitCommitTemplateTag', l:palette.orange, l:palette.none) + call sonokai#highlight('BlueSign', l:palette.blue, l:palette.bg1) call sonokai#highlight('GreenSign', l:palette.green, l:palette.bg1) - call sonokai#highlight('LineNr', l:palette.grey, l:palette.bg1) call sonokai#highlight('RedSign', l:palette.red, l:palette.bg1) - call sonokai#highlight('SignColumn', l:palette.fg, l:palette.bg1) - call sonokai#highlight('Terminal', l:palette.fg, l:palette.bg1) - call sonokai#highlight('VertSplit', l:palette.bg1, l:palette.none) call sonokai#highlight('YellowSign', l:palette.yellow, l:palette.bg1) + call sonokai#highlight('CocHintSign', l:palette.grey, l:palette.none, 'italic') endfunction augroup CustomColors diff --git a/nvim/plugins b/nvim/plugins index 2ceae8d..a7783ce 100644 --- a/nvim/plugins +++ b/nvim/plugins @@ -1,8 +1,10 @@ " Assorted plugins Plug 'cespare/vim-toml' +Plug 'honza/vim-snippets' +Plug 'leafgarland/typescript-vim' Plug 'mileszs/ack.vim' +Plug 'posva/vim-vue' Plug 'tpope/vim-fugitive' -Plug 'fatih/vim-go' Plug 'tpope/vim-projectionist' Plug 'tpope/vim-rails' Plug 'tpope/vim-surround' diff --git a/vimrc b/vimrc index 83e5a35..70041ee 100644 --- a/vimrc +++ b/vimrc @@ -3,6 +3,7 @@ set autowrite set backspace=2 set breakindent set clipboard=unnamed +set cmdheight=2 set colorcolumn=+1 set complete+=kspell set cursorline @@ -11,6 +12,7 @@ set encoding=utf-8 set expandtab set exrc set fillchars=vert:▐ +set hidden set history=50 set incsearch set laststatus=2 @@ -27,6 +29,7 @@ set numberwidth=5 set ruler set shiftround set shiftwidth=2 +set shortmess+=c set showbreak=·· set showcmd set signcolumn=yes @@ -38,8 +41,14 @@ set termguicolors set textwidth=80 set title set ttyfast +set updatetime=300 set vb t_vb= +if has("nvim-0.5.0") || has("patch-8.1.1564") + " Recently vim can merge signcolumn and number column into one + set signcolumn=number +endif + syntax enable syntax sync minlines=128 maxlines=512 @@ -95,11 +104,6 @@ if filereadable(expand("~/.config/nvim/test")) source ~/.config/nvim/test endif -" Golang setup -if filereadable(expand("~/.config/nvim/golang")) - source ~/.config/nvim/golang -endif - " Color setup if filereadable(expand("~/.config/nvim/colors")) source ~/.config/nvim/colors