Mercurial > vim
view src/testdir/test_expand_func.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 | dbec60b8c253 |
children |
line wrap: on
line source
" Tests for expand() source shared.vim let s:sfile = expand('<sfile>') let s:slnum = str2nr(expand('<slnum>')) let s:sflnum = str2nr(expand('<sflnum>')) func s:expand_sfile() return expand('<sfile>') endfunc func s:expand_slnum() return str2nr(expand('<slnum>')) endfunc func s:expand_sflnum() return str2nr(expand('<sflnum>')) endfunc " This test depends on the location in the test file, put it first. func Test_expand_sflnum() call assert_equal(7, s:sflnum) call assert_equal(24, str2nr(expand('<sflnum>'))) " Line-continuation call assert_equal( \ 27, \ str2nr(expand('<sflnum>'))) " Call in script-local function call assert_equal(18, s:expand_sflnum()) " Call in command command Flnum echo expand('<sflnum>') call assert_equal(36, str2nr(trim(execute('Flnum')))) delcommand Flnum endfunc func Test_expand_sfile_and_stack() call assert_match('test_expand_func\.vim$', s:sfile) let expected = 'script .*testdir/runtest.vim\[\d\+\]\.\.function RunTheTest\[\d\+\]\.\.Test_expand_sfile_and_stack' call assert_match(expected .. '$', expand('<sfile>')) call assert_match(expected .. '\[4\]$' , expand('<stack>')) " Call in script-local function call assert_match('script .*testdir/runtest.vim\[\d\+\]\.\.function RunTheTest\[\d\+\]\.\.Test_expand_sfile_and_stack\[7\]\.\.<SNR>\d\+_expand_sfile$', s:expand_sfile()) " Call in command command Sfile echo expand('<sfile>') call assert_match('script .*testdir/runtest.vim\[\d\+\]\.\.function RunTheTest\[\d\+\]\.\.Test_expand_sfile_and_stack$', trim(execute('Sfile'))) delcommand Sfile " Use <stack> from sourced script. let lines =<< trim END " comment here let g:stack_value = expand('<stack>') END call writefile(lines, 'Xstack', 'D') source Xstack call assert_match('\<Xstack\[2\]$', g:stack_value) unlet g:stack_value if exists('+shellslash') call mkdir('Xshellslash', 'R') let lines =<< trim END let g:stack1 = expand('<stack>') set noshellslash let g:stack2 = expand('<stack>') set shellslash let g:stack3 = expand('<stack>') END call writefile(lines, 'Xshellslash/Xstack') " Test that changing 'shellslash' always affects the result of expand() " when sourcing a script multiple times. for i in range(2) source Xshellslash/Xstack call assert_match('\<Xshellslash/Xstack\[1\]$', g:stack1) call assert_match('\<Xshellslash\\Xstack\[3\]$', g:stack2) call assert_match('\<Xshellslash/Xstack\[5\]$', g:stack3) unlet g:stack1 unlet g:stack2 unlet g:stack3 endfor endif endfunc func Test_expand_slnum() call assert_equal(6, s:slnum) call assert_equal(2, str2nr(expand('<slnum>'))) " Line-continuation call assert_equal( \ 5, \ str2nr(expand('<slnum>'))) " Call in script-local function call assert_equal(1, s:expand_slnum()) " Call in command command Slnum echo expand('<slnum>') call assert_equal(14, str2nr(trim(execute('Slnum')))) delcommand Slnum endfunc func Test_expand() new call assert_equal("", expand('%:S')) call assert_equal('3', '<slnum>'->expand()) call assert_equal(['4'], expand('<slnum>', v:false, v:true)) " Don't add any line above this, otherwise <slnum> will change. call assert_equal("", expand('%')) set verbose=1 call assert_equal("", expand('%')) set verbose=0 call assert_equal("", expand('%:p')) quit endfunc func s:sid_test() return 'works' endfunc func Test_expand_SID() let sid = expand('<SID>') execute 'let g:sid_result = ' .. sid .. 'sid_test()' call assert_equal('works', g:sid_result) endfunc " Test for 'wildignore' with expand() func Test_expand_wildignore() set wildignore=*.vim call assert_equal('', expand('test_expand_func.vim')) call assert_equal('', expand('test_expand_func.vim', 0)) call assert_equal([], expand('test_expand_func.vim', 0, 1)) call assert_equal('test_expand_func.vim', expand('test_expand_func.vim', 1)) call assert_equal(['test_expand_func.vim'], \ expand('test_expand_func.vim', 1, 1)) call assert_fails("call expand('*', [])", 'E745:') set wildignore& endfunc " vim: shiftwidth=2 sts=2 expandtab