wyj/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-09-17 20:58:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(api): disallow win_set_buf from changing cmdwin's old curbuf (#24745)

Browse Source 
A command typed in the cmdwin and executed with `<CR>` is expected to be
executed in the context of the old curwin/buf, so it shouldn't be changed.
This commit is contained in:
Sean Dewar 2023-08-17 00:53:10 +01:00 committed by GitHub
parent e928161bde
commit 22d9338afc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/api/window.c
View File

@ -58,7 +58,7 @@ void nvim_win_set_buf(Window window, Buffer buffer, Error *err)
if (!win || !buf) {
return;
}
if (cmdwin_type != 0 && (win == curwin || buf == curbuf)) {
if (cmdwin_type != 0 && (win == curwin || win == cmdwin_old_curwin || buf == curbuf)) {
api_set_error(err, kErrorTypeException, "%s", e_cmdwin);
return;
}

5
test/functional/api/window_spec.lua
View File

@ -44,14 +44,17 @@ describe('API/win', function()
eq('Invalid window id: 23', pcall_err(window, 'set_buf', 23, nvim('get_current_buf')))
end)
it('disallowed in cmdwin if win=curwin or buf=curbuf', function()
it('disallowed in cmdwin if win={old_}curwin or buf=curbuf', function()
local new_buf = meths.create_buf(true, true)
local old_win = meths.get_current_win()
local new_win = meths.open_win(new_buf, false, {
relative='editor', row=10, col=10, width=50, height=10,
})
feed('q:')
eq('E11: Invalid in command-line window; <CR> executes, CTRL-C quits',
pcall_err(meths.win_set_buf, 0, new_buf))
eq('E11: Invalid in command-line window; <CR> executes, CTRL-C quits',
pcall_err(meths.win_set_buf, old_win, new_buf))
eq('E11: Invalid in command-line window; <CR> executes, CTRL-C quits',
pcall_err(meths.win_set_buf, new_win, 0))