mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-03 08:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35987 from zeertzjq/vim-9.1.1818

Browse Source 
vim-patch:9.1.{partial:1110,1818}
This commit is contained in:
zeertzjq
2025-10-02 12:57:19 +08:00
committed by GitHub
parent 9f33b69cfd df0b9e7a5d
commit 28ccebd138
3 changed files with 62 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/diff.c
View File

@@ -2052,7 +2052,7 @@ static void calculate_topfill_and_topline(const int fromidx, const int toidx, co
// move the same amount of virtual lines in the target buffer to find the // move the same amount of virtual lines in the target buffer to find the
// cursor's line number // cursor's line number
int curlinenum_to = thistopdiff->df_lnum[toidx]; int curlinenum_to = thistopdiff != NULL ? thistopdiff->df_lnum[toidx] : 1;
int virt_lines_left = virtual_lines_passed; int virt_lines_left = virtual_lines_passed;
curdif = thistopdiff; curdif = thistopdiff;

4
test/old/testdir/shared.vim
View File

@@ -211,11 +211,11 @@ func s:WaitForCommon(expr, assert, timeout)
call remove(v:errors, -1) call remove(v:errors, -1)
endif endif
sleep 10m sleep 1m
if exists('*reltimefloat') if exists('*reltimefloat')
let slept = float2nr(reltimefloat(reltime(start)) * 1000) let slept = float2nr(reltimefloat(reltime(start)) * 1000)
else else
let slept += 10 let slept += 1
endif endif
endwhile endwhile

108
test/old/testdir/test_crash.vim
View File

@@ -4,11 +4,15 @@ source screendump.vim
CheckScreendump CheckScreendump
" Run the command in terminal and wait for it to complete via notification
func s:RunCommandAndWait(buf, cmd)
call term_sendkeys(a:buf, a:cmd .. "; printf '" .. TermNotifyParentCmd(v:false) .. "'\<cr>")
call WaitForChildNotification()
endfunc
func Test_crash1() func Test_crash1()
CheckNotBSD CheckNotBSD
CheckExecutable dash CheckExecutable dash
" Test 7 fails on Mac ...
CheckNotMac
" The following used to crash Vim " The following used to crash Vim
let opts = #{cmd: 'sh'} let opts = #{cmd: 'sh'}
@@ -19,70 +23,59 @@ func Test_crash1()
let file = 'crash/poc_huaf1' let file = 'crash/poc_huaf1'
let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'" let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'"
let args = printf(cmn_args, vim, file) let args = printf(cmn_args, vim, file)
call term_sendkeys(buf, args .. call s:RunCommandAndWait(buf, args ..
\ ' && echo "crash 1: [OK]" > X_crash1_result.txt' .. "\<cr>") \ ' && echo "crash 1: [OK]" > X_crash1_result.txt')
call TermWait(buf, 50)
let file = 'crash/poc_huaf2' let file = 'crash/poc_huaf2'
let args = printf(cmn_args, vim, file) let args = printf(cmn_args, vim, file)
call term_sendkeys(buf, args .. call s:RunCommandAndWait(buf, args ..
\ ' && echo "crash 2: [OK]" >> X_crash1_result.txt' .. "\<cr>") \ ' && echo "crash 2: [OK]" >> X_crash1_result.txt')
call TermWait(buf, 50)
let file = 'crash/poc_huaf3' let file = 'crash/poc_huaf3'
let args = printf(cmn_args, vim, file) let args = printf(cmn_args, vim, file)
call term_sendkeys(buf, args .. call s:RunCommandAndWait(buf, args ..
\ ' && echo "crash 3: [OK]" >> X_crash1_result.txt' .. "\<cr>") \ ' && echo "crash 3: [OK]" >> X_crash1_result.txt')
call TermWait(buf, 100)
let file = 'crash/bt_quickfix_poc' let file = 'crash/bt_quickfix_poc'
let args = printf(cmn_args, vim, file) let args = printf(cmn_args, vim, file)
call term_sendkeys(buf, args .. call s:RunCommandAndWait(buf, args ..
\ ' && echo "crash 4: [OK]" >> X_crash1_result.txt' .. "\<cr>") \ ' && echo "crash 4: [OK]" >> X_crash1_result.txt')
" clean up " clean up
call delete('Xerr') call delete('Xerr')
" This test takes a bit longer
call TermWait(buf, 1000)
let file = 'crash/poc_tagfunc.vim' let file = 'crash/poc_tagfunc.vim'
let args = printf(cmn_args, vim, file) let args = printf(cmn_args, vim, file)
" using || because this poc causes vim to exit with exitstatus != 0 " using || because this poc causes vim to exit with exitstatus != 0
call term_sendkeys(buf, args .. call s:RunCommandAndWait(buf, args ..
\ ' || echo "crash 5: [OK]" >> X_crash1_result.txt' .. "\<cr>") \ ' || echo "crash 5: [OK]" >> X_crash1_result.txt')
call TermWait(buf, 100)
let file = 'crash/bt_quickfix1_poc' let file = 'crash/bt_quickfix1_poc'
let args = printf(cmn_args, vim, file) let args = printf(cmn_args, vim, file)
call term_sendkeys(buf, args .. call s:RunCommandAndWait(buf, args ..
\ ' && echo "crash 6: [OK]" >> X_crash1_result.txt' .. "\<cr>") \ ' && echo "crash 6: [OK]" >> X_crash1_result.txt')
" clean up " clean up
call delete('X') call delete('X')
call TermWait(buf, 3000)
let file = 'crash/vim_regsub_both_poc' let file = 'crash/vim_regsub_both_poc'
let args = printf(cmn_args, vim, file) let args = printf(cmn_args, vim, file)
call term_sendkeys(buf, args .. call s:RunCommandAndWait(buf, args ..
\ ' && echo "crash 7: [OK]" >> X_crash1_result.txt' .. "\<cr>") \ ' && echo "crash 7: [OK]" >> X_crash1_result.txt')
call TermWait(buf, 3000)
let file = 'crash/vim_msg_trunc_poc' let file = 'crash/vim_msg_trunc_poc'
let args = printf(cmn_args, vim, file) let args = printf(cmn_args, vim, file)
call term_sendkeys(buf, args .. call s:RunCommandAndWait(buf, args ..
\ ' || echo "crash 8: [OK]" >> X_crash1_result.txt' .. "\<cr>") \ ' || echo "crash 8: [OK]" >> X_crash1_result.txt')
call TermWait(buf, 3000)
let file = 'crash/crash_scrollbar' let file = 'crash/crash_scrollbar'
let args = printf(cmn_args, vim, file) let args = printf(cmn_args, vim, file)
call term_sendkeys(buf, args .. call s:RunCommandAndWait(buf, args ..
\ ' && echo "crash 9: [OK]" >> X_crash1_result.txt' .. "\<cr>") \ ' && echo "crash 9: [OK]" >> X_crash1_result.txt')
call TermWait(buf, 1000)
let file = 'crash/editing_arg_idx_POC_1' let file = 'crash/editing_arg_idx_POC_1'
let args = printf(cmn_args, vim, file) let args = printf(cmn_args, vim, file)
call term_sendkeys(buf, args .. call s:RunCommandAndWait(buf, args ..
\ ' || echo "crash 10: [OK]" >> X_crash1_result.txt' .. "\<cr>") \ ' || echo "crash 10: [OK]" >> X_crash1_result.txt')
call TermWait(buf, 1000)
call delete('Xerr') call delete('Xerr')
call delete('@') call delete('@')
@@ -113,7 +106,6 @@ endfunc
func Test_crash1_2() func Test_crash1_2()
CheckNotBSD CheckNotBSD
CheckExecutable dash CheckExecutable dash
let g:test_is_flaky = 1
" The following used to crash Vim " The following used to crash Vim
let opts = #{cmd: 'sh'} let opts = #{cmd: 'sh'}
@@ -125,37 +117,54 @@ func Test_crash1_2()
let file = 'crash/poc1' let file = 'crash/poc1'
let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'" let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'"
let args = printf(cmn_args, vim, file) let args = printf(cmn_args, vim, file)
call term_sendkeys(buf, args .. call s:RunCommandAndWait(buf, args ..
\ ' && echo "crash 1: [OK]" > '.. result .. "\<cr>") \ ' && echo "crash 1: [OK]" > '.. result)
call TermWait(buf, 150)
let file = 'crash/poc_win_enter_ext' let file = 'crash/poc_win_enter_ext'
let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'" let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'"
let args = printf(cmn_args, vim, file) let args = printf(cmn_args, vim, file)
call term_sendkeys(buf, args .. call s:RunCommandAndWait(buf, args ..
\ ' && echo "crash 2: [OK]" >> '.. result .. "\<cr>") \ ' && echo "crash 2: [OK]" >> '.. result)
call TermWait(buf, 350)
let file = 'crash/poc_suggest_trie_walk' let file = 'crash/poc_suggest_trie_walk'
let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'" let cmn_args = "%s -u NONE -i NONE -n -e -s -S %s -c ':qa!'"
let args = printf(cmn_args, vim, file) let args = printf(cmn_args, vim, file)
call term_sendkeys(buf, args .. call s:RunCommandAndWait(buf, args ..
\ ' && echo "crash 3: [OK]" >> '.. result .. "\<cr>") \ ' && echo "crash 3: [OK]" >> '.. result)
call TermWait(buf, 150)
let file = 'crash/poc_did_set_langmap' let file = 'crash/poc_did_set_langmap'
let cmn_args = "%s -u NONE -i NONE -n -X -m -n -e -s -S %s -c ':qa!'" let cmn_args = "%s -u NONE -i NONE -n -X -m -n -e -s -S %s -c ':qa!'"
let args = printf(cmn_args, vim, file) let args = printf(cmn_args, vim, file)
call term_sendkeys(buf, args .. call s:RunCommandAndWait(buf, args ..
\ ' ; echo "crash 4: [OK]" >> '.. result .. "\<cr>") \ ' ; echo "crash 4: [OK]" >> '.. result)
call TermWait(buf, 150)
let file = 'crash/reverse_text_overflow' let file = 'crash/reverse_text_overflow'
let cmn_args = "%s -u NONE -i NONE -n -X -m -n -e -s -S %s -c ':qa!'" let cmn_args = "%s -u NONE -i NONE -n -X -m -n -e -s -S %s -c ':qa!'"
let args = printf(cmn_args, vim, file) let args = printf(cmn_args, vim, file)
call term_sendkeys(buf, args .. call s:RunCommandAndWait(buf, args ..
\ ' ; echo "crash 5: [OK]" >> '.. result .. "\<cr>") \ ' ; echo "crash 5: [OK]" >> '.. result)
call TermWait(buf, 150)
let file = 'Xdiff'
let lines =<< trim END
diffs a
edit Xdiff
file b
exe "norm! \<C-w>\<C-w>"
exe "norm! \<C-w>\<C-w>"
exe "norm! \<C-w>\<C-w>"
exe "norm! \<C-w>\<C-w>"
exe "norm! \<C-w>\<C-w>"
exe "norm! \<C-w>\L"
exe "norm! \<C-j>oy\<C-j>"
edit Xdiff
sil!so
END
call writefile(lines, file, 'D')
let cmn_args = "%s -u NONE -i NONE -X -m -n -e -s -u %s -c ':qa!'"
let args = printf(cmn_args, vim, file)
call s:RunCommandAndWait(buf, args ..
\ ' && echo "crash 6: [OK]" >> '.. result)
" clean up " clean up
exe buf .. "bw!" exe buf .. "bw!"
@@ -166,6 +175,7 @@ func Test_crash1_2()
\ 'crash 3: [OK]', \ 'crash 3: [OK]',
\ 'crash 4: [OK]', \ 'crash 4: [OK]',
\ 'crash 5: [OK]', \ 'crash 5: [OK]',
\ 'crash 6: [OK]',
\ ] \ ]
call assert_equal(expected, getline(1, '$')) call assert_equal(expected, getline(1, '$'))