ylib/tagbar
1
0
Fork 0
mirror of https://github.com/preservim/tagbar.git synced 2025-02-15 05:53:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use window ID functionality if available, ref #351

Browse Source 
When opening the Tagbar window the window numbers can change so that
restoring the window history is not possible. Use the new window ID
functionality if it is available to make that possible.
This commit is contained in:
Jan Larres 2016-10-17 22:57:15 +13:00
parent 4d513c8a68
commit b6298c0ca0
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
autoload/tagbar.vim
View File

@ -1816,9 +1816,17 @@ function! s:OpenWindow(flags) abort
return
endif
let prevwinnr = winnr()
call s:goto_win('p', 1)
let pprevwinnr = winnr()
" Use the window ID if the functionality exists, this is more reliable
" since the window number can change due to the Tagbar window opening
if exists('*win_getid')
let prevwinid = win_getid()
call s:goto_win('p', 1)
let pprevwinid = win_getid()
else
let prevwinnr = winnr()
call s:goto_win('p', 1)
let pprevwinnr = winnr()
endif
call s:goto_win('p', 1)
" This is only needed for the CorrectFocusOnStartup() function
@ -1865,8 +1873,21 @@ function! s:OpenWindow(flags) abort
call s:HighlightTag(g:tagbar_autoshowtag != 2, 1, curline)
if !(g:tagbar_autoclose || autofocus || g:tagbar_autofocus)
call s:goto_win(pprevwinnr, 1)
call s:goto_win(prevwinnr)
if exists('*win_getid')
noautocmd call win_gotoid(pprevwinid)
call win_gotoid(prevwinid)
else
" If the Tagbar winnr is identical to one of the saved values
" then that means that the window numbers have changed.
" Just jump back to the previous window since we won't be able to
" restore the window history.
if winnr() == pprevwinnr || winnr() == prevwinnr
call s:goto_win('p')
else
call s:goto_win(pprevwinnr, 1)
call s:goto_win(prevwinnr)
endif
endif
endif
call s:debug('OpenWindow finished')