Mercurial > vim
view src/testdir/test_blockedit.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 | dbec60b8c253 |
children |
line wrap: on
line source
" Test for block inserting func Test_blockinsert_indent() new filetype plugin indent on setlocal sw=2 et ft=vim call setline(1, ['let a=[', ' ''eins'',', ' ''zwei'',', ' ''drei'']']) call cursor(2, 3) exe "norm! \<c-v>2jI\\ \<esc>" call assert_equal(['let a=[', ' \ ''eins'',', ' \ ''zwei'',', ' \ ''drei'']'], \ getline(1,'$')) " reset to sane state filetype off bwipe! endfunc func Test_blockinsert_autoindent() new let lines =<< trim END vim9script var d = { a: () => 0, b: () => 0, c: () => 0, } END call setline(1, lines) filetype plugin indent on setlocal sw=2 et ft=vim setlocal indentkeys+=: exe "norm! 3Gf)\<c-v>2jA: asdf\<esc>" let expected =<< trim END vim9script var d = { a: (): asdf => 0, b: (): asdf => 0, c: (): asdf => 0, } END call assert_equal(expected, getline(1, 6)) " insert on the next column should do exactly the same :%dele call setline(1, lines) exe "norm! 3Gf)l\<c-v>2jI: asdf\<esc>" call assert_equal(expected, getline(1, 6)) :%dele call setline(1, lines) setlocal sw=8 noet exe "norm! 3Gf)\<c-v>2jA: asdf\<esc>" let expected =<< trim END vim9script var d = { a: (): asdf => 0, b: (): asdf => 0, c: (): asdf => 0, } END call assert_equal(expected, getline(1, 6)) " insert on the next column should do exactly the same :%dele call setline(1, lines) exe "norm! 3Gf)l\<c-v>2jI: asdf\<esc>" call assert_equal(expected, getline(1, 6)) filetype off bwipe! endfunc func Test_blockinsert_delete() new let _bs = &bs set bs=2 call setline(1, ['case Arg is ', ' when Name_Async,', ' when Name_Num_Gangs,', 'end if;']) exe "norm! ggjVj\<c-v>$o$A\<bs>\<esc>" "call feedkeys("Vj\<c-v>$o$A\<bs>\<esc>", 'ti') call assert_equal(["case Arg is ", " when Name_Async", " when Name_Num_Gangs,", "end if;"], \ getline(1,'$')) " reset to sane state let &bs = _bs bwipe! endfunc func Test_blockappend_eol_cursor() new " Test 1 Move 1 char left call setline(1, ['aaa', 'bbb', 'ccc']) exe "norm! gg$\<c-v>2jA\<left>x\<esc>" call assert_equal(['aaxa', 'bbxb', 'ccxc'], getline(1, '$')) " Test 2 Move 2 chars left sil %d call setline(1, ['aaa', 'bbb', 'ccc']) exe "norm! gg$\<c-v>2jA\<left>\<left>x\<esc>" call assert_equal(['axaa', 'bxbb', 'cxcc'], getline(1, '$')) " Test 3 Move 3 chars left (outside of the visual selection) sil %d call setline(1, ['aaa', 'bbb', 'ccc']) exe "norm! ggl$\<c-v>2jA\<left>\<left>\<left>x\<esc>" call assert_equal(['xaaa', 'bbb', 'ccc'], getline(1, '$')) bw! endfunc func Test_blockappend_eol_cursor2() new " Test 1 Move 1 char left call setline(1, ['aaaaa', 'bbb', 'ccccc']) exe "norm! gg\<c-v>$2jA\<left>x\<esc>" call assert_equal(['aaaaxa', 'bbbx', 'ccccxc'], getline(1, '$')) " Test 2 Move 2 chars left sil %d call setline(1, ['aaaaa', 'bbb', 'ccccc']) exe "norm! gg\<c-v>$2jA\<left>\<left>x\<esc>" call assert_equal(['aaaxaa', 'bbbx', 'cccxcc'], getline(1, '$')) " Test 3 Move 3 chars left (to the beginning of the visual selection) sil %d call setline(1, ['aaaaa', 'bbb', 'ccccc']) exe "norm! gg\<c-v>$2jA\<left>\<left>\<left>x\<esc>" call assert_equal(['aaxaaa', 'bbxb', 'ccxccc'], getline(1, '$')) " Test 4 Move 3 chars left (outside of the visual selection) sil %d call setline(1, ['aaaaa', 'bbb', 'ccccc']) exe "norm! ggl\<c-v>$2jA\<left>\<left>\<left>x\<esc>" call assert_equal(['aaxaaa', 'bbxb', 'ccxccc'], getline(1, '$')) " Test 5 Move 4 chars left (outside of the visual selection) sil %d call setline(1, ['aaaaa', 'bbb', 'ccccc']) exe "norm! ggl\<c-v>$2jA\<left>\<left>\<left>\<left>x\<esc>" call assert_equal(['axaaaa', 'bxbb', 'cxcccc'], getline(1, '$')) bw! endfunc " vim: shiftwidth=2 sts=2 expandtab