Skip to content

Commit 18eea04

Browse files
committed
for #371
1 parent c0fa9de commit 18eea04

File tree

5 files changed

+19
-8
lines changed

5 files changed

+19
-8
lines changed

README-cn.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ vim.g.easycomplete_pum_format = {"kind", "abbr", "menu"}
4848
vim.keymap.set('n', 'gr', ':EasyCompleteReference<CR>')
4949
vim.keymap.set('n', 'gd', ':EasyCompleteGotoDefinition<CR>')
5050
vim.keymap.set('n', 'rn', ':EasyCompleteRename<CR>')
51-
vim.keymap.set('n', 'gh', ':EasyCompleteHover<CR>')
51+
-- 插件默认绑定 shift-k 至 `:EasyCompleteHover`
52+
-- vim.keymap.set('n', 'gh', ':EasyCompleteHover<CR>')
5253
vim.keymap.set('n', 'gb', ':BackToOriginalBuffer<CR>')
5354

5455
-- cmdline 补全
@@ -90,7 +91,8 @@ let g:easycomplete_pum_format = ["kind", "abbr", "menu"]
9091
noremap gr :EasyCompleteReference<CR>
9192
noremap gd :EasyCompleteGotoDefinition<CR>
9293
noremap rn :EasyCompleteRename<CR>
93-
noremap gh :EasyCompleteHover<CR>
94+
" 插件默认绑定 shift-k 至 `:EasyCompleteHover`
95+
" noremap gh :EasyCompleteHover<CR>
9496
noremap gb :BackToOriginalBuffer<CR>
9597
9698
" cmdline 补全

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ vim.g.easycomplete_pum_format = {"kind", "abbr", "menu"}
4848
vim.keymap.set('n', 'gr', ':EasyCompleteReference<CR>')
4949
vim.keymap.set('n', 'gd', ':EasyCompleteGotoDefinition<CR>')
5050
vim.keymap.set('n', 'rn', ':EasyCompleteRename<CR>')
51-
vim.keymap.set('n', 'gh', ':EasyCompleteHover<CR>')
51+
-- Plugin has already bind shift-k to `:EasyCompleteHover`
52+
-- vim.keymap.set('n', 'gh', ':EasyCompleteHover<CR>')
5253
vim.keymap.set('n', 'gb', ':BackToOriginalBuffer<CR>')
5354

5455
-- cmdline completion
@@ -88,7 +89,8 @@ let g:easycomplete_pum_format = ["kind", "abbr", "menu"]
8889
noremap gr :EasyCompleteReference<CR>
8990
noremap gd :EasyCompleteGotoDefinition<CR>
9091
noremap rn :EasyCompleteRename<CR>
91-
noremap gh :EasyCompleteHover<CR>
92+
" Plugin has already bind shift-k to `:EasyCompleteHover`
93+
" noremap gh :EasyCompleteHover<CR>
9294
noremap gb :BackToOriginalBuffer<CR>
9395
9496
" cmdline completion

autoload/easycomplete.vim

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ function! s:BindingTypingCommandOnce()
212212
" inoremap <Tab> <Plug>EasycompleteTabTrigger
213213
" 重定向 Tag 的跳转按键绑定,和默认<c-]>功能一致
214214
nnoremap <silent> <c-]> :EasyCompleteGotoDefinition<CR>
215+
nnoremap <silent> <S-k> :EasyCompleteHover<CR>
215216
endfunction
216217

217218
function! easycomplete#FileTypes(plugin_name, filetypes)
@@ -2871,6 +2872,12 @@ function! easycomplete#Hover()
28712872
call easycomplete#action#hover#do()
28722873
endfunction
28732874

2875+
function! easycomplete#HoverNothing(msg)
2876+
call s:log(a:msg)
2877+
let cw = expand('<cword>')
2878+
exec "help " . cw
2879+
endfunction
2880+
28742881
function! easycomplete#BackToOriginalBuffer()
28752882
call easycomplete#action#reference#back()
28762883
endfunction

autoload/easycomplete/action/hover.vim

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
function! easycomplete#action#hover#do()
32
call s:do()
43
endfunction
@@ -65,7 +64,7 @@ function! s:HandleLspCallback(server, data) abort
6564
endif
6665
return
6766
catch
68-
call s:log(v:exception)
67+
call easycomplete#HoverNothing(v:exception)
6968
endtry
7069
endfunction
7170

autoload/easycomplete/sources/ts.vim

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,12 +525,11 @@ function! easycomplete#sources#ts#hover()
525525
\ {
526526
\ -> s:SendCommandAsyncResponse('quickinfo', l:args)
527527
\ })
528-
529528
endfunction
530529

531530
function! easycomplete#sources#ts#QuickInfoCallback(response)
532531
if s:get(a:response, "command") == "quickinfo" && s:get(a:response, "success") == v:false
533-
call s:log(s:get(a:response, "message"))
532+
call easycomplete#HoverNothing(s:get(a:response, "message"))
534533
return
535534
endif
536535
if s:get(a:response, "success") == v:true
@@ -541,6 +540,8 @@ function! easycomplete#sources#ts#QuickInfoCallback(response)
541540
let content = easycomplete#util#RemoveTrailingEmptyStrings(content)
542541
if !empty(content)
543542
call easycomplete#popup#float(content, 'Pmenu', 0, "", [0, 0], 'signature')
543+
else
544+
call easycomplete#HoverNothing("No hover information")
544545
endif
545546
endif
546547
endfunction

0 commit comments

Comments
 (0)