[vim/vim] fix(quickfix): restore correct window when closing quickfix (PR #18961)
glepnir
Problem:
After botright copen and close this quikfix window, cursor ends up in the wrong window. The problem is fr_child always points to the first (leftmost for FR_ROW, topmost for FR_COL) child frame. When do :vsplit, the new window is created on the left, and frame_insert() updates the parent's fr_child to point to this new left window.
Solution:
Same as help windows - snapshot before open, restore when close.
You can view, comment on, or merge this pull request online at:
https://github.com/vim/vim/pull/18961
Commit Summary
- 8e40940 fix(quickfix): restore correct window when closing quickfix
File Changes
(5 files)
- M src/quickfix.c (6)
- M src/structs.h (7)
- M src/testdir/test_quickfix.vim (12)
- M src/vim.h (1)
- M src/window.c (24)
Patch Links:
—
Reply to this email directly, view it on GitHub.
You are receiving this because you are subscribed to this thread.
h_east
@h-east commented on this pull request.
In src/window.c:
> @@ -2740,6 +2746,11 @@ win_close(win_T *win, int free_buf)
else
clear_snapshot(curtab, SNAP_HELP_IDX);
+ if (bt_quickfix(win->w_buffer))
+ quickfix_window = true;
TRUE/FALSE for int type. true/false for bool type.
⬇️ Suggested change- quickfix_window = true; + quickfix_window = TRUE;
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Yegappan Lakshmanan
@yegappan commented on this pull request.
In src/testdir/test_quickfix.vim:
> @@ -6958,4 +6958,16 @@ func Test_vimgrep_dummy_buffer_keep() %bw! endfunc +func Test_quickfix_restore_current_win() + let curwin = win_getid() + vsplit b + wincmd p + botright copen + cclose + + call assert_true(curwin == win_getid())
Can you use call assert_equal(curwin, win_getid()) instead? When a test fails, assert_equal() will emit the expected value and the actual value but assert_true() will not do that. This is useful in debugging tests that are failing.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Yegappan Lakshmanan
> @@ -6958,4 +6958,16 @@ func Test_vimgrep_dummy_buffer_keep() %bw! endfunc +func Test_quickfix_restore_current_win() + let curwin = win_getid() + vsplit b + wincmd p + botright copen + cclose + + call assert_true(curwin == win_getid()) + wincmd w
Is jumping to another window needed here?
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
glepnir
@glepnir pushed 1 commit.
- b0e8b61 fix(quickfix): restore correct window when closing quickfix
—
View it on GitHub or unsubscribe.
You are receiving this because you are subscribed to this thread.
zeertzjq
@zeertzjq commented on this pull request.
In src/testdir/test_quickfix.vim:
> @@ -6958,4 +6958,15 @@ func Test_vimgrep_dummy_buffer_keep() %bw! endfunc +func Test_quickfix_restore_current_win() + let curwin = win_getid() + vsplit b + wincmd p + botright copen + cclose + + call assert_equal(1, curwin == win_getid())⬇️ Suggested change
- call assert_equal(1, curwin == win_getid()) + call assert_equal(curwin, win_getid())
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
zeertzjq
@zeertzjq commented on this pull request.
In src/testdir/test_quickfix.vim:
> @@ -6958,4 +6958,15 @@ func Test_vimgrep_dummy_buffer_keep() %bw! endfunc +func Test_quickfix_restore_current_win() + let curwin = win_getid() + vsplit b
Having a single-character buffer name is a bit strange.
⬇️ Suggested change- vsplit b + vsplit Xb
In src/testdir/test_quickfix.vim:
> @@ -6958,4 +6958,15 @@ func Test_vimgrep_dummy_buffer_keep() %bw! endfunc +func Test_quickfix_restore_current_win() + let curwin = win_getid() + vsplit b + wincmd p + botright copen + cclose + + call assert_equal(curwin, win_getid()) + only⬇️ Suggested change
- only + bw! Xb
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
glepnir
@glepnir commented on this pull request.
In src/testdir/test_quickfix.vim:
> @@ -6958,4 +6958,15 @@ func Test_vimgrep_dummy_buffer_keep() %bw! endfunc +func Test_quickfix_restore_current_win() + let curwin = win_getid() + vsplit b
okay
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
