diff --git a/vimrc b/vimrc index fc60484..4bf5363 100644 --- a/vimrc +++ b/vimrc @@ -36,6 +36,7 @@ endif set autoindent set backspace=indent,eol,start set smarttab +set breakindent set nrformats-=octal @@ -102,13 +103,13 @@ set cmdheight=2 set formatoptions-=cro set updatetime=300 set shortmess+=c -set signcolumn=number +set signcolumn=yes set hidden -" Code formatting, tabs to 4 spaces +" Code formatting, indent to 2 spaces set expandtab -set tabstop=4 -set shiftwidth=4 +set tabstop=2 +set shiftwidth=2 set nowrap set undolevels=1000 @@ -127,9 +128,8 @@ set viminfo='100,<1000,s100,h autocmd BufNewFile,BufRead *.mako setlocal ft=mako autocmd BufNewFile,BufRead *.mrb set ft=ruby autocmd BufNewFile,BufRead *.rbi set ft=ruby -autocmd FileType coffee,css,javascript,json,html,scss,typescript,xhtml,xml :set ts=2 sw=2 sts=2 et ch=2 -autocmd FileType lua :set ts=2 sw=2 sts=2 -autocmd FileType make :set ts=4 noet nolist +autocmd FileType python :set tabstop=4 shiftwidth=2 +autocmd FileType make :set tabstop=4 noexpandtab nolist autocmd FileType liquid :set noeol " vim-ruby @@ -164,24 +164,160 @@ let g:flake8_show_in_file=1 " Coc let g:coc_disable_startup_warning = 1 -" Use tab for trigger completion with characters ahead and navigate. +" Use tab for trigger completion with characters ahead and navigate +" NOTE: There's always complete item selected by default, you may want to enable +" no select by `"suggest.noselect": true` in your configuration file " NOTE: Use command ':verbose imap ' to make sure tab is not mapped by -" other plugin before putting this into your config. +" other plugin before putting this into your config inoremap - \ pumvisible() ? "\" : - \ check_back_space() ? "\" : + \ coc#pum#visible() ? coc#pum#next(1) : + \ CheckBackspace() ? "\" : \ coc#refresh() -inoremap pumvisible() ? "\" : "\" +inoremap coc#pum#visible() ? coc#pum#prev(1) : "\" -function! s:check_back_space() abort +" Make to accept selected completion item or notify coc.nvim to format +" u breaks current undo, please make your own choice +inoremap coc#pum#visible() ? coc#pum#confirm() + \: "\u\\=coc#on_enter()\" + +function! CheckBackspace() abort let col = col('.') - 1 return !col || getline('.')[col - 1] =~# '\s' endfunction -inoremap coc#refresh() +" Use to trigger completion +if has('nvim') + inoremap coc#refresh() +else + inoremap coc#refresh() +endif +" 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 ShowDocumentation() + +function! ShowDocumentation() + if CocAction('hasProvider', 'hover') + call CocActionAsync('doHover') + else + call feedkeys('K', 'in') + 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 code actions to the selected code block +" Example: `aap` for current paragraph +xmap a (coc-codeaction-selected) +nmap a (coc-codeaction-selected) + +" Remap keys for applying code actions at the cursor position +nmap ac (coc-codeaction-cursor) +" Remap keys for apply code actions affect whole buffer +nmap as (coc-codeaction-source) +" Apply the most preferred quickfix action to fix diagnostic on the current line +nmap qf (coc-fix-current) + +" Remap keys for applying refactor code actions +nmap re (coc-codeaction-refactor) +xmap r (coc-codeaction-refactor-selected) +nmap r (coc-codeaction-refactor-selected) + +" Run the Code Lens action on the current line +nmap cl (coc-codelens-action) + +" 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 to 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 CocActionAsync('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 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 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 + + + + + + + + + vmap q gq nmap q gqap @@ -238,9 +374,9 @@ let g:airline_theme='bubblegum' " ale let g:ale_disable_lsp = 1 -let g:ale_linters = {'ruby': ['rubocop'], 'eruby': ['erblint'], 'javascript': ['eslint']} +let g:ale_linters = {'python': ['ruff'], 'ruby': ['rubocop'], 'eruby': ['erblint'], 'javascript': ['eslint']} let g:ale_linters_ignore = {'typescript': ['eslint']} -let g:ale_fixers = {'javascript': ['eslint'], 'ruby': ['rubocop']} +let g:ale_fixers = {'python': ['ruff'], 'javascript': ['eslint'], 'ruby': ['rubocop']} let g:ale_ruby_rubocop_executable = 'bundle' let g:ale_eruby_erblint_executable = 'bundle' nmap f (ale_fix)