Mercurial > vim
view src/testdir/test_checkpath.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 | f7a2de8a4ddc |
| children |
line wrap: on
line source
" Tests for the :checkpath command " Test for 'include' without \zs or \ze func Test_checkpath1() call mkdir("Xcheckdir1/dir2", "pR") call writefile(['#include "bar.a"'], 'Xcheckdir1/dir2/foo.a') call writefile(['#include "baz.a"'], 'Xcheckdir1/dir2/bar.a') call writefile(['#include "foo.a"'], 'Xcheckdir1/dir2/baz.a') call writefile(['#include <foo.a>'], 'Xbase.a') edit Xbase.a set path=Xcheckdir1/dir2 let res = split(execute("checkpath!"), "\n") call assert_equal([ \ '--- Included files in path ---', \ 'Xcheckdir1/dir2/foo.a', \ 'Xcheckdir1/dir2/foo.a -->', \ ' Xcheckdir1/dir2/bar.a', \ ' Xcheckdir1/dir2/bar.a -->', \ ' Xcheckdir1/dir2/baz.a', \ ' Xcheckdir1/dir2/baz.a -->', \ ' "foo.a" (Already listed)'], res) enew call delete("./Xbase.a") set path& endfunc func DotsToSlashes() return substitute(v:fname, '\.', '/', 'g') . '.b' endfunc " Test for 'include' with \zs and \ze func Test_checkpath2() call mkdir("Xcheckdir2/dir2", "pR") call writefile(['%inc /bar/'], 'Xcheckdir2/dir2/foo.b') call writefile(['%inc /baz/'], 'Xcheckdir2/dir2/bar.b') call writefile(['%inc /foo/'], 'Xcheckdir2/dir2/baz.b') call writefile(['%inc /foo/'], 'Xbase.b', 'D') let &include='^\s*%inc\s*/\zs[^/]\+\ze' let &includeexpr='DotsToSlashes()' edit Xbase.b set path=Xcheckdir2/dir2 let res = split(execute("checkpath!"), "\n") call assert_equal([ \ '--- Included files in path ---', \ 'Xcheckdir2/dir2/foo.b', \ 'Xcheckdir2/dir2/foo.b -->', \ ' Xcheckdir2/dir2/bar.b', \ ' Xcheckdir2/dir2/bar.b -->', \ ' Xcheckdir2/dir2/baz.b', \ ' Xcheckdir2/dir2/baz.b -->', \ ' foo (Already listed)'], res) enew set path& set include& set includeexpr& endfunc func StripNewlineChar() if v:fname =~ '\n$' return v:fname[:-2] endif return v:fname endfunc " Test for 'include' with \zs and no \ze func Test_checkpath3() call mkdir("Xcheckdir3/dir2", "pR") call writefile(['%inc bar.c'], 'Xcheckdir3/dir2/foo.c') call writefile(['%inc baz.c'], 'Xcheckdir3/dir2/bar.c') call writefile(['%inc foo.c'], 'Xcheckdir3/dir2/baz.c') call writefile(['%inc foo.c'], 'Xcheckdir3/dir2/FALSE.c') call writefile(['%inc FALSE.c foo.c'], 'Xbase.c', 'D') let &include='^\s*%inc\s*\%([[:upper:]][^[:space:]]*\s\+\)\?\zs\S\+\ze' let &includeexpr='StripNewlineChar()' edit Xbase.c set path=Xcheckdir3/dir2 let res = split(execute("checkpath!"), "\n") call assert_equal([ \ '--- Included files in path ---', \ 'Xcheckdir3/dir2/foo.c', \ 'Xcheckdir3/dir2/foo.c -->', \ ' Xcheckdir3/dir2/bar.c', \ ' Xcheckdir3/dir2/bar.c -->', \ ' Xcheckdir3/dir2/baz.c', \ ' Xcheckdir3/dir2/baz.c -->', \ ' foo.c (Already listed)'], res) enew set path& set include& set includeexpr& endfunc " Test for invalid regex in 'include' and 'define' options func Test_checkpath_errors() let save_include = &include set include=\\%( call assert_fails('checkpath', 'E53:') let &include = save_include let save_define = &define set define=\\%( call assert_fails('dsearch abc', 'E53:') let &define = save_define call assert_fails('psearch \%(', 'E53:') endfunc " vim: shiftwidth=2 sts=2 expandtab