aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/old/testdir/test_functions.vim116
1 files changed, 76 insertions, 40 deletions
diff --git a/test/old/testdir/test_functions.vim b/test/old/testdir/test_functions.vim
index 177fef9e99..39d994a2df 100644
--- a/test/old/testdir/test_functions.vim
+++ b/test/old/testdir/test_functions.vim
@@ -1267,7 +1267,8 @@ func Test_charidx()
call assert_equal(1, charidx(a, 3))
call assert_equal(2, charidx(a, 4))
call assert_equal(3, charidx(a, 7))
- call assert_equal(-1, charidx(a, 8))
+ call assert_equal(4, charidx(a, 8))
+ call assert_equal(-1, charidx(a, 9))
call assert_equal(-1, charidx(a, -1))
" count composing characters
@@ -1275,14 +1276,18 @@ func Test_charidx()
call assert_equal(2, a->charidx(2, 1))
call assert_equal(3, a->charidx(4, 1))
call assert_equal(5, a->charidx(7, 1))
- call assert_equal(-1, a->charidx(8, 1))
+ call assert_equal(6, a->charidx(8, 1))
+ call assert_equal(-1, a->charidx(9, 1))
" empty string
- call assert_equal(-1, charidx('', 0))
- call assert_equal(-1, charidx('', 0, 1))
+ call assert_equal(0, charidx('', 0))
+ call assert_equal(-1, charidx('', 1))
+ call assert_equal(0, charidx('', 0, 1))
+ call assert_equal(-1, charidx('', 1, 1))
" error cases
- call assert_equal(-1, charidx(v:_null_string, 0))
+ call assert_equal(0, charidx(v:_null_string, 0))
+ call assert_equal(-1, charidx(v:_null_string, 1))
call assert_fails('let x = charidx([], 1)', 'E1174:')
call assert_fails('let x = charidx("abc", [])', 'E1210:')
call assert_fails('let x = charidx("abc", 1, [])', 'E1212:')
@@ -1294,10 +1299,10 @@ endfunc
func Test_charidx_from_utf16_index()
" string with single byte characters
let str = "abc"
- for i in range(3)
+ for i in range(4)
call assert_equal(i, charidx(str, i, v:false, v:true))
endfor
- call assert_equal(-1, charidx(str, 3, v:false, v:true))
+ call assert_equal(-1, charidx(str, 4, v:false, v:true))
" string with two byte characters
let str = "a漏漏b"
@@ -1305,7 +1310,8 @@ func Test_charidx_from_utf16_index()
call assert_equal(1, charidx(str, 1, v:false, v:true))
call assert_equal(2, charidx(str, 2, v:false, v:true))
call assert_equal(3, charidx(str, 3, v:false, v:true))
- call assert_equal(-1, charidx(str, 4, v:false, v:true))
+ call assert_equal(4, charidx(str, 4, v:false, v:true))
+ call assert_equal(-1, charidx(str, 5, v:false, v:true))
" string with four byte characters
let str = "a馃槉馃槉b"
@@ -1315,38 +1321,48 @@ func Test_charidx_from_utf16_index()
call assert_equal(2, charidx(str, 3, v:false, v:true))
call assert_equal(2, charidx(str, 4, v:false, v:true))
call assert_equal(3, charidx(str, 5, v:false, v:true))
- call assert_equal(-1, charidx(str, 6, v:false, v:true))
+ call assert_equal(4, charidx(str, 6, v:false, v:true))
+ call assert_equal(-1, charidx(str, 7, v:false, v:true))
" string with composing characters
let str = '-a虂-b虂'
for i in str->strcharlen()->range()
call assert_equal(i, charidx(str, i, v:false, v:true))
endfor
- call assert_equal(-1, charidx(str, 4, v:false, v:true))
+ call assert_equal(4, charidx(str, 4, v:false, v:true))
+ call assert_equal(-1, charidx(str, 5, v:false, v:true))
for i in str->strchars()->range()
call assert_equal(i, charidx(str, i, v:true, v:true))
endfor
- call assert_equal(-1, charidx(str, 6, v:true, v:true))
+ call assert_equal(6, charidx(str, 6, v:true, v:true))
+ call assert_equal(-1, charidx(str, 7, v:true, v:true))
" string with multiple composing characters
let str = '-a台虂-a台虂'
for i in str->strcharlen()->range()
call assert_equal(i, charidx(str, i, v:false, v:true))
endfor
- call assert_equal(-1, charidx(str, 4, v:false, v:true))
+ call assert_equal(4, charidx(str, 4, v:false, v:true))
+ call assert_equal(-1, charidx(str, 5, v:false, v:true))
for i in str->strchars()->range()
call assert_equal(i, charidx(str, i, v:true, v:true))
endfor
- call assert_equal(-1, charidx(str, 8, v:true, v:true))
+ call assert_equal(8, charidx(str, 8, v:true, v:true))
+ call assert_equal(-1, charidx(str, 9, v:true, v:true))
" empty string
- call assert_equal(-1, charidx('', 0, v:false, v:true))
- call assert_equal(-1, charidx('', 0, v:true, v:true))
+ call assert_equal(0, charidx('', 0, v:false, v:true))
+ call assert_equal(-1, charidx('', 1, v:false, v:true))
+ call assert_equal(0, charidx('', 0, v:true, v:true))
+ call assert_equal(-1, charidx('', 1, v:true, v:true))
" error cases
- call assert_equal(-1, charidx('', 0, v:false, v:true))
- call assert_equal(-1, charidx('', 0, v:true, v:true))
- call assert_equal(-1, charidx(v:_null_string, 0, v:false, v:true))
+ call assert_equal(0, charidx('', 0, v:false, v:true))
+ call assert_equal(-1, charidx('', 1, v:false, v:true))
+ call assert_equal(0, charidx('', 0, v:true, v:true))
+ call assert_equal(-1, charidx('', 1, v:true, v:true))
+ call assert_equal(0, charidx(v:_null_string, 0, v:false, v:true))
+ call assert_equal(-1, charidx(v:_null_string, 1, v:false, v:true))
call assert_fails('let x = charidx("abc", 1, v:false, [])', 'E1212:')
call assert_fails('let x = charidx("abc", 1, v:true, [])', 'E1212:')
endfunc
@@ -1355,10 +1371,10 @@ endfunc
func Test_utf16idx_from_byteidx()
" UTF-16 index of a string with single byte characters
let str = "abc"
- for i in range(3)
+ for i in range(4)
call assert_equal(i, utf16idx(str, i))
endfor
- call assert_equal(-1, utf16idx(str, 3))
+ call assert_equal(-1, utf16idx(str, 4))
" UTF-16 index of a string with two byte characters
let str = 'a漏漏b'
@@ -1368,7 +1384,8 @@ func Test_utf16idx_from_byteidx()
call assert_equal(2, str->utf16idx(3))
call assert_equal(2, str->utf16idx(4))
call assert_equal(3, str->utf16idx(5))
- call assert_equal(-1, str->utf16idx(6))
+ call assert_equal(4, str->utf16idx(6))
+ call assert_equal(-1, str->utf16idx(7))
" UTF-16 index of a string with four byte characters
let str = 'a馃槉馃槉b'
@@ -1382,7 +1399,8 @@ func Test_utf16idx_from_byteidx()
call assert_equal(4, utf16idx(str, 7))
call assert_equal(4, utf16idx(str, 8))
call assert_equal(5, utf16idx(str, 9))
- call assert_equal(-1, utf16idx(str, 10))
+ call assert_equal(6, utf16idx(str, 10))
+ call assert_equal(-1, utf16idx(str, 11))
" UTF-16 index of a string with composing characters
let str = '-a虂-b虂'
@@ -1394,7 +1412,8 @@ func Test_utf16idx_from_byteidx()
call assert_equal(3, utf16idx(str, 5))
call assert_equal(3, utf16idx(str, 6))
call assert_equal(3, utf16idx(str, 7))
- call assert_equal(-1, utf16idx(str, 8))
+ call assert_equal(4, utf16idx(str, 8))
+ call assert_equal(-1, utf16idx(str, 9))
call assert_equal(0, utf16idx(str, 0, v:true))
call assert_equal(1, utf16idx(str, 1, v:true))
call assert_equal(2, utf16idx(str, 2, v:true))
@@ -1403,7 +1422,8 @@ func Test_utf16idx_from_byteidx()
call assert_equal(4, utf16idx(str, 5, v:true))
call assert_equal(5, utf16idx(str, 6, v:true))
call assert_equal(5, utf16idx(str, 7, v:true))
- call assert_equal(-1, utf16idx(str, 8, v:true))
+ call assert_equal(6, utf16idx(str, 8, v:true))
+ call assert_equal(-1, utf16idx(str, 9, v:true))
" string with multiple composing characters
let str = '-a台虂-a台虂'
@@ -1419,7 +1439,8 @@ func Test_utf16idx_from_byteidx()
call assert_equal(3, utf16idx(str, 9))
call assert_equal(3, utf16idx(str, 10))
call assert_equal(3, utf16idx(str, 11))
- call assert_equal(-1, utf16idx(str, 12))
+ call assert_equal(4, utf16idx(str, 12))
+ call assert_equal(-1, utf16idx(str, 13))
call assert_equal(0, utf16idx(str, 0, v:true))
call assert_equal(1, utf16idx(str, 1, v:true))
call assert_equal(2, utf16idx(str, 2, v:true))
@@ -1432,16 +1453,21 @@ func Test_utf16idx_from_byteidx()
call assert_equal(6, utf16idx(str, 9, v:true))
call assert_equal(7, utf16idx(str, 10, v:true))
call assert_equal(7, utf16idx(str, 11, v:true))
- call assert_equal(-1, utf16idx(str, 12, v:true))
+ call assert_equal(8, utf16idx(str, 12, v:true))
+ call assert_equal(-1, utf16idx(str, 13, v:true))
" empty string
- call assert_equal(-1, utf16idx('', 0))
- call assert_equal(-1, utf16idx('', 0, v:true))
+ call assert_equal(0, utf16idx('', 0))
+ call assert_equal(-1, utf16idx('', 1))
+ call assert_equal(0, utf16idx('', 0, v:true))
+ call assert_equal(-1, utf16idx('', 1, v:true))
" error cases
- call assert_equal(-1, utf16idx("", 0))
+ call assert_equal(0, utf16idx("", 0))
+ call assert_equal(-1, utf16idx("", 1))
call assert_equal(-1, utf16idx("abc", -1))
- call assert_equal(-1, utf16idx(v:_null_string, 0))
+ call assert_equal(0, utf16idx(v:_null_string, 0))
+ call assert_equal(-1, utf16idx(v:_null_string, 1))
call assert_fails('let l = utf16idx([], 0)', 'E1174:')
call assert_fails('let l = utf16idx("ab", [])', 'E1210:')
call assert_fails('let l = utf16idx("ab", 0, [])', 'E1212:')
@@ -1453,14 +1479,16 @@ func Test_utf16idx_from_charidx()
for i in str->strcharlen()->range()
call assert_equal(i, utf16idx(str, i, v:false, v:true))
endfor
- call assert_equal(-1, utf16idx(str, 3, v:false, v:true))
+ call assert_equal(3, utf16idx(str, 3, v:false, v:true))
+ call assert_equal(-1, utf16idx(str, 4, v:false, v:true))
" UTF-16 index of a string with two byte characters
let str = "a漏漏b"
for i in str->strcharlen()->range()
call assert_equal(i, utf16idx(str, i, v:false, v:true))
endfor
- call assert_equal(-1, utf16idx(str, 4, v:false, v:true))
+ call assert_equal(4, utf16idx(str, 4, v:false, v:true))
+ call assert_equal(-1, utf16idx(str, 5, v:false, v:true))
" UTF-16 index of a string with four byte characters
let str = "a馃槉馃槉b"
@@ -1468,36 +1496,44 @@ func Test_utf16idx_from_charidx()
call assert_equal(2, utf16idx(str, 1, v:false, v:true))
call assert_equal(4, utf16idx(str, 2, v:false, v:true))
call assert_equal(5, utf16idx(str, 3, v:false, v:true))
- call assert_equal(-1, utf16idx(str, 4, v:false, v:true))
+ call assert_equal(6, utf16idx(str, 4, v:false, v:true))
+ call assert_equal(-1, utf16idx(str, 5, v:false, v:true))
" UTF-16 index of a string with composing characters
let str = '-a虂-b虂'
for i in str->strcharlen()->range()
call assert_equal(i, utf16idx(str, i, v:false, v:true))
endfor
- call assert_equal(-1, utf16idx(str, 4, v:false, v:true))
+ call assert_equal(4, utf16idx(str, 4, v:false, v:true))
+ call assert_equal(-1, utf16idx(str, 5, v:false, v:true))
for i in str->strchars()->range()
call assert_equal(i, utf16idx(str, i, v:true, v:true))
endfor
- call assert_equal(-1, utf16idx(str, 6, v:true, v:true))
+ call assert_equal(6, utf16idx(str, 6, v:true, v:true))
+ call assert_equal(-1, utf16idx(str, 7, v:true, v:true))
" string with multiple composing characters
let str = '-a台虂-a台虂'
for i in str->strcharlen()->range()
call assert_equal(i, utf16idx(str, i, v:false, v:true))
endfor
- call assert_equal(-1, utf16idx(str, 4, v:false, v:true))
+ call assert_equal(4, utf16idx(str, 4, v:false, v:true))
+ call assert_equal(-1, utf16idx(str, 5, v:false, v:true))
for i in str->strchars()->range()
call assert_equal(i, utf16idx(str, i, v:true, v:true))
endfor
- call assert_equal(-1, utf16idx(str, 8, v:true, v:true))
+ call assert_equal(8, utf16idx(str, 8, v:true, v:true))
+ call assert_equal(-1, utf16idx(str, 9, v:true, v:true))
" empty string
- call assert_equal(-1, utf16idx('', 0, v:false, v:true))
- call assert_equal(-1, utf16idx('', 0, v:true, v:true))
+ call assert_equal(0, utf16idx('', 0, v:false, v:true))
+ call assert_equal(-1, utf16idx('', 1, v:false, v:true))
+ call assert_equal(0, utf16idx('', 0, v:true, v:true))
+ call assert_equal(-1, utf16idx('', 1, v:true, v:true))
" error cases
- call assert_equal(-1, utf16idx(v:_null_string, 0, v:true, v:true))
+ call assert_equal(0, utf16idx(v:_null_string, 0, v:true, v:true))
+ call assert_equal(-1, utf16idx(v:_null_string, 1, v:true, v:true))
call assert_fails('let l = utf16idx("ab", 0, v:false, [])', 'E1212:')
endfunc
generated by cgit (git 2.34.1) at 2025-08-05 00:58:37 +0000