More vim updates
This commit is contained in:
parent
18a0b30bb3
commit
b4ea47ffef
144
nvim/coc
144
nvim/coc
@ -1,12 +1,140 @@
|
||||
inoremap <silent><expr> <cr> pumvisible() ? coc#_select_confirm() : "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
|
||||
|
||||
" use <tab> 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 <tab>' 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 <silent><expr> <Tab>
|
||||
\ pumvisible() ? "\<C-n>" :
|
||||
\ <SID>check_back_space() ? "\<Tab>" :
|
||||
\ coc#refresh()
|
||||
inoremap <silent><expr> <TAB>
|
||||
\ pumvisible() ? "\<C-n>" :
|
||||
\ coc#expandableOrJumpable() ?
|
||||
\ "\<C-r>=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\<CR>" :
|
||||
\ <SID>check_back_space() ? "\<TAB>" :
|
||||
\ coc#refresh()
|
||||
inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
|
||||
|
||||
" Use <C-space> to trigger completion.
|
||||
if has('nvim')
|
||||
inoremap <silent><expr> <C-space> coc#refresh()
|
||||
else
|
||||
inoremap <silent><expr> <C-@> coc#refresh()
|
||||
endif
|
||||
|
||||
let g:coc_snippet_next = '<C-j>'
|
||||
let g:coc_snippet_prev= '<C-k>'
|
||||
|
||||
" Make <CR> auto-select the first completion item and notify coc.nvim to
|
||||
" format on enter, <cr> could be remapped by other vim plugin
|
||||
inoremap <silent><expr> <cr> pumvisible() ? coc#_select_confirm()
|
||||
\: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
|
||||
|
||||
" Use `[g` and `]g` to navigate diagnostics
|
||||
" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list.
|
||||
nmap <silent> [g <Plug>(coc-diagnostic-prev)
|
||||
nmap <silent> ]g <Plug>(coc-diagnostic-next)
|
||||
|
||||
" GoTo 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>')
|
||||
elseif (coc#rpc#ready())
|
||||
call CocActionAsync('doHover')
|
||||
else
|
||||
execute '!' . &keywordprg . " " . expand('<cword>')
|
||||
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)
|
||||
|
||||
" 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 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 <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>
|
||||
|
||||
@ -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"
|
||||
}
|
||||
|
||||
13
nvim/colors
13
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
|
||||
|
||||
@ -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'
|
||||
|
||||
14
vimrc
14
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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user