Mercurial > vim
view src/testdir/test_changedtick.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 | 08940efa6b4e |
| children |
line wrap: on
line source
" Tests for b:changedtick func Test_changedtick_increments() new " New buffer has an empty line, tick starts at 2. let expected = 2 call assert_equal(expected, b:changedtick) call assert_equal(expected, b:['changedtick']) call setline(1, 'hello') let expected += 1 call assert_equal(expected, b:changedtick) call assert_equal(expected, b:['changedtick']) undo " Somehow undo counts as two changes. let expected += 2 call assert_equal(expected, b:changedtick) call assert_equal(expected, b:['changedtick']) bwipe! endfunc func Test_changedtick_dict_entry() let d = b: call assert_equal(b:changedtick, d['changedtick']) endfunc func Test_changedtick_bdel() new let bnr = bufnr('%') let v = b:changedtick bdel " Delete counts as a change too. call assert_equal(v + 1, getbufvar(bnr, 'changedtick')) endfunc func Test_changedtick_islocked() call assert_equal(0, islocked('b:changedtick')) let d = b: call assert_equal(0, islocked('d.changedtick')) endfunc func Test_changedtick_fixed() call assert_fails('let b:changedtick = 4', 'E46:') call assert_fails('let b:["changedtick"] = 4', 'E46:') call assert_fails('lockvar b:changedtick', 'E940:') call assert_fails('lockvar b:["changedtick"]', 'E46:') call assert_fails('unlockvar b:changedtick', 'E940:') call assert_fails('unlockvar b:["changedtick"]', 'E46:') call assert_fails('unlet b:changedtick', 'E795:') call assert_fails('unlet b:["changedtick"]', 'E46:') let d = b: call assert_fails('lockvar d["changedtick"]', 'E46:') call assert_fails('unlockvar d["changedtick"]', 'E46:') call assert_fails('unlet d["changedtick"]', 'E46:') endfunc func Test_changedtick_not_incremented_with_write() new let fname = "XChangeTick" exe 'w ' .. fname " :write when the buffer is not changed does not increment changedtick let expected = b:changedtick w call assert_equal(expected, b:changedtick) " :write when the buffer IS changed DOES increment changedtick let expected = b:changedtick + 1 setlocal modified w call assert_equal(expected, b:changedtick) " Two ticks: change + write let expected = b:changedtick + 2 call setline(1, 'hello') w call assert_equal(expected, b:changedtick) " Two ticks: start insert + write let expected = b:changedtick + 2 normal! o w call assert_equal(expected, b:changedtick) " Three ticks: start insert + change + write let expected = b:changedtick + 3 normal! ochanged w call assert_equal(expected, b:changedtick) bwipe call delete(fname) endfunc " vim: shiftwidth=2 sts=2 expandtab