Mercurial > vim
view src/testdir/test_fixeol.vim @ 34379:37b4c89ba420 v9.1.0116
patch 9.1.0116: win_split_ins may not check available room
Commit: https://github.com/vim/vim/commit/0fd44a5ad81ade342cb54d8984965bdedd2272c8
Author: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Date: Tue Feb 20 20:28:15 2024 +0100
patch 9.1.0116: win_split_ins may not check available room
Problem: win_split_ins has no check for E36 when moving an existing
window
Solution: check for room and fix the issues in f_win_splitmove()
(Sean Dewar)
win_split_ins has no check for E36 when moving an existing window,
allowing for layouts with many overlapping zero-sized windows to be
created (which may also cause drawing issues with tablines and such).
f_win_splitmove also has some bugs.
So check for room and fix the issues in f_win_splitmove. Handle failure
in the two relevant win_split_ins callers by restoring the original
layout, and factor the common logic into win_splitmove.
Don't check for room when opening an autocommand window, as it's a
temporary window that's rarely interacted with or drawn anyhow, and is
rather important for some autocommands.
Issues fixed in f_win_splitmove:
- Error if splitting is disallowed.
- Fix heap-use-after-frees if autocommands fired from switching to "targetwin"
close "wp" or "oldwin".
- Fix splitting the wrong window if autocommands fired from switching to
"targetwin" switch to a different window.
- Ensure -1 is returned for all errors.
Also handle allocation failure a bit earlier in make_snapshot (callers,
except win_splitmove, don't really care if a snapshot can't be made, so
just ignore the return value).
Note: Test_smoothscroll_in_zero_width_window failed after these changes with
E36, as it was using the previous behaviour to create a zero-width window.
I've fixed the test such that it fails with UBSAN as expected when v9.0.1367 is
reverted (and simplified it too).
related: #14042
Signed-off-by: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 20 Feb 2024 22:30:04 +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