patch 9.1.0666: assert_equal() doesn't show multibyte string correctly

zeertzjq · chrisbra · commit 9c4b2462bb49 · 2024-08-09T19:52:10.000+02:00
Problem:  assert_equal() doesn't show multibyte string correctly
Solution: Properly advance over a multibyte char.
          (zeertzjq)

closes: #15456

Signed-off-by: zeertzjq &lt;zeertzjq@outlook.com&gt;
Signed-off-by: Christian Brabandt &lt;cb@256bit.org&gt;
diff --git 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
@@ -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
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    666,
 /**/
     665,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ ga_concat_shorten_esc(garray_T gap, char_u str)`
`99`	`99`	`return;`
`100`	`100`	`}`
`101`	`101`
`102`		`- for (p = str; *p != NUL; ++p)`
	`102`	`+ for (p = str; *p != NUL; )`
`103`	`103`	`{`
`104`	`104`	`same_len = 1;`
`105`	`105`	`s = p;`
`@@ -118,10 +118,13 @@ ga_concat_shorten_esc(garray_T gap, char_u str)`
`118`	`118`	`vim_snprintf((char *)buf, NUMBUFLEN, "%d", same_len);`
`119`	`119`	`ga_concat(gap, buf);`
`120`	`120`	`ga_concat(gap, (char_u *)" times]");`
`121`		`- p = s - 1;`
	`121`	`+ p = s;`
`122`	`122`	`}`
`123`	`123`	`else`
	`124`	`+ {`
`124`	`125`	`ga_concat_esc(gap, p, clen);`
	`126`	`+ p += clen;`
	`127`	`+ }`
`125`	`128`	`}`
`126`	`129`	`}`
`127`	`130`