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

Return to the correct window after closing Tagbar, closes #132

Browse Source 
Since the window numbers can change when opening and closing windows
Tagbar so far has used bufwinnr() to find the right window to jump back
to. However, this fails if the same file is being displayed in more than
one window. Save a window-local variable instead to detect the correct
window to jump back to.
This commit is contained in:
Jan Larres 2013-03-24 14:16:56 +13:00
parent 77a318b10e
commit 11f8479593
1 changed files with 45 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
autoload/tagbar.vim
View File

@ -1825,17 +1825,20 @@ function! s:CloseWindow() abort
endif
endif
else
" Go to the tagbar window, close it and then come back to the
" original window
let curbufnr = bufnr('%')
" Go to the tagbar window, close it and then come back to the original
" window. Save a win-local variable in the original window so we can
" jump back to it even if the window number changed.
let w:tagbar_returnhere = 1
call s:winexec(tagbarwinnr . 'wincmd w')
close
" Need to jump back to the original window only if we are not
" already in that window
let winnum = bufwinnr(curbufnr)
if winnr() != winnum
call s:winexec(winnum . 'wincmd w')
endif
for window in range(1, winnr('$'))
call s:winexec(window . 'wincmd w')
if exists('w:tagbar_returnhere')
unlet w:tagbar_returnhere
break
endif
endfor
endif
" If the Vim window has been expanded, and Tagbar is not open in any other
@ -2812,29 +2815,7 @@ function! s:JumpToTag(stay_in_tagbar) abort
let tagbarwinnr = winnr()
" This elaborate construct will try to switch to the correct
" buffer/window; if the buffer isn't currently shown in a window it will
" open it in the first window with a non-special buffer in it
call s:winexec('wincmd p')
let filebufnr = bufnr(taginfo.fileinfo.fpath)
if bufnr('%') != filebufnr
let filewinnr = bufwinnr(filebufnr)
if filewinnr != -1
call s:winexec(filewinnr . 'wincmd w')
else
for i in range(1, winnr('$'))
call s:winexec(i . 'wincmd w')
if &buftype == ''
execute 'buffer ' . filebufnr
break
endif
endfor
endif
" To make ctrl-w_p work we switch between the Tagbar window and the
" correct window once
call s:winexec(tagbarwinnr . 'wincmd w')
call s:winexec('wincmd p')
endif
call s:GotoPreviousWindow(taginfo.fileinfo)
" Mark current position so it can be jumped back to
mark '
@ -3369,6 +3350,38 @@ function! s:GetTagInfo(linenr, ignorepseudo) abort
return taginfo
endfunction
" s:GotoPreviousWindow() {{{2
" Try to switch to the previous buffer/window; if the buffer isn't currently
" shown in a window Tagbar will open it in the first window that has a
" non-special buffer in it.
function! s:GotoPreviousWindow(fileinfo) abort
let tagbarwinnr = bufwinnr('__Tagbar__')
call s:winexec('wincmd p')
let filebufnr = bufnr(a:fileinfo.fpath)
if bufnr('%') != filebufnr
let filewinnr = bufwinnr(filebufnr)
if filewinnr != -1
call s:winexec(filewinnr . 'wincmd w')
else
for i in range(1, winnr('$'))
call s:winexec(i . 'wincmd w')
if &buftype == ''
execute 'buffer ' . filebufnr
break
endif
endfor
endif
" To make ctrl-w_p work we switch between the Tagbar window and the
" correct window once
call s:winexec(tagbarwinnr . 'wincmd w')
call s:winexec('wincmd p')
endif
return winnr()
endfunction
" s:IsValidFile() {{{2
function! s:IsValidFile(fname, ftype) abort
call s:LogDebugMessage('Checking if file is valid [' . a:fname . ']')