mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 05:58:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(charclass): make behavior with empty str match latest Vim (#19749)

Browse Source 
Later Vim patches changed to return 0 for empty string and null string.
Also update setcellwidth() docs to match latest Vim.
This commit is contained in:
zeertzjq
2022-08-13 12:25:01 +08:00
committed by GitHub
parent 754892e59d
commit 1de62b9ea1
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/doc/builtin.txt
View File

@@ -6838,9 +6838,9 @@ setcellwidths({list}) *setcellwidths()*
tells Vim how wide characters are, counted in screen cells. tells Vim how wide characters are, counted in screen cells.
This overrides 'ambiwidth'. Example: > This overrides 'ambiwidth'. Example: >
setcellwidths([[0xad, 0xad, 1], setcellwidths([[0xad, 0xad, 1],
\ [0x2194, 0x2199, 2]]) \ [0x2194, 0x2199, 2]])
< *E1109* *E1110* *E1111* *E1112* *E1113* < *E1109* *E1110* *E1111* *E1112* *E1113* *E1114*
The {list} argument is a list of lists with each three The {list} argument is a list of lists with each three
numbers. These three numbers are [low, high, width]. "low" numbers. These three numbers are [low, high, width]. "low"
and "high" can be the same, in which case this refers to one and "high" can be the same, in which case this refers to one
@@ -6856,7 +6856,8 @@ setcellwidths({list}) *setcellwidths()*
To clear the overrides pass an empty list: > To clear the overrides pass an empty list: >
setcellwidths([]); setcellwidths([]);
< You can use the script $VIMRUNTIME/tools/emoji_list.vim to see
the effect for known emoji characters.
setcharpos({expr}, {list}) *setcharpos()* setcharpos({expr}, {list}) *setcharpos()*
Same as |setpos()| but uses the specified column number as the Same as |setpos()| but uses the specified column number as the

6
src/nvim/mbyte.c
View File

@@ -2861,10 +2861,8 @@ void f_setcellwidths(typval_T *argvars, typval_T *rettv, FunPtr fptr)
void f_charclass(typval_T *argvars, typval_T *rettv, FunPtr fptr) void f_charclass(typval_T *argvars, typval_T *rettv, FunPtr fptr)
{ {
if (argvars[0].v_type != VAR_STRING if (tv_check_for_string(&argvars[0]) == FAIL
|| argvars[0].vval.v_string == NULL || argvars[0].vval.v_string == NULL) {
|| *argvars[0].vval.v_string == NUL) {
emsg(_(e_stringreq));
return; return;
} }
rettv->vval.v_number = mb_get_class((const char_u *)argvars[0].vval.v_string); rettv->vval.v_number = mb_get_class((const char_u *)argvars[0].vval.v_string);

2
src/nvim/testdir/test_functions.vim
View File

@@ -1774,6 +1774,8 @@ func Test_charclass()
call assert_equal(1, charclass('.')) call assert_equal(1, charclass('.'))
call assert_equal(2, charclass('x')) call assert_equal(2, charclass('x'))
call assert_equal(3, charclass("\u203c")) call assert_equal(3, charclass("\u203c"))
" this used to crash vim
call assert_equal(0, "xxx"[-1]->charclass())
endfunc endfunc
func Test_eventhandler() func Test_eventhandler()