mirror of
https://github.com/neovim/neovim.git
synced 2024-12-25 13:45:15 -07:00
Merge pull request #22456 from zeertzjq/vim-9.0.0430
vim-patch:8.2.{4668,4670},9.0.0430: cannot use repeat() with a blob
This commit is contained in:
commit
f289fc4abb
@ -380,7 +380,8 @@ remove({blob}, {idx} [, {end}]) Number/Blob
|
||||
remove bytes {idx}-{end} from {blob}
|
||||
remove({dict}, {key}) any remove entry {key} from {dict}
|
||||
rename({from}, {to}) Number rename (move) file from {from} to {to}
|
||||
repeat({expr}, {count}) String repeat {expr} {count} times
|
||||
repeat({expr}, {count}) List/Blob/String
|
||||
repeat {expr} {count} times
|
||||
resolve({filename}) String get filename a shortcut points to
|
||||
reverse({list}) List reverse {list} in-place
|
||||
round({expr}) Float round off {expr}
|
||||
@ -6420,8 +6421,8 @@ repeat({expr}, {count}) *repeat()*
|
||||
result. Example: >
|
||||
:let separator = repeat('-', 80)
|
||||
< When {count} is zero or negative the result is empty.
|
||||
When {expr} is a |List| the result is {expr} concatenated
|
||||
{count} times. Example: >
|
||||
When {expr} is a |List| or a |Blob| the result is {expr}
|
||||
concatenated {count} times. Example: >
|
||||
:let longlist = repeat(['a', 'b'], 3)
|
||||
< Results in ['a', 'b', 'a', 'b', 'a', 'b'].
|
||||
|
||||
|
@ -1613,7 +1613,7 @@ void set_var_lval(lval_T *lp, char *endp, typval_T *rettv, int copy, const bool
|
||||
lp->ll_n2 = tv_blob_len(lp->ll_blob) - 1;
|
||||
}
|
||||
|
||||
if (tv_blob_set_range(lp->ll_blob, lp->ll_n1, lp->ll_n2, rettv) == FAIL) {
|
||||
if (tv_blob_set_range(lp->ll_blob, (int)lp->ll_n1, (int)lp->ll_n2, rettv) == FAIL) {
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
@ -4938,6 +4938,8 @@ theend:
|
||||
return retval;
|
||||
}
|
||||
|
||||
/// "function()" function
|
||||
/// "funcref()" function
|
||||
void common_function(typval_T *argvars, typval_T *rettv, bool is_funcref)
|
||||
{
|
||||
char *s;
|
||||
|
@ -5976,6 +5976,37 @@ static void f_repeat(typval_T *argvars, typval_T *rettv, EvalFuncData fptr)
|
||||
while (n-- > 0) {
|
||||
tv_list_extend(rettv->vval.v_list, argvars[0].vval.v_list, NULL);
|
||||
}
|
||||
} else if (argvars[0].v_type == VAR_BLOB) {
|
||||
tv_blob_alloc_ret(rettv);
|
||||
if (argvars[0].vval.v_blob == NULL || n <= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
const int slen = argvars[0].vval.v_blob->bv_ga.ga_len;
|
||||
const int len = (int)(slen * n);
|
||||
if (len <= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
ga_grow(&rettv->vval.v_blob->bv_ga, len);
|
||||
|
||||
rettv->vval.v_blob->bv_ga.ga_len = len;
|
||||
|
||||
int i;
|
||||
for (i = 0; i < slen; i++) {
|
||||
if (tv_blob_get(argvars[0].vval.v_blob, i) != 0) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (i == slen) {
|
||||
// No need to copy since all bytes are already zero
|
||||
return;
|
||||
}
|
||||
|
||||
for (i = 0; i < n; i++) {
|
||||
tv_blob_set_range(rettv->vval.v_blob, i * slen, (i + 1) * slen - 1, argvars);
|
||||
}
|
||||
} else {
|
||||
rettv->v_type = VAR_STRING;
|
||||
rettv->vval.v_string = NULL;
|
||||
|
@ -2743,14 +2743,14 @@ int tv_blob_check_range(int bloblen, varnumber_T n1, varnumber_T n2, bool quiet)
|
||||
/// Set bytes "n1" to "n2" (inclusive) in "dest" to the value of "src".
|
||||
/// Caller must make sure "src" is a blob.
|
||||
/// Returns FAIL if the number of bytes does not match.
|
||||
int tv_blob_set_range(blob_T *dest, long n1, long n2, typval_T *src)
|
||||
int tv_blob_set_range(blob_T *dest, int n1, int n2, typval_T *src)
|
||||
{
|
||||
if (n2 - n1 + 1 != tv_blob_len(src->vval.v_blob)) {
|
||||
emsg(_("E972: Blob value does not have the right number of bytes"));
|
||||
return FAIL;
|
||||
}
|
||||
|
||||
for (int il = (int)n1, ir = 0; il <= (int)n2; il++) {
|
||||
for (int il = n1, ir = 0; il <= n2; il++) {
|
||||
tv_blob_set(dest, il, tv_blob_get(src->vval.v_blob, ir++));
|
||||
}
|
||||
return OK;
|
||||
|
@ -1,5 +1,6 @@
|
||||
" Tests for the Blob types
|
||||
|
||||
source check.vim
|
||||
source vim9.vim
|
||||
|
||||
func TearDown()
|
||||
@ -714,6 +715,58 @@ func Test_blob2string()
|
||||
call assert_equal(v, string(b))
|
||||
endfunc
|
||||
|
||||
func Test_blob_repeat()
|
||||
call assert_equal(0z, repeat(0z00, 0))
|
||||
call assert_equal(0z00, repeat(0z00, 1))
|
||||
call assert_equal(0z0000, repeat(0z00, 2))
|
||||
call assert_equal(0z00000000, repeat(0z0000, 2))
|
||||
|
||||
call assert_equal(0z, repeat(0z12, 0))
|
||||
call assert_equal(0z, repeat(0z1234, 0))
|
||||
call assert_equal(0z1234, repeat(0z1234, 1))
|
||||
call assert_equal(0z12341234, repeat(0z1234, 2))
|
||||
endfunc
|
||||
|
||||
" Test for blob allocation failure
|
||||
func Test_blob_alloc_failure()
|
||||
CheckFunction test_alloc_fail
|
||||
" blob variable
|
||||
call test_alloc_fail(GetAllocId('blob_alloc'), 0, 0)
|
||||
call assert_fails('let v = 0z10', 'E342:')
|
||||
|
||||
" blob slice
|
||||
let v = 0z1020
|
||||
call test_alloc_fail(GetAllocId('blob_alloc'), 0, 0)
|
||||
call assert_fails('let x = v[0:0]', 'E342:')
|
||||
call assert_equal(0z1020, x)
|
||||
|
||||
" blob remove()
|
||||
let v = 0z10203040
|
||||
call test_alloc_fail(GetAllocId('blob_alloc'), 0, 0)
|
||||
call assert_fails('let x = remove(v, 1, 2)', 'E342:')
|
||||
call assert_equal(0, x)
|
||||
|
||||
" list2blob()
|
||||
call test_alloc_fail(GetAllocId('blob_alloc'), 0, 0)
|
||||
call assert_fails('let a = list2blob([1, 2, 4])', 'E342:')
|
||||
call assert_equal(0, a)
|
||||
|
||||
" mapnew()
|
||||
call test_alloc_fail(GetAllocId('blob_alloc'), 0, 0)
|
||||
call assert_fails('let x = mapnew(0z1234, {_, v -> 1})', 'E342:')
|
||||
call assert_equal(0, x)
|
||||
|
||||
" copy()
|
||||
call test_alloc_fail(GetAllocId('blob_alloc'), 0, 0)
|
||||
call assert_fails('let x = copy(v)', 'E342:')
|
||||
call assert_equal(0z, x)
|
||||
|
||||
" readblob()
|
||||
call test_alloc_fail(GetAllocId('blob_alloc'), 0, 0)
|
||||
call assert_fails('let x = readblob("test_blob.vim")', 'E342:')
|
||||
call assert_equal(0, x)
|
||||
endfunc
|
||||
|
||||
" Test for the indexof() function
|
||||
func Test_indexof()
|
||||
let b = 0zdeadbeef
|
||||
|
@ -451,4 +451,75 @@ func Test_buffer_maxmem()
|
||||
" set maxmem& maxmemtot&
|
||||
endfunc
|
||||
|
||||
" Test for buffer allocation failure
|
||||
func Test_buflist_alloc_failure()
|
||||
CheckFunction test_alloc_fail
|
||||
%bw!
|
||||
|
||||
edit Xfile1
|
||||
call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
|
||||
call assert_fails('edit Xfile2', 'E342:')
|
||||
|
||||
" test for bufadd()
|
||||
call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
|
||||
call assert_fails('call bufadd("Xbuffer")', 'E342:')
|
||||
|
||||
" test for setting the arglist
|
||||
edit Xfile2
|
||||
call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
|
||||
call assert_fails('next Xfile3', 'E342:')
|
||||
|
||||
" test for setting the alternate buffer name when writing a file
|
||||
call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
|
||||
call assert_fails('write Xother', 'E342:')
|
||||
call delete('Xother')
|
||||
|
||||
" test for creating a buffer using bufnr()
|
||||
call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
|
||||
call assert_fails("call bufnr('Xnewbuf', v:true)", 'E342:')
|
||||
|
||||
" test for renaming buffer using :file
|
||||
call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
|
||||
call assert_fails('file Xnewfile', 'E342:')
|
||||
|
||||
" test for creating a buffer for a popup window
|
||||
call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
|
||||
call assert_fails('call popup_create("mypop", {})', 'E342:')
|
||||
|
||||
if has('terminal')
|
||||
" test for creating a buffer for a terminal window
|
||||
call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
|
||||
call assert_fails('call term_start(&shell)', 'E342:')
|
||||
%bw!
|
||||
endif
|
||||
|
||||
" test for loading a new buffer after wiping out all the buffers
|
||||
edit Xfile4
|
||||
call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
|
||||
call assert_fails('%bw!', 'E342:')
|
||||
|
||||
" test for :checktime loading the buffer
|
||||
call writefile(['one'], 'Xfile5')
|
||||
if has('unix')
|
||||
edit Xfile5
|
||||
" sleep for some time to make sure the timestamp is different
|
||||
sleep 200m
|
||||
call writefile(['two'], 'Xfile5')
|
||||
set autoread
|
||||
call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
|
||||
call assert_fails('checktime', 'E342:')
|
||||
set autoread&
|
||||
bw!
|
||||
endif
|
||||
|
||||
" test for :vimgrep loading a dummy buffer
|
||||
call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
|
||||
call assert_fails('vimgrep two Xfile5', 'E342:')
|
||||
call delete('Xfile5')
|
||||
|
||||
" test for quickfix command loading a buffer
|
||||
call test_alloc_fail(GetAllocId('newbuf_bvars'), 0, 0)
|
||||
call assert_fails('cexpr "Xfile6:10:Line10"', 'E342:')
|
||||
endfunc
|
||||
|
||||
" vim: shiftwidth=2 sts=2 expandtab
|
||||
|
@ -235,7 +235,6 @@ func Test_swap_recover()
|
||||
autocmd SwapExists * let v:swapchoice = 'r'
|
||||
augroup END
|
||||
|
||||
|
||||
call mkdir('Xswap')
|
||||
let $Xswap = 'foo' " Check for issue #4369.
|
||||
set dir=Xswap//
|
||||
|
@ -846,6 +846,30 @@ func Test_lastused_tabpage()
|
||||
tabonly!
|
||||
endfunc
|
||||
|
||||
" Test for tabpage allocation failure
|
||||
func Test_tabpage_alloc_failure()
|
||||
CheckFunction test_alloc_fail
|
||||
call test_alloc_fail(GetAllocId('newtabpage_tvars'), 0, 0)
|
||||
call assert_fails('tabnew', 'E342:')
|
||||
|
||||
call test_alloc_fail(GetAllocId('newtabpage_tvars'), 0, 0)
|
||||
edit Xfile1
|
||||
call assert_fails('tabedit Xfile2', 'E342:')
|
||||
call assert_equal(1, winnr('$'))
|
||||
call assert_equal(1, tabpagenr('$'))
|
||||
call assert_equal('Xfile1', @%)
|
||||
|
||||
new
|
||||
call test_alloc_fail(GetAllocId('newtabpage_tvars'), 0, 0)
|
||||
call assert_fails('wincmd T', 'E342:')
|
||||
bw!
|
||||
|
||||
call test_alloc_fail(GetAllocId('newtabpage_tvars'), 0, 0)
|
||||
call assert_fails('tab split', 'E342:')
|
||||
call assert_equal(2, winnr('$'))
|
||||
call assert_equal(1, tabpagenr('$'))
|
||||
endfunc
|
||||
|
||||
" this was giving ml_get errors
|
||||
func Test_tabpage_last_line()
|
||||
enew
|
||||
|
@ -1525,6 +1525,52 @@ func Test_win_move_statusline()
|
||||
%bwipe!
|
||||
endfunc
|
||||
|
||||
" Test for window allocation failure
|
||||
func Test_window_alloc_failure()
|
||||
CheckFunction test_alloc_fail
|
||||
%bw!
|
||||
|
||||
" test for creating a new window above current window
|
||||
call test_alloc_fail(GetAllocId('newwin_wvars'), 0, 0)
|
||||
call assert_fails('above new', 'E342:')
|
||||
call assert_equal(1, winnr('$'))
|
||||
|
||||
" test for creating a new window below current window
|
||||
call test_alloc_fail(GetAllocId('newwin_wvars'), 0, 0)
|
||||
call assert_fails('below new', 'E342:')
|
||||
call assert_equal(1, winnr('$'))
|
||||
|
||||
" test for popup window creation failure
|
||||
call test_alloc_fail(GetAllocId('newwin_wvars'), 0, 0)
|
||||
call assert_fails('call popup_create("Hello", {})', 'E342:')
|
||||
call assert_equal([], popup_list())
|
||||
|
||||
call test_alloc_fail(GetAllocId('newwin_wvars'), 0, 0)
|
||||
call assert_fails('split', 'E342:')
|
||||
call assert_equal(1, winnr('$'))
|
||||
|
||||
edit Xfile1
|
||||
edit Xfile2
|
||||
call test_alloc_fail(GetAllocId('newwin_wvars'), 0, 0)
|
||||
call assert_fails('sb Xfile1', 'E342:')
|
||||
call assert_equal(1, winnr('$'))
|
||||
call assert_equal('Xfile2', @%)
|
||||
%bw!
|
||||
|
||||
" FIXME: The following test crashes Vim
|
||||
" test for new tabpage creation failure
|
||||
" call test_alloc_fail(GetAllocId('newwin_wvars'), 0, 0)
|
||||
" call assert_fails('tabnew', 'E342:')
|
||||
" call assert_equal(1, tabpagenr('$'))
|
||||
" call assert_equal(1, winnr('$'))
|
||||
|
||||
" This test messes up the internal Vim window/frame information. So the
|
||||
" Test_window_cmd_cmdwin_with_vsp() test fails after running this test.
|
||||
" Open a new tab and close everything else to fix this issue.
|
||||
tabnew
|
||||
tabonly
|
||||
endfunc
|
||||
|
||||
func Test_win_equal_last_status()
|
||||
let save_lines = &lines
|
||||
set lines=20
|
||||
|
Loading…
Reference in New Issue
Block a user