mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-09-05 13:40:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(cmdwin): handle UTF-8 characters containing 0x80 #41566

Browse Source 
Problem:
Confirming cmdwin with a UTF-8 character containing 0x80 does not complete the
command.

Solution:
Escape K_SPECIAL bytes while feeding the cmdwin input after confirmation.
This commit is contained in:
Aryan Pandey
2026-08-31 16:22:20 +05:30
committed by GitHub
parent 2b6a09c2f1
commit ad42ee1c41
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/lua/vim/_core/cmdwin.lua
View File

@@ -188,7 +188,7 @@ function M.confirm()
end
local line, type = _close()
line = line:gsub('%z', '\n'):gsub('(%c)', '\022%1') -- Escape control characters.
vim.api.nvim_feedkeys(type .. line .. vim.keycode('<CR>'), 'nt', false)
vim.api.nvim_feedkeys(type .. line .. '\r', 'nt', true)
end
--- Cancel: close the cmdwin and re-enter cmdline mode with the line pre-filled (no execute).
@@ -198,7 +198,7 @@ function M.cancel()
end
local line, type = _close()
line = line:gsub('%z', '\n'):gsub('(%c)', '\022%1') -- Escape control characters.
vim.api.nvim_feedkeys(type .. line, 'nt', false)
vim.api.nvim_feedkeys(type .. line, 'nt', true)
end
return M

6
test/functional/editor/cmdwin_spec.lua
View File

@@ -116,9 +116,9 @@ describe('cmdwin', function()
eq(':', fn.getcmdtype())
end)
it('history entry or current cmdline with control chars', function()
it('history entry or current cmdline with control chars or 0x80 byte', function()
local firstbuf = api.nvim_get_current_buf()
local cmdline = 'normal! \023\022ifoo\nbar\027' -- Ctrl-W Ctrl-V ifoo\nbar Esc
local cmdline = 'normal! \023\022ifoo\nbar…\027' -- Ctrl-W Ctrl-V ifoo\nbar… Esc
local bufline = cmdline:gsub('\n', '\0')
fn.histadd(':', cmdline)
feed('q:')
@@ -135,7 +135,7 @@ describe('cmdwin', function()
eq({ bufline, bufline }, api.nvim_buf_get_lines(0, 0, -1, false))
feed('<CR>')
eq({ firstbuf, firstbuf }, fn.tabpagebuflist())
eq({ 'foo', 'bar' }, api.nvim_buf_get_lines(0, 0, -1, false))
eq({ 'foo', 'bar…' }, api.nvim_buf_get_lines(0, 0, -1, false))
end)
it('async API calls work while cmdwin is open #40312', function()