mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-07 03:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0169: current window number returned by tabpagewinnr may be outdated

Browse Source 
Problem:  current window number returned by tabpagewinnr may be outdated
          when called from win_execute for the original tabpage.
Solution: update the original tabpage's tp_curwin in switch_win; use
          {un}use_tabpage instead. Don't do it in restore_win to ensure
          tp_curwin of the temporarily visited tabpage is unchanged from
          switch_win visiting it, as before. (Sean Dewar)

Maybe restore_win should only restore tp_curwin if
`curtab == switchwin->sw_curtab`, in case the user changed tabpages from within
win_execute, but not doing that is consistent with the old behaviour.

related: vim/vim#14186

e101028a5c
This commit is contained in:
Sean Dewar
2024-03-12 21:02:29 +00:00
parent 119390e7ce
commit 29d0ed577c
2 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/nvim/eval/window.c
View File

@@ -956,13 +956,8 @@ int switch_win_noblock(switchwin_T *switchwin, win_T *win, tabpage_T *tp, bool n
if (tp != NULL) { if (tp != NULL) {
switchwin->sw_curtab = curtab; switchwin->sw_curtab = curtab;
if (no_display) { if (no_display) {
curtab->tp_firstwin = firstwin; unuse_tabpage(curtab);
curtab->tp_lastwin = lastwin; use_tabpage(tp);
curtab->tp_topframe = topframe;
curtab = tp;
firstwin = curtab->tp_firstwin;
lastwin = curtab->tp_lastwin;
topframe = curtab->tp_topframe;
} else { } else {
goto_tabpage_tp(tp, false, false); goto_tabpage_tp(tp, false, false);
} }
@@ -989,13 +984,12 @@ void restore_win_noblock(switchwin_T *switchwin, bool no_display)
{ {
if (switchwin->sw_curtab != NULL && valid_tabpage(switchwin->sw_curtab)) { if (switchwin->sw_curtab != NULL && valid_tabpage(switchwin->sw_curtab)) {
if (no_display) { if (no_display) {
curtab->tp_firstwin = firstwin; win_T *const old_tp_curwin = curtab->tp_curwin;
curtab->tp_lastwin = lastwin;
curtab->tp_topframe = topframe; unuse_tabpage(curtab);
curtab = switchwin->sw_curtab; // Don't change the curwin of the tabpage we temporarily visited.
firstwin = curtab->tp_firstwin; curtab->tp_curwin = old_tp_curwin;
lastwin = curtab->tp_lastwin; use_tabpage(switchwin->sw_curtab);
topframe = curtab->tp_topframe;
} else { } else {
goto_tabpage_tp(switchwin->sw_curtab, false, false); goto_tabpage_tp(switchwin->sw_curtab, false, false);
} }

24
test/old/testdir/test_execute_func.vim
View File

@@ -212,4 +212,28 @@ func Test_execute_cmd_with_null()
endif endif
endfunc endfunc
func Test_win_execute_tabpagewinnr()
belowright split
tab split
belowright split
call assert_equal(2, tabpagewinnr(1))
tabprevious
wincmd p
call assert_equal(1, tabpagenr())
call assert_equal(1, tabpagewinnr(1))
call assert_equal(2, tabpagewinnr(2))
call win_execute(win_getid(1, 2),
\ 'call assert_equal(2, tabpagenr())'
\ .. '| call assert_equal(1, tabpagewinnr(1))'
\ .. '| call assert_equal(1, tabpagewinnr(2))')
call assert_equal(1, tabpagenr())
call assert_equal(1, tabpagewinnr(1))
call assert_equal(2, tabpagewinnr(2))
%bwipe!
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab