Mercurial > vim
view src/testdir/test_hide.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 | e373843e2980 |
| children |
line wrap: on
line source
" Tests for :hide command/modifier and 'hidden' option func SetUp() let s:save_hidden = &hidden let s:save_bufhidden = &bufhidden let s:save_autowrite = &autowrite set nohidden set bufhidden= set noautowrite endfunc function TearDown() let &hidden = s:save_hidden let &bufhidden = s:save_bufhidden let &autowrite = s:save_autowrite endfunc function Test_hide() let orig_bname = bufname('') let orig_winnr = winnr('$') new Xf1 set modified call assert_fails('edit Xf2') bwipeout! Xf1 new Xf1 set modified edit! Xf2 call assert_equal(['Xf2', 2], [bufname(''), winnr('$')]) call assert_equal([1, 0], [buflisted('Xf1'), bufloaded('Xf1')]) bwipeout! Xf1 bwipeout! Xf2 new Xf1 set modified " :hide as a command hide call assert_equal([orig_bname, orig_winnr], [bufname(''), winnr('$')]) call assert_equal([1, 1], ['Xf1'->buflisted(), 'Xf1'->bufloaded()]) bwipeout! Xf1 new Xf1 set modified " :hide as a command with trailing comment hide " comment call assert_equal([orig_bname, orig_winnr], [bufname(''), winnr('$')]) call assert_equal([1, 1], [buflisted('Xf1'), bufloaded('Xf1')]) bwipeout! Xf1 new Xf1 set modified " :hide as a command with bar hide | new Xf2 " comment call assert_equal(['Xf2', 2], [bufname(''), winnr('$')]) call assert_equal([1, 1], [buflisted('Xf1'), bufloaded('Xf1')]) bwipeout! Xf1 bwipeout! Xf2 new Xf1 set modified " :hide as a modifier with trailing comment hide edit Xf2 " comment call assert_equal(['Xf2', 2], [bufname(''), winnr('$')]) call assert_equal([1, 1], [buflisted('Xf1'), bufloaded('Xf1')]) bwipeout! Xf1 bwipeout! Xf2 new Xf1 set modified " To check that the bar is not recognized to separate commands hide echo "one|two" call assert_equal(['Xf1', 2], [bufname(''), winnr('$')]) call assert_equal([1, 1], [buflisted('Xf1'), bufloaded('Xf1')]) bwipeout! Xf1 " set hidden new Xf1 set hidden set modified edit Xf2 " comment call assert_equal(['Xf2', 2], [bufname(''), winnr('$')]) call assert_equal([1, 1], [buflisted('Xf1'), bufloaded('Xf1')]) bwipeout! Xf1 bwipeout! Xf2 " set hidden bufhidden=wipe new Xf1 set bufhidden=wipe set modified hide edit! Xf2 " comment call assert_equal(['Xf2', 2], [bufname(''), winnr('$')]) call assert_equal([0, 0], [buflisted('Xf1'), bufloaded('Xf1')]) bwipeout! Xf2 endfunc " vim: shiftwidth=2 sts=2 expandtab