1
0
forked from aniani/vim

patch 8.0.1259: search test can be flaky

Problem:    Search test can be flaky.
Solution:   Use WaitFor() instead of a delay.  Make it possible to pass a
            funcref to WaitFor() to avoid the need for global variables.
            (James McCoy, closes #2282)
This commit is contained in:
Bram Moolenaar
2017-11-04 18:48:43 +01:00
parent 52a2f0f1da
commit 13deab8d08
3 changed files with 52 additions and 47 deletions

View File

@@ -113,7 +113,9 @@ func s:kill_server(cmd)
endif
endfunc
" Wait for up to a second for "expr" to become true.
" Wait for up to a second for "expr" to become true. "expr" can be a
" stringified expression to evaluate, or a funcref without arguments.
"
" Return time slept in milliseconds. With the +reltime feature this can be
" more than the actual waiting time. Without +reltime it can also be less.
func WaitFor(expr, ...)
@@ -124,8 +126,13 @@ func WaitFor(expr, ...)
else
let slept = 0
endif
if type(a:expr) == v:t_func
let Test = a:expr
else
let Test = {-> eval(a:expr) }
endif
for i in range(timeout / 10)
if eval(a:expr)
if Test()
if has('reltime')
return float2nr(reltimefloat(reltime(start)) * 1000)
endif