From 6bc0d9b8c75b5bef61a951e56deb2b28f50182d8 Mon Sep 17 00:00:00 2001 From: Michael Ennen Date: Sun, 23 Oct 2016 17:38:28 -0700 Subject: vim-patch:7.4.1779 Problem: Using negative index in strcharpart(). (Yegappan Lakshmanan) Solution: Assume single byte when using a negative iindex. https://github.com/vim/vim/commit/73dfe917ba6357413aaf98a021c91add5ac6e9bc --- src/nvim/testdir/test_expr_utf8.vim | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'src/nvim/testdir') diff --git a/src/nvim/testdir/test_expr_utf8.vim b/src/nvim/testdir/test_expr_utf8.vim index 00d5d9a63a..7bdcb4f65f 100644 --- a/src/nvim/testdir/test_expr_utf8.vim +++ b/src/nvim/testdir/test_expr_utf8.vim @@ -4,29 +4,35 @@ if !has('multi_byte') endif scriptencoding utf-8 -func Test_strgetchar() +func Test_strgetchar_utf8() call assert_equal(char2nr('á'), strgetchar('áxb', 0)) call assert_equal(char2nr('x'), strgetchar('áxb', 1)) - call assert_equal(-1, strgetchar('axb', -1)) - call assert_equal(-1, strgetchar('axb', 3)) - call assert_equal(-1, strgetchar('', 0)) - - call assert_equal(char2nr('a'), strgetchar('àxb', 0)) + call assert_equal(char2nr('a'), strgetchar('àxb', 0)) call assert_equal(char2nr('̀'), strgetchar('àxb', 1)) - call assert_equal(char2nr('x'), strgetchar('àxb', 2)) + call assert_equal(char2nr('x'), strgetchar('àxb', 2)) call assert_equal(char2nr('あ'), strgetchar('あaい', 0)) call assert_equal(char2nr('a'), strgetchar('あaい', 1)) call assert_equal(char2nr('い'), strgetchar('あaい', 2)) endfunc -func Test_strcharpart() +func Test_strcharpart_utf8() call assert_equal('áxb', strcharpart('áxb', 0)) call assert_equal('á', strcharpart('áxb', 0, 1)) call assert_equal('x', strcharpart('áxb', 1, 1)) - call assert_equal('a', strcharpart('àxb', 0, 1)) + call assert_equal('いうeお', strcharpart('あいうeお', 1)) + call assert_equal('い', strcharpart('あいうeお', 1, 1)) + call assert_equal('いう', strcharpart('あいうeお', 1, 2)) + call assert_equal('いうe', strcharpart('あいうeお', 1, 3)) + call assert_equal('いうeお', strcharpart('あいうeお', 1, 4)) + call assert_equal('eお', strcharpart('あいうeお', 3)) + call assert_equal('e', strcharpart('あいうeお', 3, 1)) + + call assert_equal('あ', strcharpart('あいうeお', -3, 4)) + + call assert_equal('a', strcharpart('àxb', 0, 1)) call assert_equal('̀', strcharpart('àxb', 1, 1)) - call assert_equal('x', strcharpart('àxb', 2, 1)) + call assert_equal('x', strcharpart('àxb', 2, 1)) endfunc -- cgit