aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 9.1.0351: No test that completing a partial mapping clears 'showcmd'

Browse Source 
Problem:  No test that completing a partial mapping clears 'showcmd'.
Solution: Complete partial mappings in Test_showcmd_part_map() instead
          of using :echo.  Adjust some comments (zeertzjq).

closes: #14580

Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
zeertzjq
2024-04-18 22:09:37 +02:00
committed by Christian Brabandt
parent 1fa22e3ad6
commit 094c4390bd
4 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/getchar.c
View File

@@ -1281,6 +1281,9 @@ del_typebuf(int len, int offset)
typebuf.tb_change_cnt = 1;
}
/*
* State for adding bytes to a recording or 'showcmd'.
*/
typedef struct
{
int prev_c;

17
src/testdir/test_mapping.vim
View File

@@ -1811,7 +1811,7 @@ endfunc
func Test_showcmd_part_map()
CheckRunVimInTerminal
let lines =<< trim eval END
let lines =<< trim END
set notimeout showcmd
nnoremap ,a <Ignore>
nnoremap ;a <Ignore>
@@ -1831,20 +1831,21 @@ func Test_showcmd_part_map()
for c in [',', ';', 'À', 'Ë', 'β', 'ω', '…']
call term_sendkeys(buf, c)
call WaitForAssert({-> assert_equal(c, trim(term_getline(buf, 6)))})
call term_sendkeys(buf, "\<C-C>:echo\<CR>")
call WaitForAssert({-> assert_equal('', term_getline(buf, 6))})
call term_sendkeys(buf, 'a')
call WaitForAssert({-> assert_equal('', trim(term_getline(buf, 6)))})
endfor
call term_sendkeys(buf, "\<C-W>")
call WaitForAssert({-> assert_equal('^W', trim(term_getline(buf, 6)))})
call term_sendkeys(buf, "\<C-C>:echo\<CR>")
call WaitForAssert({-> assert_equal('', term_getline(buf, 6))})
call term_sendkeys(buf, 'a')
call WaitForAssert({-> assert_equal('', trim(term_getline(buf, 6)))})
" Use feedkeys() as terminal buffer cannot forward this
" Use feedkeys() as terminal buffer cannot forward unsimplified Ctrl-W.
" This is like typing Ctrl-W with modifyOtherKeys enabled.
call term_sendkeys(buf, ':call feedkeys("\<*C-W>", "m")' .. " | echo\<CR>")
call WaitForAssert({-> assert_equal('^W', trim(term_getline(buf, 6)))})
call term_sendkeys(buf, "\<C-C>:echo\<CR>")
call WaitForAssert({-> assert_equal('', term_getline(buf, 6))})
call term_sendkeys(buf, 'a')
call WaitForAssert({-> assert_equal('', trim(term_getline(buf, 6)))})
call StopVimInTerminal(buf)
endfunc

3
src/testdir/test_utf8.vim
View File

@@ -300,7 +300,7 @@ func Test_setcellwidths_dump()
call StopVimInTerminal(buf)
endfunc
" When `setcellwidth` is used on characters that are not targets of `ambiwidth`.
" Test setcellwidths() on characters that are not targets of 'ambiwidth'.
func Test_setcellwidths_with_non_ambiwidth_character_dump()
CheckRunVimInTerminal
@@ -321,7 +321,6 @@ func Test_setcellwidths_with_non_ambiwidth_character_dump()
call StopVimInTerminal(buf)
endfunc
" For some reason this test causes Test_customlist_completion() to fail on CI,
" so run it as the last test.
func Test_zz_ambiwidth_hl_dump()

2
src/version.c
View File

@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
351,
/**/
350,
/**/