thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.0992: Vim9: crash when using :import in the Vim command

Browse Source 
Problem:    Vim9: crash when using :import in the Vim command.
Solution:   Give an error when using :import outside of a script.
            (closes #6271)
This commit is contained in:
Bram Moolenaar
2020-06-16 23:18:51 +02:00
parent 0fe937fd86
commit 101f4810e2
4 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/testdir/term_util.vim
View File

@@ -107,16 +107,18 @@ func RunVimInTerminal(arguments, options)
call TermWait(buf)
" Wait for "All" or "Top" of the ruler to be shown in the last line or in
" the status line of the last window. This can be quite slow (e.g. when
" using valgrind).
" If it fails then show the terminal contents for debugging.
try
call WaitFor({-> len(term_getline(buf, rows)) >= cols - 1 || len(term_getline(buf, rows - statusoff)) >= cols - 1})
catch /timed out after/
let lines = map(range(1, rows), {key, val -> term_getline(buf, val)})
call assert_report('RunVimInTerminal() failed, screen contents: ' . join(lines, "<NL>"))
endtry
if get(a:options, 'wait_for_ruler', 1)
" Wait for "All" or "Top" of the ruler to be shown in the last line or in
" the status line of the last window. This can be quite slow (e.g. when
" using valgrind).
" If it fails then show the terminal contents for debugging.
try
call WaitFor({-> len(term_getline(buf, rows)) >= cols - 1 || len(term_getline(buf, rows - statusoff)) >= cols - 1})
catch /timed out after/
let lines = map(range(1, rows), {key, val -> term_getline(buf, val)})
call assert_report('RunVimInTerminal() failed, screen contents: ' . join(lines, "<NL>"))
endtry
endif
" Starting a terminal to run Vim is always considered flaky.
let g:test_is_flaky = 1