diff options
author | zeertzjq <zeertzjq@outlook.com> | 2024-08-09 19:52:10 +0200 |
---|---|---|
committer | Christian Brabandt <cb@256bit.org> | 2024-08-09 19:52:10 +0200 |
commit | 9c4b2462bb498f44044616f7309d111d12170369 (patch) | |
tree | dcb90e07a9d0b3516065a44f6873b1b02e41a523 | |
parent | 0cc5dce5780d39fe621f6146d4fb862318918125 (diff) |
patch 9.1.0666: assert_equal() doesn't show multibyte string correctlyv9.1.0666
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>
-rw-r--r-- | src/testdir/test_assert.vim | 9 | ||||
-rw-r--r-- | src/testing.c | 7 | ||||
-rw-r--r-- | src/version.c | 2 |
3 files changed, 16 insertions, 2 deletions
diff --git a/src/testdir/test_assert.vim b/src/testdir/test_assert.vim index d143f19f59..15b18a4423 100644 --- 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]) diff --git a/src/testing.c b/src/testing.c index 18b8e788eb..7ab109c10c 100644 --- a/src/testing.c +++ b/src/testing.c @@ -99,7 +99,7 @@ ga_concat_shorten_esc(garray_T *gap, char_u *str) 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, char_u *str) 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; + } } } diff --git a/src/version.c b/src/version.c index 1b7e423353..1aacff5e66 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 666, +/**/ 665, /**/ 664, |