aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.0329: popup filter converts 0x80 bytes

Browse Source 
Problem:    Popup filter converts 0x80 bytes.
Solution:   Keep 0x80 bytes as-is. (Ozaki Kiichi, closes #5706)
This commit is contained in:
Bram Moolenaar 2020-02-28 22:44:47 +01:00
parent e52e0c89d1
commit ec084d3356
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/popupwin.c
View File

@ -2999,7 +2999,7 @@ invoke_popup_filter(win_T *wp, int c)
// Convert the number to a string, so that the function can use:
// if a:c == "\<F2>"
buf[special_to_buf(c, mod_mask, TRUE, buf)] = NUL;
buf[special_to_buf(c, mod_mask, FALSE, buf)] = NUL;
argv[1].v_type = VAR_STRING;
argv[1].vval.v_string = vim_strsave(buf);

30
src/testdir/test_popupwin.vim
View File

@ -1409,8 +1409,8 @@ func Test_popup_filter()
call setline(1, 'some text')
func MyPopupFilter(winid, c)
if a:c == 'e'
let g:eaten = 'e'
if a:c == 'e' || a:c == "\<F9>"
let g:eaten = a:c
return 1
endif
if a:c == '0'
@ -1430,6 +1430,8 @@ func Test_popup_filter()
" e is consumed by the filter
call feedkeys('e', 'xt')
call assert_equal('e', g:eaten)
call feedkeys("\<F9>", 'xt')
call assert_equal("\<F9>", g:eaten)
" 0 is ignored by the filter
normal $
@ -1440,7 +1442,7 @@ func Test_popup_filter()
" x closes the popup
call feedkeys('x', 'xt')
call assert_equal('e', g:eaten)
call assert_equal("\<F9>", g:eaten)
call assert_equal(-1, winbufnr(winid))
delfunc MyPopupFilter
@ -3271,4 +3273,26 @@ func Test_popupwin_bufnr()
bwipe!
endfunc
func Test_popupwin_filter_input_multibyte()
func MyPopupFilter(winid, c)
let g:bytes = range(a:c->strlen())->map({i -> char2nr(a:c[i])})
return 0
endfunc
let winid = popup_create('', #{mapping: 0, filter: 'MyPopupFilter'})
" UTF-8: E3 80 80, including K_SPECIAL(0x80)
call feedkeys("\u3000", 'xt')
call assert_equal([0xe3, 0x80, 0x80], g:bytes)
if has('gui')
" UTF-8: E3 80 9B, including CSI(0x9B)
call feedkeys("\u301b", 'xt')
call assert_equal([0xe3, 0x80, 0x9b], g:bytes)
endif
call popup_clear()
delfunc MyPopupFilter
unlet g:bytes
endfunc
" vim: shiftwidth=2 sts=2

2
src/version.c
View File

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