mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-05-03 20:45:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(cmdline): 'inccommand' preview after setcmdline() #38795

Browse Source 
Problem:  'inccommand' preview is not executed after setcmdline(),
          and as a result cmdline_show event is emitted when redrawing
          is not allowed (5b6477be).
Solution: Call command_line_changed() when ccline.cmdbuff_replaced is
          set (by setcmdline()).
This commit is contained in:
luukvbaal
2026-04-06 19:15:46 +02:00
committed by GitHub
parent bdc72a0843
commit 1354787029
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/nvim/ex_getln.c
View File

@@ -1324,6 +1324,10 @@ static int command_line_execute(VimState *state, int key)
if (display_tick > display_tick_saved && s->is_state.did_incsearch) {
may_do_incsearch_highlighting(s->firstc, s->count, &s->is_state);
}
// If f_setcmdline() changed the cmdline treat it as such.
if (ccline.cmdbuff_replaced) {
command_line_changed(s);
}
// nvim_select_popupmenu_item() can be called from the handling of
// K_EVENT, K_COMMAND, or K_LUA.
@@ -2893,8 +2897,9 @@ static int command_line_changed(CommandLineState *s)
}
}
if (ccline.cmdpos != s->prev_cmdpos
|| (s->prev_cmdbuff != NULL && strcmp(s->prev_cmdbuff, ccline.cmdbuff) != 0)) {
if (!ccline.cmdbuff_replaced
&& (ccline.cmdpos != s->prev_cmdpos
|| (s->prev_cmdbuff != NULL && strcmp(s->prev_cmdbuff, ccline.cmdbuff) != 0))) {
// Trigger CmdlineChanged autocommands.
do_autocmd_cmdlinechanged(s->firstc > 0 ? s->firstc : '-');
}

26
test/functional/ui/cmdline2_spec.lua
View File

@@ -237,6 +237,32 @@ describe('cmdline2', function()
{16::}{15:call} {25:Foo}{16:()}^ |
]])
end)
it('updated after setcmdline() #38764', function()
-- Also check that command-preview is updated.
exec('call setline(1, "foo")')
feed(':%s/foo')
screen:expect([[
{10:foo} |
{1:~ }|*12
{16::}%{15:s}{16:/foo^ } |
]])
exec_lua(function()
_G.events = {}
vim.api.nvim_create_autocmd({ 'CmdlineChanged', 'CursorMovedC' }, {
callback = function(ev)
_G.events[ev.event] = (_G.events[ev.event] or 0) + 1
end,
})
end)
exec('call setcmdline("%s/fo")')
screen:expect([[
{10:fo}o |
{1:~ }|*12
{16::}%{15:s}{16:/fo^ } |
]])
t.eq({ CmdlineChanged = 1, CursorMovedC = 1 }, exec_lua('return _G.events'))
end)
end)
describe('cmdline2', function()