Mercurial > vim
view src/testdir/test_utf8_comparisons.vim @ 35308:22c03485f222 v9.1.0456
patch 9.1.0456: Left shift is incorrect with vartabstop and shiftwidth=0
Commit: https://github.com/vim/vim/commit/88d4f255b7b7a19bb4f6489e0ad0956e47d51fed
Author: Gary Johnson <garyjohn@spocom.com>
Date: Sat Jun 1 20:51:33 2024 +0200
patch 9.1.0456: Left shift is incorrect with vartabstop and shiftwidth=0
Problem: Left shift is incorrect with vartabstop and shiftwidth=0
Solution: make tabstop_at() function aware of shift direction
(Gary Johnson)
The problem was that with 'vartabstop' set and 'shiftwidth' equal 0,
left shifts using << were shifting the line to the wrong column. The
tabstop to the right of the first character in the line was being used
as the shift amount instead of the tabstop to the left of that first
character.
The reason was that the tabstop_at() function always returned the value
of the tabstop to the right of the given column and was not accounting
for the direction of the shift.
The solution was to make tabstop_at() aware of the direction of the
shift and to choose the tabtop accordingly.
A test was added to check this behavior and make sure it doesn't
regress.
While at it, also fix a few indentation/alignment issues.
fixes: #14864
closes: #14887
Signed-off-by: Gary Johnson <garyjohn@spocom.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sat, 01 Jun 2024 21:00:03 +0200 |
parents | be4389b04043 |
children |
line wrap: on
line source
" Tests for case-insensitive UTF-8 comparisons (utf_strnicmp() in mbyte.c) " Also test "g~ap". func Ch(a, op, b, expected) call assert_equal(eval(printf('"%s" %s "%s"', a:a, a:op, a:b)), a:expected, \ printf('"%s" %s "%s" should return %d', a:a, a:op, a:b, a:expected)) endfunc func Chk(a, b, result) if a:result == 0 call Ch(a:a, '==?', a:b, 1) call Ch(a:a, '!=?', a:b, 0) call Ch(a:a, '<=?', a:b, 1) call Ch(a:a, '>=?', a:b, 1) call Ch(a:a, '<?', a:b, 0) call Ch(a:a, '>?', a:b, 0) elseif a:result > 0 call Ch(a:a, '==?', a:b, 0) call Ch(a:a, '!=?', a:b, 1) call Ch(a:a, '<=?', a:b, 0) call Ch(a:a, '>=?', a:b, 1) call Ch(a:a, '<?', a:b, 0) call Ch(a:a, '>?', a:b, 1) else call Ch(a:a, '==?', a:b, 0) call Ch(a:a, '!=?', a:b, 1) call Ch(a:a, '<=?', a:b, 1) call Ch(a:a, '>=?', a:b, 0) call Ch(a:a, '<?', a:b, 1) call Ch(a:a, '>?', a:b, 0) endif endfunc func Check(a, b, result) call Chk(a:a, a:b, a:result) call Chk(a:b, a:a, -a:result) endfunc func LT(a, b) call Check(a:a, a:b, -1) endfunc func GT(a, b) call Check(a:a, a:b, 1) endfunc func EQ(a, b) call Check(a:a, a:b, 0) endfunc func Test_comparisons() call EQ('', '') call LT('', 'a') call EQ('abc', 'abc') call EQ('Abc', 'abC') call LT('ab', 'abc') call LT('AB', 'abc') call LT('ab', 'aBc') call EQ('\xd0\xb9\xd1\x86\xd1\x83\xd0\xba\xd0\xb5\xd0\xbd', '\xd0\xb9\xd0\xa6\xd0\xa3\xd0\xba\xd0\x95\xd0\xbd') call LT('\xd0\xb9\xd1\x86\xd1\x83\xd0\xba\xd0\xb5\xd0\xbd', '\xd0\xaf\xd1\x86\xd1\x83\xd0\xba\xd0\xb5\xd0\xbd') call EQ('\xe2\x84\xaa', 'k') call LT('\xe2\x84\xaa', 'kkkkkk') call EQ('\xe2\x84\xaa\xe2\x84\xaa\xe2\x84\xaa', 'kkk') call LT('kk', '\xe2\x84\xaa\xe2\x84\xaa\xe2\x84\xaa') call EQ('\xe2\x84\xaa\xe2\x84\xa6k\xe2\x84\xaak\xcf\x89', 'k\xcf\x89\xe2\x84\xaakk\xe2\x84\xa6') call EQ('Abc\x80', 'AbC\x80') call LT('Abc\x80', 'AbC\x81') call LT('Abc', 'AbC\x80') call LT('abc\x80DEF', 'abc\x80def') " case folding stops at the first bad character call LT('\xc3XYZ', '\xc3xyz') call EQ('\xef\xbc\xba', '\xef\xbd\x9a') " FF3A (upper), FF5A (lower) call GT('\xef\xbc\xba', '\xef\xbc\xff') " first string is ok and equals \xef\xbd\x9a after folding, second string is illegal and was left unchanged, then the strings were bytewise compared call LT('\xc3', '\xc3\x83') call EQ('\xc3\xa3xYz', '\xc3\x83XyZ') for n in range(0x60, 0xFF) call LT(printf('xYz\x%.2X', n-1), printf('XyZ\x%.2X', n)) endfor for n in range(0x80, 0xBF) call EQ(printf('xYz\xc2\x%.2XUvW', n), printf('XyZ\xc2\x%.2XuVw', n)) endfor for n in range(0xC0, 0xFF) call LT(printf('xYz\xc2\x%.2XUvW', n), printf('XyZ\xc2\x%.2XuVw', n)) endfor endfunc " test that g~ap changes one paragraph only. func Test_gap() new " setup text call feedkeys("iabcd\<cr>\<cr>defg", "tx") " modify only first line call feedkeys("gg0g~ap", "tx") call assert_equal(["ABCD", "", "defg"], getline(1,3)) endfunc " test that g~, ~ and gU correctly upper-cases ß func Test_uppercase_sharp_ss() new call setline(1, repeat(['ß'], 4)) call cursor(1, 1) norm! ~ call assert_equal('ẞ', getline(line('.'))) norm! ~ call assert_equal('ß', getline(line('.'))) call cursor(2, 1) norm! g~l call assert_equal('ẞ', getline(line('.'))) norm! g~l call assert_equal('ß', getline(line('.'))) call cursor(3, 1) norm! gUl call assert_equal('ẞ', getline(line('.'))) norm! vgU call assert_equal('ẞ', getline(line('.'))) norm! vgu call assert_equal('ß', getline(line('.'))) norm! gul call assert_equal('ß', getline(line('.'))) call cursor(4, 1) norm! vgU call assert_equal('ẞ', getline(line('.'))) norm! vgu call assert_equal('ß', getline(line('.'))) bw! endfunc " vim: shiftwidth=2 sts=2 expandtab