Mercurial > vim
view src/testdir/test_fixeol.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 | 92b1338023ee |
| children |
line wrap: on
line source
" Tests for 'fixeol', 'eof' and 'eol' func Test_fixeol() " first write two test files – with and without trailing EOL " use Unix fileformat for consistency set ff=unix enew! call setline('.', 'with eol or eof') w! XXEol enew! set noeof noeol nofixeol call setline('.', 'without eol or eof') w! XXNoEol set eol eof fixeol bwipe XXEol XXNoEol " try editing files with 'fixeol' disabled e! XXEol normal ostays eol set nofixeol w! XXTestEol e! XXNoEol normal ostays without set nofixeol w! XXTestNoEol bwipe! XXEol XXNoEol XXTestEol XXTestNoEol set fixeol " Append "END" to each file so that we can see what the last written char " was. normal ggdGaEND w >>XXEol w >>XXNoEol w >>XXTestEol w >>XXTestNoEol call assert_equal(['with eol or eof', 'END'], readfile('XXEol')) call assert_equal(['without eol or eofEND'], readfile('XXNoEol')) call assert_equal(['with eol or eof', 'stays eol', 'END'], readfile('XXTestEol')) call assert_equal(['without eol or eof', 'stays withoutEND'], \ readfile('XXTestNoEol')) call delete('XXEol') call delete('XXNoEol') call delete('XXTestEol') call delete('XXTestNoEol') set ff& fixeol& eof& eol& enew! endfunc func Test_eof() let data = 0z68656c6c6f.0d0a.776f726c64 " "hello\r\nworld" " 1. Eol, Eof " read call writefile(data + 0z0d0a.1a, 'XXEolEof') e! XXEolEof call assert_equal(['hello', 'world'], getline(1, 2)) call assert_equal([1, 1], [&eol, &eof]) " write set fixeol w! call assert_equal(data + 0z0d0a, readblob('XXEolEof')) set nofixeol w! call assert_equal(data + 0z0d0a.1a, readblob('XXEolEof')) " 2. NoEol, Eof " read call writefile(data + 0z1a, 'XXNoEolEof') e! XXNoEolEof call assert_equal(['hello', 'world'], getline(1, 2)) call assert_equal([0, 1], [&eol, &eof]) " write set fixeol w! call assert_equal(data + 0z0d0a, readblob('XXNoEolEof')) set nofixeol w! call assert_equal(data + 0z1a, readblob('XXNoEolEof')) " 3. Eol, NoEof " read call writefile(data + 0z0d0a, 'XXEolNoEof') e! XXEolNoEof call assert_equal(['hello', 'world'], getline(1, 2)) call assert_equal([1, 0], [&eol, &eof]) " write set fixeol w! call assert_equal(data + 0z0d0a, readblob('XXEolNoEof')) set nofixeol w! call assert_equal(data + 0z0d0a, readblob('XXEolNoEof')) " 4. NoEol, NoEof " read call writefile(data, 'XXNoEolNoEof') e! XXNoEolNoEof call assert_equal(['hello', 'world'], getline(1, 2)) call assert_equal([0, 0], [&eol, &eof]) " write set fixeol w! call assert_equal(data + 0z0d0a, readblob('XXNoEolNoEof')) set nofixeol w! call assert_equal(data, readblob('XXNoEolNoEof')) call delete('XXEolEof') call delete('XXNoEolEof') call delete('XXEolNoEof') call delete('XXNoEolNoEof') set ff& fixeol& eof& eol& enew! endfunc " vim: shiftwidth=2 sts=2 expandtab