From d2ed8a828c65eaeaca10fcfec2fd8ce5e8bbedfc Mon Sep 17 00:00:00 2001 From: Ben Jackson Date: Fri, 8 Jan 2021 22:32:52 +0000 Subject: [PATCH] Use popup_filter_menu for the keyboard-popup rather than 100% our own --- autoload/vimspector/internal/balloon.vim | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/autoload/vimspector/internal/balloon.vim b/autoload/vimspector/internal/balloon.vim index d9861cb..88c6dd0 100644 --- a/autoload/vimspector/internal/balloon.vim +++ b/autoload/vimspector/internal/balloon.vim @@ -179,7 +179,7 @@ function! vimspector#internal#balloon#CreateTooltip(is_hover, ...) call win_execute(a:winid, ":call cursor(".mouse_coords['line'].", ".mouse_coords['column'].")") " expand the variable if we got double click - if a:key == "\<2-leftmouse>" && mouse_coords['winid'] == a:winid + if a:key == "\<2-leftmouse>" " forward line number to python, since vim does not allow us to focus " the correct window call py3eval("_vimspector_session.ExpandVariable(".line('.', a:winid).")") @@ -191,23 +191,16 @@ function! vimspector#internal#balloon#CreateTooltip(is_hover, ...) endfunc func! CursorFilter(winid, key) - if index(['j', 'k'], a:key) >= 0 - call win_execute(a:winid, ':normal '.a:key) - - return 1 - elseif a:key == "\" + if a:key == "\" " forward line number to python, since vim does not allow us to focus " the correct window call py3eval("_vimspector_session.ExpandVariable(".line('.', a:winid).")") - - return 1 - elseif a:key == "\" - call vimspector#internal#balloon#closeCallback() - return 1 + elseif index( [ "\", "\<2-LeftMouse>" ], a:key ) >= 0 + return MouseFilter( a:winid, a:key ) endif - return 0 + return popup_filter_menu( a:winid, a:key ) endfunc if s:float_win != 0