Skip to content

Reimplement hover window with floating window for Neovim 0.4.0 or later #767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
autozimu merged 19 commits into from
Mar 26, 2019
Merged

Reimplement hover window with floating window for Neovim 0.4.0 or later #767

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
572f84a
Reimplement hover window with floating window for Neovim 0.4.0 or later
rhysd Mar 12, 2019
db88b8e
Add test for hover window using floating window
rhysd Mar 14, 2019
1a7748f
Close floating window when entering other window on WinEnter
rhysd Mar 14, 2019
d63389f
Add test for closing floating window on WinEnter
rhysd Mar 14, 2019
5ccf450
Fix checking enough space for floating window
rhysd Mar 14, 2019
eb752f2
Use BufEnter instead of WinEnter
rhysd Mar 16, 2019
e240734
Add test where entering another buffer closes floating hover
rhysd Mar 16, 2019
65ccc70
Follow the API change of nvim_open_win()
rhysd Mar 17, 2019
05afc80
Move cursor into floating hover when hover is already open
rhysd Mar 21, 2019
45f6d06
Add health check for floating window
rhysd Mar 21, 2019
04dce37
Describe the behavior of floating window support in document
rhysd Mar 21, 2019
0fbded1
Add g:LanguageClient_useFloatingHover
rhysd Mar 21, 2019
372939d
Add test for moving the cursor into floating window
rhysd Mar 21, 2019
f40a1c3
Add LanguageClient#openHoverInSeparateWindow()
rhysd Mar 21, 2019
18640c2
Rename LanguageClient#openHoverInSeparateWindow to LanguageClient#reo…
rhysd Mar 21, 2019
6f4ce81
Give left margin only when line is not empty
rhysd Mar 21, 2019
4c14bd4
Revert "Add LanguageClient#reopenHoverInSeparateWindow()"
rhysd Mar 23, 2019
79e36ba
Prefer s:GetVar() to get()
rhysd Mar 23, 2019
a785c80
Move description of float window behavior to function doc section
rhysd Mar 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move cursor into floating hover when hover is already open
  • Loading branch information
@rhysd
rhysd committed Mar 21, 2019
commit 05afc80787a5da4daeb80a0da29cbc197f668121
24 changes: 20 additions & 4 deletions autoload/LanguageClient.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ function! s:GetVar(...) abort
endif
endfunction

function! s:CloseFloatingHoverAfterCursorMove(win_id, opened) abort
function! s:CloseFloatingHoverOnCursorMove(win_id, opened) abort
if getpos('.') == a:opened
" Just after opening floating window, CursorMoved event is run.
" To avoid closing floating window immediately, check the cursor
Expand All @@ -277,7 +277,7 @@ function! s:CloseFloatingHoverAfterCursorMove(win_id, opened) abort
execute winnr . 'wincmd c'
endfunction

function! s:CloseFloatingHoverAfterEnterAnotherBuf(win_id, bufnr) abort
function! s:CloseFloatingHoverOnBufEnter(win_id, bufnr) abort
let winnr = win_id2win(a:win_id)
if winnr == 0
" Float window was already closed
Expand Down Expand Up @@ -374,15 +374,28 @@ function! s:OpenHoverPreview(bufname, lines, filetype) abort
if s:FLOAT_WINDOW_AVAILABLE
" Unlike preview window, :pclose does not close window. Instead, close
" hover window automatically when cursor is moved.
let call_after_move = printf('<SID>CloseFloatingHoverAfterCursorMove(%d, %s)', float_win_id, string(pos))
let call_on_bufenter = printf('<SID>CloseFloatingHoverAfterEnterAnotherBuf(%d, %d)', float_win_id, bufnr)
let call_after_move = printf('<SID>CloseFloatingHoverOnCursorMove(%d, %s)', float_win_id, string(pos))
let call_on_bufenter = printf('<SID>CloseFloatingHoverOnBufEnter(%d, %d)', float_win_id, bufnr)
augroup plugin-LC-neovim-close-hover
execute 'autocmd CursorMoved,CursorMovedI,InsertEnter <buffer> call ' . call_after_move
execute 'autocmd BufEnter * call ' . call_on_bufenter
augroup END
endif
endfunction

function! s:MoveIntoHoverPreview() abort
for bufnr in range(1, bufnr('$'))
if bufname(bufnr) ==# '__LanguageClient__'
let winnr = bufwinnr(bufnr)
if winnr != -1
execute winnr . 'wincmd w'
endif
return v:true
endif
endfor
return v:false
endfunction

let s:id = 1
let s:handlers = {}

Expand Down Expand Up @@ -651,6 +664,9 @@ function! LanguageClient#Notify(method, params) abort
endfunction

function! LanguageClient#textDocument_hover(...) abort
if s:FLOAT_WINDOW_AVAILABLE && s:MoveIntoHoverPreview()
return
endif
let l:Callback = get(a:000, 1, v:null)
let l:params = {
\ 'filename': LSP#filename(),
Expand Down