Mercurial > vim
view src/testdir/test_fixeol.vim @ 34686:83875247fbc0 v9.1.0224
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Commit: https://github.com/vim/vim/commit/515f734e687f28f7199b2a8042197624d9f3ec15
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Thu Mar 28 12:01:14 2024 +0100
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Problem: If a line has "right" & "below" virtual text properties,
where the "below" property may be stored first due to lack of
ordering between them, then the line height is calculated to
be 1 more and causes the cursor to far over the line.
Solution: Remove some unnecessary setting of a
`next_right_goes_below = TRUE` flag for "below" and "above"
text properties. (Dylan Thacker-Smith)
I modified a regression test I recently added to cover this case,
leveraging the fact that "after", "right" & "below" text properties are
being stored in the reverse of the order they are added in. The
previous version of this regression test was crafted to workaround this
issue so it can be addressed by this separate patch.
closes: #14317
Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 28 Mar 2024 12:15:03 +0100 |
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