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

fix(prompt): wrong cursor col after prompt_setprompt, no on_lines

Browse Source 
Problem: prompt_setprompt calls coladvance with a byte column, but it expects a
screen column. on_lines buffer-updates aren't fired when fixing the prompt line.

Solution: don't use coladvance. Call changed_lines, which also simplifies the
redraw logic. (and calls changed_cline_bef_curs if needed; added test checks
this)

Unlike https://github.com/neovim/neovim/pull/37743/changes#r2775398744, this
means &modified is set by prompt_setprompt if it fixes the prompt line.
Not setting &modified is inconsistent anyway -- even init_prompt sets it if it
fixes the prompt line.
This commit is contained in:
Sean Dewar
2026-02-15 03:21:07 +00:00
parent 7d8653575f
commit 7641177c5f
3 changed files with 83 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
test/functional/lua/buffer_updates_spec.lua
View File

@@ -422,6 +422,48 @@ describe('lua: nvim_buf_attach on_lines', function()
feed('<C-v>I <ESC>')
eq({ api.nvim_get_current_buf(), 0, 1, 1 }, exec_lua('return _G.res'))
end)
it('prompt buffer', function()
local check_events = setup_eventcheck(false, nil, {})
api.nvim_set_option_value('buftype', 'prompt', {})
feed('i')
check_events {
{ 'test1', 'lines', 1, 4, 0, 1, 1, 1 },
}
fn.prompt_setprompt('', 'foo > ')
check_events {
{ 'test1', 'lines', 1, 5, 0, 1, 1, 3 },
}
feed('hello')
check_events {
{ 'test1', 'lines', 1, 6, 0, 1, 1, 7 },
}
fn.prompt_setprompt('', 'super-foo > ')
check_events {
{ 'test1', 'lines', 1, 7, 0, 1, 1, 12 },
}
eq({ 'super-foo > hello' }, api.nvim_buf_get_lines(0, 0, -1, true))
-- Do this in the same event.
exec_lua(function()
vim.fn.setpos("':", { 0, 1, 999, 0 })
vim.fn.prompt_setprompt('', 'discard > ')
end)
check_events {
{ 'test1', 'lines', 1, 8, 0, 1, 1, 18 },
}
eq({ 'discard > ' }, api.nvim_buf_get_lines(0, 0, -1, true))
feed('hello<S-CR>there')
check_events {
{ 'test1', 'lines', 1, 9, 0, 1, 1, 11 },
{ 'test1', 'lines', 1, 10, 0, 1, 2, 16 },
{ 'test1', 'lines', 1, 11, 1, 2, 2, 1 },
}
fn.prompt_setprompt('', 'foo > ')
check_events {
{ 'test1', 'lines', 1, 12, 0, 1, 1, 16 },
}
eq({ 'foo > hello', 'there' }, api.nvim_buf_get_lines(0, 0, -1, true))
end)
end)
describe('lua: nvim_buf_attach on_bytes', function()