kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-23 20:55:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #31073 from bfredl/cmdchar

Browse Source 
fix(cmdline): simplify and correct grapheme cluster adjustment
This commit is contained in:
bfredl 2024-11-08 13:08:14 +01:00 committed by GitHub
commit 475f9f64ef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/nvim/ex_getln.c
View File

@ -3596,38 +3596,14 @@ void put_on_cmdline(const char *str, int len, bool redraw)
memmove(ccline.cmdbuff + ccline.cmdpos, str, (size_t)len);
ccline.cmdbuff[ccline.cmdlen] = NUL;
{
// When the inserted text starts with a composing character,
// backup to the character before it. There could be two of them.
int i = 0;
int c = utf_ptr2char(ccline.cmdbuff + ccline.cmdpos);
// TODO(bfredl): this can be corrected/simplified as utf_head_off implements the
// correct grapheme cluster breaks
while (ccline.cmdpos > 0 && utf_iscomposing_legacy(c)) {
i = utf_head_off(ccline.cmdbuff, ccline.cmdbuff + ccline.cmdpos - 1) + 1;
// When the inserted text starts with a composing character,
// backup to the character before it.
if (ccline.cmdpos > 0 && (uint8_t)ccline.cmdbuff[ccline.cmdpos] >= 0x80) {
int i = utf_head_off(ccline.cmdbuff, ccline.cmdbuff + ccline.cmdpos);
if (i != 0) {
ccline.cmdpos -= i;
len += i;
c = utf_ptr2char(ccline.cmdbuff + ccline.cmdpos);
}
if (i == 0 && ccline.cmdpos > 0 && arabic_maycombine(c)) {
// Check the previous character for Arabic combining pair.
i = utf_head_off(ccline.cmdbuff, ccline.cmdbuff + ccline.cmdpos - 1) + 1;
if (arabic_combine(utf_ptr2char(ccline.cmdbuff + ccline.cmdpos - i), c)) {
ccline.cmdpos -= i;
len += i;
} else {
i = 0;
}
}
if (i != 0) {
// Also backup the cursor position.
i = ptr2cells(ccline.cmdbuff + ccline.cmdpos);
ccline.cmdspos -= i;
msg_col -= i;
if (msg_col < 0) {
msg_col += Columns;
msg_row--;
}
ccline.cmdspos = cmd_screencol(ccline.cmdpos);
}
}

21
test/functional/editor/mode_cmdline_spec.lua
View File

@ -38,6 +38,27 @@ describe('cmdline', function()
feed([[:<C-R>="foo\nbar\rbaz"<CR>]])
eq('foo\nbar\rbaz', fn.getcmdline())
end)
it('pasting handles composing chars properly', function()
local screen = Screen.new(60, 4)
-- 'arabicshape' cheats and always redraws everything which trivially works,
-- this test is for partial redraws in 'noarabicshape' mode.
command('set noarabicshape')
screen:attach()
fn.setreg('a', '💻')
feed(':test 🧑‍')
screen:expect([[
|
{1:~ }|*2
:test 🧑‍^ |
]])
feed('<c-r><c-r>a')
screen:expect([[
|
{1:~ }|*2
:test 🧑‍💻^ |
]])
end)
end)
it('Ctrl-Shift-V supports entering unsimplified key notations', function()