Some changes for coc to work.
This commit is contained in:
parent
e1b7945706
commit
e25bd405d1
@ -94,10 +94,20 @@ endfunction
|
|||||||
function! s:show_documentation()
|
function! s:show_documentation()
|
||||||
if (index(['vim','help'], &filetype) >= 0)
|
if (index(['vim','help'], &filetype) >= 0)
|
||||||
execute 'h '.expand('<cword>')
|
execute 'h '.expand('<cword>')
|
||||||
|
elseif (coc#rpc#ready())
|
||||||
|
call CocActionAsync('doHover')
|
||||||
else
|
else
|
||||||
call CocAction('doHover')
|
execute '!' . &keywordprg . " " . expand('<cword>')
|
||||||
endif
|
endif
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
|
"function! s:show_documentation()
|
||||||
|
" if (index(['vim','help'], &filetype) >= 0)
|
||||||
|
" execute 'h '.expand('<cword>')
|
||||||
|
" else
|
||||||
|
" call CocAction('doHover')
|
||||||
|
" endif
|
||||||
|
"endfunction
|
||||||
|
|
||||||
" -----
|
" -----
|
||||||
" }}}
|
" }}}
|
||||||
|
@ -52,8 +52,10 @@ command! -bang -nargs=? -complete=dir Files
|
|||||||
map <C-w> :echom 'Close buffer' <bar> :call BufClose()<cr>
|
map <C-w> :echom 'Close buffer' <bar> :call BufClose()<cr>
|
||||||
map <C-o> :e
|
map <C-o> :e
|
||||||
map <C-n> :enew<cr>
|
map <C-n> :enew<cr>
|
||||||
map <Tab> :bn<cr>
|
map <C-]> :bn<cr>
|
||||||
map <S-Tab> :bp<cr>
|
map <C-[> :bp<cr>
|
||||||
|
imap <C-]> :bn<cr>
|
||||||
|
imap <C-[> :bp<cr>
|
||||||
|
|
||||||
" -----
|
" -----
|
||||||
" }}}
|
" }}}
|
||||||
@ -74,10 +76,10 @@ map <C-l> :call WinMove('l')<cr>
|
|||||||
" Tabs {{{
|
" Tabs {{{
|
||||||
" -----
|
" -----
|
||||||
|
|
||||||
map <leader>tn :tabnew<cr>
|
"map <leader>tn :tabnew<cr> <bar> :Startify<cr>
|
||||||
map <leader>tc :tabclose<cr>
|
"map <leader>tc :tabclose<cr>
|
||||||
map <C-Tab> :tabnext<cr>
|
"map <C-]> :tabnext<cr>
|
||||||
map <leader><Tab> :tabnext<cr>
|
"map <C-[> :tabprev<cr>
|
||||||
|
|
||||||
" -----
|
" -----
|
||||||
" }}}
|
" }}}
|
||||||
@ -104,6 +106,13 @@ else
|
|||||||
inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
|
inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
" Use <c-space> to trigger completion.
|
||||||
|
if has('nvim')
|
||||||
|
inoremap <silent><expr> <c-space> coc#refresh()
|
||||||
|
else
|
||||||
|
inoremap <silent><expr> <c-@> coc#refresh()
|
||||||
|
endif
|
||||||
|
|
||||||
" Use `[g` and `]g` to navigate diagnostics
|
" Use `[g` and `]g` to navigate diagnostics
|
||||||
" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list.
|
" 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-prev)
|
||||||
@ -118,6 +127,13 @@ nmap <silent> gr <Plug>(coc-references)
|
|||||||
" Use K to show documentation in preview window.
|
" Use K to show documentation in preview window.
|
||||||
nnoremap <silent> K :call <SID>show_documentation()<CR>
|
nnoremap <silent> K :call <SID>show_documentation()<CR>
|
||||||
|
|
||||||
|
" 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)
|
||||||
|
|
||||||
" -----
|
" -----
|
||||||
" }}}
|
" }}}
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
1.0.70
|
1.0.71
|
||||||
|
@ -3,8 +3,8 @@ if exists('g:loaded_kite') || &cp
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
if has('nvim')
|
if has('nvim')
|
||||||
if !has('nvim-0.2')
|
if !has('nvim-0.3')
|
||||||
echoerr 'Kite requires Neovim 0.2 or greater'
|
echoerr 'Kite requires Neovim 0.3 or greater'
|
||||||
finish
|
finish
|
||||||
endif
|
endif
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user