Skip to content

fix: make inccommand=split not abort when there's not enough room #18937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
justinmk merged 1 commit into from
Jun 12, 2022
Merged

fix: make inccommand=split not abort when there's not enough room #18937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions src/nvim/ex_getln.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2325,19 +2325,9 @@ static buf_T *cmdpreview_open_buf(void)
static win_T *cmdpreview_open_win(buf_T *cmdpreview_buf)
{
win_T *save_curwin = curwin;
bool win_found = false;

// Try to find an existing preview window.
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
if (wp->w_buffer == cmdpreview_buf) {
win_enter(wp, false);
win_found = true;
break;
}
}

// If an existing window is not found, create one.
if (!win_found && win_split((int)p_cwh, WSP_BOT) == FAIL) {
// Open preview window.
if (win_split((int)p_cwh, WSP_BOT) == FAIL) {
return NULL;
}

Expand Down Expand Up @@ -2459,7 +2449,8 @@ static void cmdpreview_show(CommandLineState *s)
// If inccommand=split and preview callback returns 2, open preview window.
if (icm_split && cmdpreview_type == 2
&& (cmdpreview_win = cmdpreview_open_win(cmdpreview_buf)) == NULL) {
abort();
// If there's not enough room to open the preview window, just preview without the window.
cmdpreview_type = 1;
}

// If preview callback is nonzero, update screen now.
Expand Down
10 changes: 10 additions & 0 deletions test/functional/ui/inccommand_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2051,6 +2051,16 @@ describe("'inccommand' split windows", function()
end
end)

it("don't open if there's not enough room", function()
refresh()
screen:try_resize(40, 3)
feed("gg:%s/tw")
screen:expect([[
Inc substitution on |
{12:tw}o lines |
:%s/tw^ |
]])
end)
end)

describe("'inccommand' with 'gdefault'", function()
Expand Down