Mercurial > vim
view src/testdir/test_input.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 | 5da38c4ffe92 |
| children |
line wrap: on
line source
" Tests for character input and feedkeys() function. func Test_feedkeys_x_with_empty_string() new call feedkeys("ifoo\<Esc>") call assert_equal('', getline('.')) call feedkeys('', 'x') call assert_equal('foo', getline('.')) " check it goes back to normal mode immediately. call feedkeys('i', 'x') call assert_equal('foo', getline('.')) quit! endfunc func Test_feedkeys_with_abbreviation() new inoreabbrev trigger value call feedkeys("atrigger ", 'x') call feedkeys("atrigger ", 'x') call assert_equal('value value ', getline(1)) bwipe! iunabbrev trigger endfunc func Test_feedkeys_escape_special() nnoremap … <Cmd>let g:got_ellipsis += 1<CR> call feedkeys('…', 't') call assert_equal('…', getcharstr()) let g:got_ellipsis = 0 call feedkeys('…', 'xt') call assert_equal(1, g:got_ellipsis) unlet g:got_ellipsis nunmap … endfunc func Test_input_simplify_ctrl_at() new " feeding unsimplified CTRL-@ should still trigger i_CTRL-@ call feedkeys("ifoo\<Esc>A\<*C-@>x", 'xt') call assert_equal('foofo', getline(1)) bw! endfunc func Test_input_simplify_noremap() call feedkeys("i\<*C-M>", 'nx') call assert_equal('', getline(1)) call assert_equal([0, 2, 1, 0, 1], getcurpos()) bw! endfunc func Test_input_simplify_timedout() inoremap <C-M>a b call feedkeys("i\<*C-M>", 'xt') call assert_equal('', getline(1)) call assert_equal([0, 2, 1, 0, 1], getcurpos()) iunmap <C-M>a bw! endfunc " vim: shiftwidth=2 sts=2 expandtab