kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-24 21:25:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0666: assert_equal() doesn't show multibyte string correctly (#30018)

Browse Source 
Problem:  assert_equal() doesn't show multibyte string correctly
Solution: Properly advance over a multibyte char.
          (zeertzjq)

closes: vim/vim#15456

9c4b2462bb
This commit is contained in:
zeertzjq 2024-08-10 06:35:51 +08:00 committed by GitHub
parent 0d3f2c4904
commit 4e8efe002e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/testing.c
View File

@ -130,7 +130,7 @@ static void ga_concat_shorten_esc(garray_T *gap, const char *str)
return; return;
} }
for (const char *p = str; *p != NUL; p++) { for (const char *p = str; *p != NUL;) {
int same_len = 1; int same_len = 1;
const char *s = p; const char *s = p;
const int c = mb_cptr2char_adv(&s); const int c = mb_cptr2char_adv(&s);
@ -146,9 +146,10 @@ static void ga_concat_shorten_esc(garray_T *gap, const char *str)
vim_snprintf(buf, NUMBUFLEN, "%d", same_len); vim_snprintf(buf, NUMBUFLEN, "%d", same_len);
ga_concat(gap, buf); ga_concat(gap, buf);
ga_concat(gap, " times]"); ga_concat(gap, " times]");
p = s - 1; p = s;
} else { } else {
ga_concat_esc(gap, p, clen); ga_concat_esc(gap, p, clen);
p += clen;
} }
} }
} }

9
test/old/testdir/test_assert.vim
View File

@ -48,10 +48,19 @@ func Test_assert_equal()
call assert_match("Expected 'bar' but got 'foo'", v:errors[0]) call assert_match("Expected 'bar' but got 'foo'", v:errors[0])
call remove(v:errors, 0) call remove(v:errors, 0)
let s = 'αβγ'
call assert_equal(1, assert_equal('δεζ', s))
call assert_match("Expected 'δεζ' but got 'αβγ'", v:errors[0])
call remove(v:errors, 0)
call assert_equal('XxxxxxxxxxxxxxxxxxxxxxX', 'XyyyyyyyyyyyyyyyyyyyyyyyyyX') call assert_equal('XxxxxxxxxxxxxxxxxxxxxxX', 'XyyyyyyyyyyyyyyyyyyyyyyyyyX')
call assert_match("Expected 'X\\\\\\[x occurs 21 times]X' but got 'X\\\\\\[y occurs 25 times]X'", v:errors[0]) call assert_match("Expected 'X\\\\\\[x occurs 21 times]X' but got 'X\\\\\\[y occurs 25 times]X'", v:errors[0])
call remove(v:errors, 0) call remove(v:errors, 0)
call assert_equal('ΩωωωωωωωωωωωωωωωωωωωωωΩ', 'ΩψψψψψψψψψψψψψψψψψψψψψψψψψΩ')
call assert_match("Expected 'Ω\\\\\\[ω occurs 21 times]Ω' but got 'Ω\\\\\\[ψ occurs 25 times]Ω'", v:errors[0])
call remove(v:errors, 0)
" special characters are escaped " special characters are escaped
call assert_equal("\b\e\f\n\t\r\\\x01\x7f", 'x') call assert_equal("\b\e\f\n\t\r\\\x01\x7f", 'x')
call assert_match('Expected ''\\b\\e\\f\\n\\t\\r\\\\\\x01\\x7f'' but got ''x''', v:errors[0]) call assert_match('Expected ''\\b\\e\\f\\n\\t\\r\\\\\\x01\\x7f'' but got ''x''', v:errors[0])