Mercurial > vim
changeset 35930:fbb08f0dde3a v9.1.0666
patch 9.1.0666: assert_equal() doesn't show multibyte string correctly
Commit: https://github.com/vim/vim/commit/9c4b2462bb498f44044616f7309d111d12170369
Author: zeertzjq <zeertzjq@outlook.com>
Date: Fri Aug 9 19:52:10 2024 +0200
patch 9.1.0666: assert_equal() doesn't show multibyte string correctly
Problem: assert_equal() doesn't show multibyte string correctly
Solution: Properly advance over a multibyte char.
(zeertzjq)
closes: #15456
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 09 Aug 2024 20:00:07 +0200 |
| parents | 42ccf9f005ad |
| children | dfa0275ec17f |
| files | src/testdir/test_assert.vim src/testing.c src/version.c |
| diffstat | 3 files changed, 16 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_assert.vim +++ b/src/testdir/test_assert.vim @@ -48,10 +48,19 @@ func Test_assert_equal() call assert_match("Expected 'bar' but got 'foo'", 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_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 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 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])
--- a/src/testing.c +++ b/src/testing.c @@ -99,7 +99,7 @@ ga_concat_shorten_esc(garray_T *gap, cha return; } - for (p = str; *p != NUL; ++p) + for (p = str; *p != NUL; ) { same_len = 1; s = p; @@ -118,10 +118,13 @@ ga_concat_shorten_esc(garray_T *gap, cha vim_snprintf((char *)buf, NUMBUFLEN, "%d", same_len); ga_concat(gap, buf); ga_concat(gap, (char_u *)" times]"); - p = s - 1; + p = s; } else + { ga_concat_esc(gap, p, clen); + p += clen; + } } }